Bug 1085696. Part 1 Move widget/xpwidget to /widget. r=roc

accessible/mac/moz.build

@@ -33,8 +33,8 @@ LOCAL_INCLUDES += [
     '/accessible/xul',
     '/layout/generic',
     '/layout/xul',
+    '/widget',
     '/widget/cocoa',
-    '/widget/xpwidgets',
 ]
 
 FINAL_LIBRARY = 'xul'

dom/base/moz.build

@@ -163,6 +163,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
+    '/widget',
     '/widget/shared',
 ]
 

dom/ipc/moz.build

@@ -119,7 +119,7 @@ LOCAL_INCLUDES += [
     '/netwerk/base/src',
     '/toolkit/xre',
     '/uriloader/exthandler',
-    '/widget/xpwidgets',
+    '/widget',
     '/xpcom/base',
     '/xpcom/threads',
 ]

dom/plugins/base/android/moz.build

@@ -31,8 +31,8 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/dom/plugins/base',
     '/gfx/gl',
+    '/widget',
     '/widget/android',
-    '/widget/xpwidgets',
 ]
 
 DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']

dom/plugins/base/moz.build

@@ -100,8 +100,8 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/layout/generic',
     '/layout/xul',
+    '/widget',
     '/widget/android',
-    '/widget/xpwidgets',
     '/xpcom/base',
 ]
 

dom/plugins/ipc/moz.build

@@ -54,7 +54,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
     DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX']
     LOCAL_INCLUDES += [
-        '/widget/shared',
+        '/widget',
         'hangui',
     ]
 

hal/moz.build

@@ -189,8 +189,8 @@ if CONFIG['MOZ_GAMEPAD']:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     # So that we can call nsScreenManagerGonk::GetConfiguration().
     LOCAL_INCLUDES += [
+        '/widget',
         '/widget/gonk',
-        '/widget/xpwidgets'
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':

widget/WidgetUtils.h

@@ -8,8 +8,13 @@
 #ifndef mozilla_WidgetUtils_h
 #define mozilla_WidgetUtils_h
 
-#include "nsRect.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/gfx/Matrix.h"
+#include "nsCOMPtr.h"
+#include "nsIDOMWindow.h"
+#include "nsIWidget.h"
+#include "nsPIDOMWindow.h"
+#include "nsRect.h"
 
 namespace mozilla {
 
@@ -33,6 +38,54 @@ nsIntRect RotateRect(nsIntRect aRect,
                      const nsIntRect& aBounds,
                      ScreenRotation aRotation);
 
+namespace widget {
+
+class WidgetUtils
+{
+public:
+
+  /**
+   * Starting at the docshell item for the passed in DOM window this looks up
+   * the docshell tree until it finds a docshell item that has a widget.
+   */
+  static already_AddRefed<nsIWidget> DOMWindowToWidget(nsIDOMWindow *aDOMWindow);
+
+  /**
+   * Compute our keyCode value (NS_VK_*) from an ASCII character.
+   */
+  static uint32_t ComputeKeyCodeFromChar(uint32_t aCharCode);
+
+  /**
+   * Get unshifted charCode and shifted charCode for aKeyCode if the keyboad
+   * layout is a Latin keyboard layout.
+   *
+   * @param aKeyCode            Our keyCode (NS_VK_*).
+   * @param aIsCapsLock         TRUE if CapsLock is Locked.  Otherwise, FALSE.
+   *                            This is used only when aKeyCode is NS_VK_[0-9].
+   * @param aUnshiftedCharCode  CharCode for aKeyCode without Shift key.
+   *                            This may be zero if aKeyCode key doesn't input
+   *                            a Latin character.
+   *                            Note that must not be nullptr.
+   * @param aShiftedCharCode    CharCode for aKeyCOde with Shift key.
+   *                            This is always 0 when aKeyCode isn't
+   *                            NS_VK_[A-Z].
+   *                            Note that must not be nullptr.
+   */
+  static void GetLatinCharCodeForKeyCode(uint32_t aKeyCode,
+                                         bool aIsCapsLock,
+                                         uint32_t* aUnshiftedCharCode,
+                                         uint32_t* aShiftedCharCode);
+
+  /**
+   * GetDeadKeyNameIndex() returns a key name index for dead key or
+   * "Unidentified".  This method can return the index from non-combining
+   * unicode character, e.g., '`' returns KEY_NAME_INDEX_DeadGrave.
+   * So, you cannot use this method for checking if the char is a dead char.
+   */
+  static KeyNameIndex GetDeadKeyNameIndex(char16_t aChar);
+};
+
+} // namespace widget
 } // namespace mozilla
 
 #endif // mozilla_WidgetUtils_h

widget/android/moz.build

@@ -55,9 +55,9 @@ LOCAL_INCLUDES += [
     '/dom/system/android',
     '/netwerk/base/src',
     '/netwerk/cache',
+    '/widget',
     '/widget/android/android',
     '/widget/shared',
-    '/widget/xpwidgets',
 ]
 
 #DEFINES['DEBUG_WIDGETS'] = True

widget/cocoa/moz.build

@@ -75,10 +75,10 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../shared',
-    '../xpwidgets',
     '/layout/forms',
     '/layout/generic',
     '/layout/xul',
+    '/widget',
 ]
 
 RESOURCE_FILES.cursors += [

widget/gonk/moz.build

@@ -71,8 +71,8 @@ LOCAL_INCLUDES += [
     '/dom/system/android',
     '/gfx/skia/trunk/include/config',
     '/gfx/skia/trunk/include/core',
+    '/widget',
     '/widget/shared',
-    '/widget/xpwidgets',
 ]
 
 DEFINES['HAVE_OFF64_T'] = True

widget/gtk/moz.build

@@ -82,10 +82,10 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
-    '../xpwidgets',
     '/layout/generic',
     '/layout/xul',
     '/other-licenses/atk-1.0',
+    '/widget',
 ]
 
 if CONFIG['MOZ_X11']:

widget/moz.build

@@ -4,7 +4,7 @@
 # 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', 'xpwidgets']
+DIRS += ['shared']
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
@@ -94,6 +94,10 @@ if CONFIG['MOZ_METRO']:
 XPIDL_MODULE = 'widget'
 
 EXPORTS += [
+    'ContentHelper.h',
+    'GfxDriverInfo.h',
+    'GfxInfoBase.h',
+    'GfxInfoCollector.h',
     'InputData.h',
     'nsIDeviceContextSpec.h',
     'nsIPluginWidget.h',
@@ -119,10 +123,99 @@ EXPORTS.mozilla += [
     'WidgetUtils.h',
 ]
 
+UNIFIED_SOURCES += [
+    'ContentHelper.cpp',
+    'GfxDriverInfo.cpp',
+    'GfxInfoBase.cpp',
+    'GfxInfoCollector.cpp',
+    'GfxInfoWebGL.cpp',
+    'InputData.cpp',
+    'nsBaseAppShell.cpp',
+    'nsBaseDragService.cpp',
+    'nsBaseScreen.cpp',
+    'nsClipboardHelper.cpp',
+    'nsClipboardProxy.cpp',
+    'nsColorPickerProxy.cpp',
+    'nsContentProcessWidgetFactory.cpp',
+    'nsFilePickerProxy.cpp',
+    'nsHTMLFormatConverter.cpp',
+    'nsIdleService.cpp',
+    'nsIWidgetListener.cpp',
+    'nsPrimitiveHelpers.cpp',
+    'nsPrintOptionsImpl.cpp',
+    'nsPrintSession.cpp',
+    'nsPrintSettingsImpl.cpp',
+    'nsScreenManagerProxy.cpp',
+    'nsTransferable.cpp',
+    'nsXPLookAndFeel.cpp',
+    'PuppetWidget.cpp',
+    'ScreenProxy.cpp',
+    'SharedWidgetUtils.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']:
+    UNIFIED_SOURCES += [
+        'GfxInfoX11.cpp'
+    ]
+
+if toolkit in ('cocoa', 'windows'):
+    UNIFIED_SOURCES += [
+        'nsBaseClipboard.cpp',
+    ]
+
+if toolkit in ('qt', 'gtk2', 'gtk3', 'cocoa', 'windows',
+                                    'android', 'gonk'):
+    UNIFIED_SOURCES += [
+        'nsBaseFilePicker.cpp',
+    ]
+
+if toolkit in ('qt', 'gtk2', 'gtk3', 'windows', 'cocoa'):
+    UNIFIED_SOURCES += [
+        'nsNativeTheme.cpp',
+    ]
+
+if not CONFIG['MOZ_B2G']:
+    DEFINES['MOZ_CROSS_PROCESS_IME'] = True
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/layout/base',
+    '/layout/forms',
+    '/layout/generic',
+    '/layout/xul',
+    '/view',
+    '/widget/shared',
+]
+
+widget_dir = toolkit
+if widget_dir in ('gtk3', 'gtk2'):
+    # gtk3 shares includes with gtk2
+    widget_dir = 'gtk'
+
+LOCAL_INCLUDES += [
+    '/widget/%s' % widget_dir,
+]
+FINAL_LIBRARY = 'xul'
+
+if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
+    DEFINES['MOZ_ENABLE_D3D10_LAYER'] = True
+
+CXXFLAGS += CONFIG['TK_CFLAGS']

widget/qt/moz.build

@@ -38,7 +38,7 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
-    '/widget/xpwidgets',
+    '/widget',
 ]
 
 if CONFIG['MOZ_X11']:

widget/shared/moz.build

@@ -13,7 +13,6 @@ EXPORTS.mozilla += [
 
 UNIFIED_SOURCES += [
     'nsShmImage.cpp',
-    'SharedWidgetUtils.cpp',
     'VsyncDispatcher.cpp',
     'WidgetEventImpl.cpp',
 ]

widget/windows/moz.build

@@ -93,10 +93,10 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
-    '../xpwidgets',
     '/layout/generic',
     '/layout/xul',
     '/toolkit/xre',
+    '/widget',
     '/xpcom/base',
 ]