diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-13 00:08:52 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-13 00:08:52 +0200 |
| commit | e42946797240f4dfb3d98b610d0d53665675225c (patch) | |
| tree | 220026724ceb8fbcf18bf627fde022c2d8df0e91 /widget | |
| parent | 6971bbb2277a260e398b8811be1970f8b3853357 (diff) | |
| download | uxp-e42946797240f4dfb3d98b610d0d53665675225c.tar.gz | |
Remove MOZ_WIDGET_GONK [2/2]
Tag mcp-graveyard/UXP#288
Diffstat (limited to 'widget')
| -rw-r--r-- | widget/EventMessageList.h | 2 | ||||
| -rw-r--r-- | widget/PuppetWidget.cpp | 5 | ||||
| -rw-r--r-- | widget/nsContentProcessWidgetFactory.cpp | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 2eed7e618e..372ca90fbc 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -379,7 +379,7 @@ NS_EVENT_MESSAGE(eDeviceMotion) NS_EVENT_MESSAGE(eDeviceProximity) NS_EVENT_MESSAGE(eUserProximity) NS_EVENT_MESSAGE(eDeviceLight) -#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK) +#if defined(MOZ_WIDGET_ANDROID) NS_EVENT_MESSAGE(eOrientationChange) #endif diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp index 1fa13ee6fb..657f70551d 100644 --- a/widget/PuppetWidget.cpp +++ b/widget/PuppetWidget.cpp @@ -541,10 +541,6 @@ PuppetWidget::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, DoCommandCallback aCallback, void* aCallbackData) { - // B2G doesn't have native key bindings. -#ifdef MOZ_WIDGET_GONK - return false; -#else // #ifdef MOZ_WIDGET_GONK AutoCacheNativeKeyCommands autoCache(this); if (!aEvent.mWidget && !mNativeKeyCommandsValid) { MOZ_ASSERT(!aEvent.mFlags.mIsSynthesizedForTests); @@ -581,7 +577,6 @@ PuppetWidget::ExecuteNativeKeyBinding(NativeKeyBindingsType aType, aCallback(static_cast<mozilla::Command>((*commands)[i]), aCallbackData); } return true; -#endif } LayerManager* diff --git a/widget/nsContentProcessWidgetFactory.cpp b/widget/nsContentProcessWidgetFactory.cpp index 2f00f1c832..7430721f23 100644 --- a/widget/nsContentProcessWidgetFactory.cpp +++ b/widget/nsContentProcessWidgetFactory.cpp @@ -17,8 +17,6 @@ using namespace mozilla; using namespace mozilla::widget; -#ifndef MOZ_WIDGET_GONK - NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsColorPickerProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragServiceProxy) @@ -68,4 +66,3 @@ static const mozilla::Module kWidgetModule = { NSMODULE_DEFN(nsContentProcessWidgetModule) = &kWidgetModule; -#endif /* MOZ_WIDGET_GONK */ |