From 47ff4246a1fdba232dbb0002e2a2bbd2277b44de Mon Sep 17 00:00:00 2001 From: Mason Chang Date: Thu, 23 Oct 2014 10:16:47 -0700 Subject: [PATCH] Bug 1085696. Part 2 Move widget/shared to /widget. r=roc --HG-- rename : widget/shared/NativeKeyToDOMCodeName.h => widget/NativeKeyToDOMCodeName.h rename : widget/shared/NativeKeyToDOMKeyName.h => widget/NativeKeyToDOMKeyName.h rename : widget/shared/VsyncDispatcher.cpp => widget/VsyncDispatcher.cpp rename : widget/shared/VsyncDispatcher.h => widget/VsyncDispatcher.h rename : widget/shared/WidgetEventImpl.cpp => widget/WidgetEventImpl.cpp rename : widget/shared/nsShmImage.cpp => widget/nsShmImage.cpp rename : widget/shared/nsShmImage.h => widget/nsShmImage.h rename : widget/shared/x11/keysym2ucs.c => widget/x11/keysym2ucs.c rename : widget/shared/x11/keysym2ucs.h => widget/x11/keysym2ucs.h rename : widget/shared/x11/moz.build => widget/x11/moz.build --- dom/base/moz.build | 1 - widget/{shared => }/NativeKeyToDOMCodeName.h | 0 widget/{shared => }/NativeKeyToDOMKeyName.h | 0 widget/{shared => }/VsyncDispatcher.cpp | 0 widget/{shared => }/VsyncDispatcher.h | 0 widget/{shared => }/WidgetEventImpl.cpp | 0 widget/android/moz.build | 1 - widget/cocoa/moz.build | 1 - widget/gonk/moz.build | 1 - widget/gtk/moz.build | 3 +-- widget/moz.build | 9 ++++--- widget/{shared => }/nsShmImage.cpp | 0 widget/{shared => }/nsShmImage.h | 0 widget/qt/moz.build | 1 - widget/shared/moz.build | 26 -------------------- widget/windows/moz.build | 1 - widget/windows/winrt/moz.build | 1 - widget/{shared => }/x11/keysym2ucs.c | 0 widget/{shared => }/x11/keysym2ucs.h | 0 widget/{shared => }/x11/moz.build | 0 20 files changed, 7 insertions(+), 38 deletions(-) rename widget/{shared => }/NativeKeyToDOMCodeName.h (100%) rename widget/{shared => }/NativeKeyToDOMKeyName.h (100%) rename widget/{shared => }/VsyncDispatcher.cpp (100%) rename widget/{shared => }/VsyncDispatcher.h (100%) rename widget/{shared => }/WidgetEventImpl.cpp (100%) rename widget/{shared => }/nsShmImage.cpp (100%) rename widget/{shared => }/nsShmImage.h (100%) delete mode 100644 widget/shared/moz.build rename widget/{shared => }/x11/keysym2ucs.c (100%) rename widget/{shared => }/x11/keysym2ucs.h (100%) rename widget/{shared => }/x11/moz.build (100%) diff --git a/dom/base/moz.build b/dom/base/moz.build index 466d94d9018..6a1c69a327b 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -164,7 +164,6 @@ LOCAL_INCLUDES += [ '/layout/style', '/layout/xul', '/widget', - '/widget/shared', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': diff --git a/widget/shared/NativeKeyToDOMCodeName.h b/widget/NativeKeyToDOMCodeName.h similarity index 100% rename from widget/shared/NativeKeyToDOMCodeName.h rename to widget/NativeKeyToDOMCodeName.h diff --git a/widget/shared/NativeKeyToDOMKeyName.h b/widget/NativeKeyToDOMKeyName.h similarity index 100% rename from widget/shared/NativeKeyToDOMKeyName.h rename to widget/NativeKeyToDOMKeyName.h diff --git a/widget/shared/VsyncDispatcher.cpp b/widget/VsyncDispatcher.cpp similarity index 100% rename from widget/shared/VsyncDispatcher.cpp rename to widget/VsyncDispatcher.cpp diff --git a/widget/shared/VsyncDispatcher.h b/widget/VsyncDispatcher.h similarity index 100% rename from widget/shared/VsyncDispatcher.h rename to widget/VsyncDispatcher.h diff --git a/widget/shared/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp similarity index 100% rename from widget/shared/WidgetEventImpl.cpp rename to widget/WidgetEventImpl.cpp diff --git a/widget/android/moz.build b/widget/android/moz.build index fd7237e8211..78873655b28 100644 --- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -57,7 +57,6 @@ LOCAL_INCLUDES += [ '/netwerk/cache', '/widget', '/widget/android/android', - '/widget/shared', ] #DEFINES['DEBUG_WIDGETS'] = True diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build index 0cf5fdfa03d..10f3421180c 100644 --- a/widget/cocoa/moz.build +++ b/widget/cocoa/moz.build @@ -74,7 +74,6 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../shared', '/layout/forms', '/layout/generic', '/layout/xul', diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index d320e275fa1..ba25be907a7 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -72,7 +72,6 @@ LOCAL_INCLUDES += [ '/gfx/skia/trunk/include/config', '/gfx/skia/trunk/include/core', '/widget', - '/widget/shared', ] DEFINES['HAVE_OFF64_T'] = True diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build index 8d30a64dccd..fd8cb18aa8a 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -81,7 +81,6 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../shared', '/layout/generic', '/layout/xul', '/other-licenses/atk-1.0', @@ -90,7 +89,7 @@ LOCAL_INCLUDES += [ if CONFIG['MOZ_X11']: LOCAL_INCLUDES += [ - '../shared/x11', + '/widget/x11', ] DEFINES['CAIRO_GFX'] = True diff --git a/widget/moz.build b/widget/moz.build index c348c2ced56..b8f187c4473 100644 --- a/widget/moz.build +++ b/widget/moz.build @@ -4,8 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DIRS += ['shared'] - toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] if toolkit in ('cocoa', 'qt', 'android', 'gonk'): @@ -120,6 +118,7 @@ EXPORTS.mozilla += [ 'TextEvents.h', 'TextRange.h', 'TouchEvents.h', + 'VsyncDispatcher.h', 'WidgetUtils.h', ] @@ -146,11 +145,14 @@ UNIFIED_SOURCES += [ 'nsPrintSession.cpp', 'nsPrintSettingsImpl.cpp', 'nsScreenManagerProxy.cpp', + 'nsShmImage.cpp', 'nsTransferable.cpp', 'nsXPLookAndFeel.cpp', 'PuppetWidget.cpp', 'ScreenProxy.cpp', 'SharedWidgetUtils.cpp', + 'VsyncDispatcher.cpp', + 'WidgetEventImpl.cpp', 'WidgetUtils.cpp', ] @@ -167,6 +169,7 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']: EXPORTS.ipc = ['nsGUIEventIPC.h'] if CONFIG['MOZ_X11']: + DIRS += ['x11'] UNIFIED_SOURCES += [ 'GfxInfoX11.cpp' ] @@ -202,7 +205,7 @@ LOCAL_INCLUDES += [ '/layout/generic', '/layout/xul', '/view', - '/widget/shared', + '/widget', ] widget_dir = toolkit diff --git a/widget/shared/nsShmImage.cpp b/widget/nsShmImage.cpp similarity index 100% rename from widget/shared/nsShmImage.cpp rename to widget/nsShmImage.cpp diff --git a/widget/shared/nsShmImage.h b/widget/nsShmImage.h similarity index 100% rename from widget/shared/nsShmImage.h rename to widget/nsShmImage.h diff --git a/widget/qt/moz.build b/widget/qt/moz.build index 6b5f6327554..8540100d2e1 100644 --- a/widget/qt/moz.build +++ b/widget/qt/moz.build @@ -37,7 +37,6 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../shared', '/widget', ] diff --git a/widget/shared/moz.build b/widget/shared/moz.build deleted file mode 100644 index 995718e0b6c..00000000000 --- a/widget/shared/moz.build +++ /dev/null @@ -1,26 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -if CONFIG['MOZ_X11']: - DIRS += ['x11'] - -EXPORTS.mozilla += [ - 'VsyncDispatcher.h', -] - -UNIFIED_SOURCES += [ - 'nsShmImage.cpp', - 'VsyncDispatcher.cpp', - 'WidgetEventImpl.cpp', -] - -include('/ipc/chromium/chromium-config.mozbuild') - -FAIL_ON_WARNINGS = True - -FINAL_LIBRARY = 'xul' - -CXXFLAGS += CONFIG['TK_CFLAGS'] diff --git a/widget/windows/moz.build b/widget/windows/moz.build index fcd1c41e1aa..88f53ebb892 100644 --- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -92,7 +92,6 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../shared', '/layout/generic', '/layout/xul', '/toolkit/xre', diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build index 1a64418fee4..be72f7038d9 100644 --- a/widget/windows/winrt/moz.build +++ b/widget/windows/winrt/moz.build @@ -36,7 +36,6 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../', - '../../shared', '/layout/generic', '/layout/xul', '/toolkit/xre', diff --git a/widget/shared/x11/keysym2ucs.c b/widget/x11/keysym2ucs.c similarity index 100% rename from widget/shared/x11/keysym2ucs.c rename to widget/x11/keysym2ucs.c diff --git a/widget/shared/x11/keysym2ucs.h b/widget/x11/keysym2ucs.h similarity index 100% rename from widget/shared/x11/keysym2ucs.h rename to widget/x11/keysym2ucs.h diff --git a/widget/shared/x11/moz.build b/widget/x11/moz.build similarity index 100% rename from widget/shared/x11/moz.build rename to widget/x11/moz.build