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

@@ -164,7 +164,6 @@ LOCAL_INCLUDES += [
     '/layout/style',
     '/layout/xul',
     '/widget',
-    '/widget/shared',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':

widget/android/moz.build

@@ -57,7 +57,6 @@ LOCAL_INCLUDES += [
     '/netwerk/cache',
     '/widget',
     '/widget/android/android',
-    '/widget/shared',
 ]
 
 #DEFINES['DEBUG_WIDGETS'] = True

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',

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

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

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

widget/qt/moz.build

@@ -37,7 +37,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../shared',
     '/widget',
 ]
 

widget/shared/moz.build

@@ -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']

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',

widget/windows/winrt/moz.build

@@ -36,7 +36,6 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../',
-    '../../shared',
     '/layout/generic',
     '/layout/xul',
     '/toolkit/xre',