Bug 1085696. Part 2 Move widget/shared to /widget. r=roc
authorMason Chang <mchang@mozilla.com>
Thu, 23 Oct 2014 10:16:47 -0700
changeset 211921 ccd53912eb4ce6cf469d6042b02f8090aecebee8
parent 211920 41c37790896e424e2743811d3d19be00068ce941
child 211922 f7a2dbb9c2b86fd9aa2d061efba32430ccbb45d1
push id50857
push usermchang@mozilla.com
push dateThu, 23 Oct 2014 17:19:06 +0000
treeherdermozilla-inbound@ccd53912eb4c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs1085696
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1085696. Part 2 Move widget/shared to /widget. r=roc
dom/base/moz.build
widget/NativeKeyToDOMCodeName.h
widget/NativeKeyToDOMKeyName.h
widget/VsyncDispatcher.cpp
widget/VsyncDispatcher.h
widget/WidgetEventImpl.cpp
widget/android/moz.build
widget/cocoa/moz.build
widget/gonk/moz.build
widget/gtk/moz.build
widget/moz.build
widget/nsShmImage.cpp
widget/nsShmImage.h
widget/qt/moz.build
widget/shared/NativeKeyToDOMCodeName.h
widget/shared/NativeKeyToDOMKeyName.h
widget/shared/VsyncDispatcher.cpp
widget/shared/VsyncDispatcher.h
widget/shared/WidgetEventImpl.cpp
widget/shared/moz.build
widget/shared/nsShmImage.cpp
widget/shared/nsShmImage.h
widget/shared/x11/keysym2ucs.c
widget/shared/x11/keysym2ucs.h
widget/shared/x11/moz.build
widget/windows/moz.build
widget/windows/winrt/moz.build
widget/x11/keysym2ucs.c
widget/x11/keysym2ucs.h
widget/x11/moz.build
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -159,17 +159,16 @@ LOCAL_INCLUDES += [
     '/content/xul/document/src',
     '/dom/geolocation',
     '/dom/storage',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/widget',
-    '/widget/shared',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     LOCAL_INCLUDES += [
         '../fmradio',
         '../system/gonk',
     ]
 
rename from widget/shared/NativeKeyToDOMCodeName.h
rename to widget/NativeKeyToDOMCodeName.h
rename from widget/shared/NativeKeyToDOMKeyName.h
rename to widget/NativeKeyToDOMKeyName.h
rename from widget/shared/VsyncDispatcher.cpp
rename to widget/VsyncDispatcher.cpp
rename from widget/shared/VsyncDispatcher.h
rename to widget/VsyncDispatcher.h
rename from widget/shared/WidgetEventImpl.cpp
rename to widget/WidgetEventImpl.cpp
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -52,12 +52,11 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/docshell/base',
     '/dom/base',
     '/dom/system/android',
     '/netwerk/base/src',
     '/netwerk/cache',
     '/widget',
     '/widget/android/android',
-    '/widget/shared',
 ]
 
 #DEFINES['DEBUG_WIDGETS'] = True
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -69,17 +69,16 @@ if CONFIG['TARGET_CPU'] == 'x86_64':
     UNIFIED_SOURCES += [
         'ComplexTextInputPanel.mm',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../shared',
     '/layout/forms',
     '/layout/generic',
     '/layout/xul',
     '/widget',
 ]
 
 RESOURCE_FILES.cursors += [
     'cursors/arrowN.png',
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -67,17 +67,16 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/content/media/omx/mediaresourcemanager',
     '/dom/system/android',
     '/gfx/skia/trunk/include/config',
     '/gfx/skia/trunk/include/core',
     '/widget',
-    '/widget/shared',
 ]
 
 DEFINES['HAVE_OFF64_T'] = True
 DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
 
 if CONFIG['ANDROID_VERSION'] != '15':
     DEFINES['HAVE_POSIX_CLOCKS'] = True
 
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -76,26 +76,25 @@ else:
         'gtk3drawing.c',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../shared',
     '/layout/generic',
     '/layout/xul',
     '/other-licenses/atk-1.0',
     '/widget',
 ]
 
 if CONFIG['MOZ_X11']:
     LOCAL_INCLUDES += [
-        '../shared/x11',
+        '/widget/x11',
     ]
 
 DEFINES['CAIRO_GFX'] = True
 
 DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']
 
 CFLAGS += CONFIG['MOZ_STARTUP_NOTIFICATION_CFLAGS']
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -1,16 +1,14 @@
 # -*- 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/.
 
-DIRS += ['shared']
-
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if toolkit in ('cocoa', 'qt', 'android', 'gonk'):
     DIRS += [toolkit]
 if toolkit in ('qt', 'android', 'gonk', 'gtk2', 'gtk3'):
     EXPORTS += ['nsIPrintDialogService.h']
 
 if toolkit == 'windows':
@@ -115,16 +113,17 @@ EXPORTS.mozilla += [
     'EventClassList.h',
     'EventForwards.h',
     'LookAndFeel.h',
     'MiscEvents.h',
     'MouseEvents.h',
     'TextEvents.h',
     'TextRange.h',
     'TouchEvents.h',
+    'VsyncDispatcher.h',
     'WidgetUtils.h',
 ]
 
 UNIFIED_SOURCES += [
     'ContentHelper.cpp',
     'GfxDriverInfo.cpp',
     'GfxInfoBase.cpp',
     'GfxInfoCollector.cpp',
@@ -141,37 +140,41 @@ UNIFIED_SOURCES += [
     'nsHTMLFormatConverter.cpp',
     'nsIdleService.cpp',
     'nsIWidgetListener.cpp',
     'nsPrimitiveHelpers.cpp',
     'nsPrintOptionsImpl.cpp',
     'nsPrintSession.cpp',
     'nsPrintSettingsImpl.cpp',
     'nsScreenManagerProxy.cpp',
+    'nsShmImage.cpp',
     'nsTransferable.cpp',
     'nsXPLookAndFeel.cpp',
     'PuppetWidget.cpp',
     'ScreenProxy.cpp',
     'SharedWidgetUtils.cpp',
+    'VsyncDispatcher.cpp',
+    'WidgetEventImpl.cpp',
     'WidgetUtils.cpp',
 ]
 
 # nsBaseWidget.cpp needs to be built separately because of name clashes in the OS X headers
 SOURCES += [
     'nsBaseWidget.cpp',
 ]
 
 if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
     EXPORTS.mozilla += [
         'WidgetTraceEvent.h',
     ]
 
 EXPORTS.ipc = ['nsGUIEventIPC.h']
 
 if CONFIG['MOZ_X11']:
+    DIRS += ['x11']
     UNIFIED_SOURCES += [
         'GfxInfoX11.cpp'
     ]
 
 if toolkit in ('cocoa', 'windows'):
     UNIFIED_SOURCES += [
         'nsBaseClipboard.cpp',
     ]
@@ -197,17 +200,17 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/layout/base',
     '/layout/forms',
     '/layout/generic',
     '/layout/xul',
     '/view',
-    '/widget/shared',
+    '/widget',
 ]
 
 widget_dir = toolkit
 if widget_dir in ('gtk3', 'gtk2'):
     # gtk3 shares includes with gtk2
     widget_dir = 'gtk'
 
 LOCAL_INCLUDES += [
rename from widget/shared/nsShmImage.cpp
rename to widget/nsShmImage.cpp
rename from widget/shared/nsShmImage.h
rename to widget/nsShmImage.h
--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -32,17 +32,16 @@ if CONFIG['NS_PRINTING']:
         'nsPrintSettingsQt.cpp',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../shared',
     '/widget',
 ]
 
 if CONFIG['MOZ_X11']:
     LOCAL_INCLUDES += [
         '../shared/x11',
     ]
 
deleted file mode 100644
--- 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']
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -87,17 +87,16 @@ if CONFIG['NS_ENABLE_TSF']:
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../shared',
     '/layout/generic',
     '/layout/xul',
     '/toolkit/xre',
     '/widget',
     '/xpcom/base',
 ]
 
 DEFINES['MOZ_UNICODE'] = True
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -31,17 +31,16 @@ EXPORTS.mozilla.widget += [
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../',
-    '../../shared',
     '/layout/generic',
     '/layout/xul',
     '/toolkit/xre',
     '/widget',
     '/xpcom/base',
 ]
 
 DEFINES['MOZ_UNICODE'] = True
rename from widget/shared/x11/keysym2ucs.c
rename to widget/x11/keysym2ucs.c
rename from widget/shared/x11/keysym2ucs.h
rename to widget/x11/keysym2ucs.h
rename from widget/shared/x11/moz.build
rename to widget/x11/moz.build