From 9caeb9433f8c0bdb293050b11f6d5ffaee0a1f3b Mon Sep 17 00:00:00 2001
From: Mason Chang <mchang@mozilla.com>
Date: Thu, 23 Oct 2014 10:16:45 -0700
Subject: [PATCH] Bug 1085696. Part 1 Move widget/xpwidget to /widget. r=roc

--HG--
rename : widget/xpwidgets/ContentHelper.cpp => widget/ContentHelper.cpp
rename : widget/xpwidgets/ContentHelper.h => widget/ContentHelper.h
rename : widget/xpwidgets/GfxDriverInfo.cpp => widget/GfxDriverInfo.cpp
rename : widget/xpwidgets/GfxDriverInfo.h => widget/GfxDriverInfo.h
rename : widget/xpwidgets/GfxInfoBase.cpp => widget/GfxInfoBase.cpp
rename : widget/xpwidgets/GfxInfoBase.h => widget/GfxInfoBase.h
rename : widget/xpwidgets/GfxInfoCollector.cpp => widget/GfxInfoCollector.cpp
rename : widget/xpwidgets/GfxInfoCollector.h => widget/GfxInfoCollector.h
rename : widget/xpwidgets/GfxInfoWebGL.cpp => widget/GfxInfoWebGL.cpp
rename : widget/xpwidgets/GfxInfoWebGL.h => widget/GfxInfoWebGL.h
rename : widget/xpwidgets/GfxInfoX11.cpp => widget/GfxInfoX11.cpp
rename : widget/xpwidgets/GfxInfoX11.h => widget/GfxInfoX11.h
rename : widget/xpwidgets/InputData.cpp => widget/InputData.cpp
rename : widget/xpwidgets/PuppetWidget.cpp => widget/PuppetWidget.cpp
rename : widget/xpwidgets/PuppetWidget.h => widget/PuppetWidget.h
rename : widget/xpwidgets/ScreenProxy.cpp => widget/ScreenProxy.cpp
rename : widget/xpwidgets/ScreenProxy.h => widget/ScreenProxy.h
rename : widget/shared/SharedWidgetUtils.cpp => widget/SharedWidgetUtils.cpp
rename : widget/xpwidgets/WidgetUtils.cpp => widget/WidgetUtils.cpp
rename : widget/xpwidgets/nsAppShellSingleton.h => widget/nsAppShellSingleton.h
rename : widget/xpwidgets/nsBaseAppShell.cpp => widget/nsBaseAppShell.cpp
rename : widget/xpwidgets/nsBaseAppShell.h => widget/nsBaseAppShell.h
rename : widget/xpwidgets/nsBaseClipboard.cpp => widget/nsBaseClipboard.cpp
rename : widget/xpwidgets/nsBaseClipboard.h => widget/nsBaseClipboard.h
rename : widget/xpwidgets/nsBaseDragService.cpp => widget/nsBaseDragService.cpp
rename : widget/xpwidgets/nsBaseDragService.h => widget/nsBaseDragService.h
rename : widget/xpwidgets/nsBaseFilePicker.cpp => widget/nsBaseFilePicker.cpp
rename : widget/xpwidgets/nsBaseFilePicker.h => widget/nsBaseFilePicker.h
rename : widget/xpwidgets/nsBaseScreen.cpp => widget/nsBaseScreen.cpp
rename : widget/xpwidgets/nsBaseScreen.h => widget/nsBaseScreen.h
rename : widget/xpwidgets/nsBaseWidget.cpp => widget/nsBaseWidget.cpp
rename : widget/xpwidgets/nsBaseWidget.h => widget/nsBaseWidget.h
rename : widget/xpwidgets/nsClipboardHelper.cpp => widget/nsClipboardHelper.cpp
rename : widget/xpwidgets/nsClipboardHelper.h => widget/nsClipboardHelper.h
rename : widget/xpwidgets/nsClipboardProxy.cpp => widget/nsClipboardProxy.cpp
rename : widget/xpwidgets/nsClipboardProxy.h => widget/nsClipboardProxy.h
rename : widget/xpwidgets/nsColorPickerProxy.cpp => widget/nsColorPickerProxy.cpp
rename : widget/xpwidgets/nsColorPickerProxy.h => widget/nsColorPickerProxy.h
rename : widget/xpwidgets/nsContentProcessWidgetFactory.cpp => widget/nsContentProcessWidgetFactory.cpp
rename : widget/xpwidgets/nsFilePickerProxy.cpp => widget/nsFilePickerProxy.cpp
rename : widget/xpwidgets/nsFilePickerProxy.h => widget/nsFilePickerProxy.h
rename : widget/xpwidgets/nsHTMLFormatConverter.cpp => widget/nsHTMLFormatConverter.cpp
rename : widget/xpwidgets/nsHTMLFormatConverter.h => widget/nsHTMLFormatConverter.h
rename : widget/xpwidgets/nsIWidgetListener.cpp => widget/nsIWidgetListener.cpp
rename : widget/xpwidgets/nsIdleService.cpp => widget/nsIdleService.cpp
rename : widget/xpwidgets/nsIdleService.h => widget/nsIdleService.h
rename : widget/xpwidgets/nsNativeTheme.cpp => widget/nsNativeTheme.cpp
rename : widget/xpwidgets/nsNativeTheme.h => widget/nsNativeTheme.h
rename : widget/xpwidgets/nsPrimitiveHelpers.cpp => widget/nsPrimitiveHelpers.cpp
rename : widget/xpwidgets/nsPrimitiveHelpers.h => widget/nsPrimitiveHelpers.h
rename : widget/xpwidgets/nsPrintOptionsImpl.cpp => widget/nsPrintOptionsImpl.cpp
rename : widget/xpwidgets/nsPrintOptionsImpl.h => widget/nsPrintOptionsImpl.h
rename : widget/xpwidgets/nsPrintSession.cpp => widget/nsPrintSession.cpp
rename : widget/xpwidgets/nsPrintSession.h => widget/nsPrintSession.h
rename : widget/xpwidgets/nsPrintSettingsImpl.cpp => widget/nsPrintSettingsImpl.cpp
rename : widget/xpwidgets/nsPrintSettingsImpl.h => widget/nsPrintSettingsImpl.h
rename : widget/xpwidgets/nsScreenManagerProxy.cpp => widget/nsScreenManagerProxy.cpp
rename : widget/xpwidgets/nsScreenManagerProxy.h => widget/nsScreenManagerProxy.h
rename : widget/xpwidgets/nsTransferable.cpp => widget/nsTransferable.cpp
rename : widget/xpwidgets/nsTransferable.h => widget/nsTransferable.h
rename : widget/xpwidgets/nsXPLookAndFeel.cpp => widget/nsXPLookAndFeel.cpp
rename : widget/xpwidgets/nsXPLookAndFeel.h => widget/nsXPLookAndFeel.h
---
 accessible/mac/moz.build                      |   2 +-
 dom/base/moz.build                            |   1 +
 dom/ipc/moz.build                             |   2 +-
 dom/plugins/base/android/moz.build            |   2 +-
 dom/plugins/base/moz.build                    |   2 +-
 dom/plugins/ipc/moz.build                     |   2 +-
 hal/moz.build                                 |   2 +-
 widget/{xpwidgets => }/ContentHelper.cpp      |   0
 widget/{xpwidgets => }/ContentHelper.h        |   0
 widget/{xpwidgets => }/GfxDriverInfo.cpp      |   0
 widget/{xpwidgets => }/GfxDriverInfo.h        |   0
 widget/{xpwidgets => }/GfxInfoBase.cpp        |   0
 widget/{xpwidgets => }/GfxInfoBase.h          |   0
 widget/{xpwidgets => }/GfxInfoCollector.cpp   |   0
 widget/{xpwidgets => }/GfxInfoCollector.h     |   0
 widget/{xpwidgets => }/GfxInfoWebGL.cpp       |   0
 widget/{xpwidgets => }/GfxInfoWebGL.h         |   0
 widget/{xpwidgets => }/GfxInfoX11.cpp         |   0
 widget/{xpwidgets => }/GfxInfoX11.h           |   0
 widget/{xpwidgets => }/InputData.cpp          |   0
 widget/{xpwidgets => }/PuppetWidget.cpp       |   0
 widget/{xpwidgets => }/PuppetWidget.h         |   0
 widget/{xpwidgets => }/ScreenProxy.cpp        |   0
 widget/{xpwidgets => }/ScreenProxy.h          |   0
 widget/{shared => }/SharedWidgetUtils.cpp     |   0
 widget/{xpwidgets => }/WidgetUtils.cpp        |   0
 widget/WidgetUtils.h                          |  55 +++++++++-
 widget/android/moz.build                      |   2 +-
 widget/cocoa/moz.build                        |   2 +-
 widget/gonk/moz.build                         |   2 +-
 widget/gtk/moz.build                          |   2 +-
 widget/moz.build                              |  95 +++++++++++++++-
 widget/{xpwidgets => }/nsAppShellSingleton.h  |   0
 widget/{xpwidgets => }/nsBaseAppShell.cpp     |   0
 widget/{xpwidgets => }/nsBaseAppShell.h       |   0
 widget/{xpwidgets => }/nsBaseClipboard.cpp    |   0
 widget/{xpwidgets => }/nsBaseClipboard.h      |   0
 widget/{xpwidgets => }/nsBaseDragService.cpp  |   0
 widget/{xpwidgets => }/nsBaseDragService.h    |   0
 widget/{xpwidgets => }/nsBaseFilePicker.cpp   |   0
 widget/{xpwidgets => }/nsBaseFilePicker.h     |   0
 widget/{xpwidgets => }/nsBaseScreen.cpp       |   0
 widget/{xpwidgets => }/nsBaseScreen.h         |   0
 widget/{xpwidgets => }/nsBaseWidget.cpp       |   0
 widget/{xpwidgets => }/nsBaseWidget.h         |   0
 widget/{xpwidgets => }/nsClipboardHelper.cpp  |   0
 widget/{xpwidgets => }/nsClipboardHelper.h    |   0
 widget/{xpwidgets => }/nsClipboardProxy.cpp   |   0
 widget/{xpwidgets => }/nsClipboardProxy.h     |   0
 widget/{xpwidgets => }/nsColorPickerProxy.cpp |   0
 widget/{xpwidgets => }/nsColorPickerProxy.h   |   0
 .../nsContentProcessWidgetFactory.cpp         |   0
 widget/{xpwidgets => }/nsFilePickerProxy.cpp  |   0
 widget/{xpwidgets => }/nsFilePickerProxy.h    |   0
 .../{xpwidgets => }/nsHTMLFormatConverter.cpp |   0
 .../{xpwidgets => }/nsHTMLFormatConverter.h   |   0
 widget/{xpwidgets => }/nsIWidgetListener.cpp  |   0
 widget/{xpwidgets => }/nsIdleService.cpp      |   0
 widget/{xpwidgets => }/nsIdleService.h        |   0
 widget/{xpwidgets => }/nsNativeTheme.cpp      |   0
 widget/{xpwidgets => }/nsNativeTheme.h        |   0
 widget/{xpwidgets => }/nsPrimitiveHelpers.cpp |   0
 widget/{xpwidgets => }/nsPrimitiveHelpers.h   |   0
 widget/{xpwidgets => }/nsPrintOptionsImpl.cpp |   0
 widget/{xpwidgets => }/nsPrintOptionsImpl.h   |   0
 widget/{xpwidgets => }/nsPrintSession.cpp     |   0
 widget/{xpwidgets => }/nsPrintSession.h       |   0
 .../{xpwidgets => }/nsPrintSettingsImpl.cpp   |   0
 widget/{xpwidgets => }/nsPrintSettingsImpl.h  |   0
 .../{xpwidgets => }/nsScreenManagerProxy.cpp  |   0
 widget/{xpwidgets => }/nsScreenManagerProxy.h |   0
 widget/{xpwidgets => }/nsTransferable.cpp     |   0
 widget/{xpwidgets => }/nsTransferable.h       |   0
 widget/{xpwidgets => }/nsXPLookAndFeel.cpp    |   0
 widget/{xpwidgets => }/nsXPLookAndFeel.h      |   0
 widget/qt/moz.build                           |   2 +-
 widget/shared/WidgetUtils.h                   |  67 ------------
 widget/shared/moz.build                       |   1 -
 widget/windows/moz.build                      |   2 +-
 widget/windows/winrt/moz.build                |   2 +-
 widget/xpwidgets/moz.build                    | 101 ------------------
 81 files changed, 162 insertions(+), 184 deletions(-)
 rename widget/{xpwidgets => }/ContentHelper.cpp (100%)
 rename widget/{xpwidgets => }/ContentHelper.h (100%)
 rename widget/{xpwidgets => }/GfxDriverInfo.cpp (100%)
 rename widget/{xpwidgets => }/GfxDriverInfo.h (100%)
 rename widget/{xpwidgets => }/GfxInfoBase.cpp (100%)
 rename widget/{xpwidgets => }/GfxInfoBase.h (100%)
 rename widget/{xpwidgets => }/GfxInfoCollector.cpp (100%)
 rename widget/{xpwidgets => }/GfxInfoCollector.h (100%)
 rename widget/{xpwidgets => }/GfxInfoWebGL.cpp (100%)
 rename widget/{xpwidgets => }/GfxInfoWebGL.h (100%)
 rename widget/{xpwidgets => }/GfxInfoX11.cpp (100%)
 rename widget/{xpwidgets => }/GfxInfoX11.h (100%)
 rename widget/{xpwidgets => }/InputData.cpp (100%)
 rename widget/{xpwidgets => }/PuppetWidget.cpp (100%)
 rename widget/{xpwidgets => }/PuppetWidget.h (100%)
 rename widget/{xpwidgets => }/ScreenProxy.cpp (100%)
 rename widget/{xpwidgets => }/ScreenProxy.h (100%)
 rename widget/{shared => }/SharedWidgetUtils.cpp (100%)
 rename widget/{xpwidgets => }/WidgetUtils.cpp (100%)
 rename widget/{xpwidgets => }/nsAppShellSingleton.h (100%)
 rename widget/{xpwidgets => }/nsBaseAppShell.cpp (100%)
 rename widget/{xpwidgets => }/nsBaseAppShell.h (100%)
 rename widget/{xpwidgets => }/nsBaseClipboard.cpp (100%)
 rename widget/{xpwidgets => }/nsBaseClipboard.h (100%)
 rename widget/{xpwidgets => }/nsBaseDragService.cpp (100%)
 rename widget/{xpwidgets => }/nsBaseDragService.h (100%)
 rename widget/{xpwidgets => }/nsBaseFilePicker.cpp (100%)
 rename widget/{xpwidgets => }/nsBaseFilePicker.h (100%)
 rename widget/{xpwidgets => }/nsBaseScreen.cpp (100%)
 rename widget/{xpwidgets => }/nsBaseScreen.h (100%)
 rename widget/{xpwidgets => }/nsBaseWidget.cpp (100%)
 rename widget/{xpwidgets => }/nsBaseWidget.h (100%)
 rename widget/{xpwidgets => }/nsClipboardHelper.cpp (100%)
 rename widget/{xpwidgets => }/nsClipboardHelper.h (100%)
 rename widget/{xpwidgets => }/nsClipboardProxy.cpp (100%)
 rename widget/{xpwidgets => }/nsClipboardProxy.h (100%)
 rename widget/{xpwidgets => }/nsColorPickerProxy.cpp (100%)
 rename widget/{xpwidgets => }/nsColorPickerProxy.h (100%)
 rename widget/{xpwidgets => }/nsContentProcessWidgetFactory.cpp (100%)
 rename widget/{xpwidgets => }/nsFilePickerProxy.cpp (100%)
 rename widget/{xpwidgets => }/nsFilePickerProxy.h (100%)
 rename widget/{xpwidgets => }/nsHTMLFormatConverter.cpp (100%)
 rename widget/{xpwidgets => }/nsHTMLFormatConverter.h (100%)
 rename widget/{xpwidgets => }/nsIWidgetListener.cpp (100%)
 rename widget/{xpwidgets => }/nsIdleService.cpp (100%)
 rename widget/{xpwidgets => }/nsIdleService.h (100%)
 rename widget/{xpwidgets => }/nsNativeTheme.cpp (100%)
 rename widget/{xpwidgets => }/nsNativeTheme.h (100%)
 rename widget/{xpwidgets => }/nsPrimitiveHelpers.cpp (100%)
 rename widget/{xpwidgets => }/nsPrimitiveHelpers.h (100%)
 rename widget/{xpwidgets => }/nsPrintOptionsImpl.cpp (100%)
 rename widget/{xpwidgets => }/nsPrintOptionsImpl.h (100%)
 rename widget/{xpwidgets => }/nsPrintSession.cpp (100%)
 rename widget/{xpwidgets => }/nsPrintSession.h (100%)
 rename widget/{xpwidgets => }/nsPrintSettingsImpl.cpp (100%)
 rename widget/{xpwidgets => }/nsPrintSettingsImpl.h (100%)
 rename widget/{xpwidgets => }/nsScreenManagerProxy.cpp (100%)
 rename widget/{xpwidgets => }/nsScreenManagerProxy.h (100%)
 rename widget/{xpwidgets => }/nsTransferable.cpp (100%)
 rename widget/{xpwidgets => }/nsTransferable.h (100%)
 rename widget/{xpwidgets => }/nsXPLookAndFeel.cpp (100%)
 rename widget/{xpwidgets => }/nsXPLookAndFeel.h (100%)
 delete mode 100644 widget/shared/WidgetUtils.h
 delete mode 100644 widget/xpwidgets/moz.build

diff --git a/accessible/mac/moz.build b/accessible/mac/moz.build
index 40b2109e355..866cc35086b 100644
--- a/accessible/mac/moz.build
+++ b/accessible/mac/moz.build
@@ -33,8 +33,8 @@ LOCAL_INCLUDES += [
     '/accessible/xul',
     '/layout/generic',
     '/layout/xul',
+    '/widget',
     '/widget/cocoa',
-    '/widget/xpwidgets',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/base/moz.build b/dom/base/moz.build
index d8f05969df6..466d94d9018 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -163,6 +163,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
+    '/widget',
     '/widget/shared',
 ]
 
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index 500324fe741..964322fdd59 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -119,7 +119,7 @@ LOCAL_INCLUDES += [
     '/netwerk/base/src',
     '/toolkit/xre',
     '/uriloader/exthandler',
-    '/widget/xpwidgets',
+    '/widget',
     '/xpcom/base',
     '/xpcom/threads',
 ]
diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build
index 3a59e0eaf07..84718b83a54 100644
--- a/dom/plugins/base/android/moz.build
+++ b/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']
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
index b393a953331..45d279be12a 100644
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -100,8 +100,8 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/layout/generic',
     '/layout/xul',
+    '/widget',
     '/widget/android',
-    '/widget/xpwidgets',
     '/xpcom/base',
 ]
 
diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build
index 6d55aa40cbe..c807e6b427d 100644
--- a/dom/plugins/ipc/moz.build
+++ b/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',
     ]
 
diff --git a/hal/moz.build b/hal/moz.build
index 09d16e2c761..55e02508f6b 100644
--- a/hal/moz.build
+++ b/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':
diff --git a/widget/xpwidgets/ContentHelper.cpp b/widget/ContentHelper.cpp
similarity index 100%
rename from widget/xpwidgets/ContentHelper.cpp
rename to widget/ContentHelper.cpp
diff --git a/widget/xpwidgets/ContentHelper.h b/widget/ContentHelper.h
similarity index 100%
rename from widget/xpwidgets/ContentHelper.h
rename to widget/ContentHelper.h
diff --git a/widget/xpwidgets/GfxDriverInfo.cpp b/widget/GfxDriverInfo.cpp
similarity index 100%
rename from widget/xpwidgets/GfxDriverInfo.cpp
rename to widget/GfxDriverInfo.cpp
diff --git a/widget/xpwidgets/GfxDriverInfo.h b/widget/GfxDriverInfo.h
similarity index 100%
rename from widget/xpwidgets/GfxDriverInfo.h
rename to widget/GfxDriverInfo.h
diff --git a/widget/xpwidgets/GfxInfoBase.cpp b/widget/GfxInfoBase.cpp
similarity index 100%
rename from widget/xpwidgets/GfxInfoBase.cpp
rename to widget/GfxInfoBase.cpp
diff --git a/widget/xpwidgets/GfxInfoBase.h b/widget/GfxInfoBase.h
similarity index 100%
rename from widget/xpwidgets/GfxInfoBase.h
rename to widget/GfxInfoBase.h
diff --git a/widget/xpwidgets/GfxInfoCollector.cpp b/widget/GfxInfoCollector.cpp
similarity index 100%
rename from widget/xpwidgets/GfxInfoCollector.cpp
rename to widget/GfxInfoCollector.cpp
diff --git a/widget/xpwidgets/GfxInfoCollector.h b/widget/GfxInfoCollector.h
similarity index 100%
rename from widget/xpwidgets/GfxInfoCollector.h
rename to widget/GfxInfoCollector.h
diff --git a/widget/xpwidgets/GfxInfoWebGL.cpp b/widget/GfxInfoWebGL.cpp
similarity index 100%
rename from widget/xpwidgets/GfxInfoWebGL.cpp
rename to widget/GfxInfoWebGL.cpp
diff --git a/widget/xpwidgets/GfxInfoWebGL.h b/widget/GfxInfoWebGL.h
similarity index 100%
rename from widget/xpwidgets/GfxInfoWebGL.h
rename to widget/GfxInfoWebGL.h
diff --git a/widget/xpwidgets/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp
similarity index 100%
rename from widget/xpwidgets/GfxInfoX11.cpp
rename to widget/GfxInfoX11.cpp
diff --git a/widget/xpwidgets/GfxInfoX11.h b/widget/GfxInfoX11.h
similarity index 100%
rename from widget/xpwidgets/GfxInfoX11.h
rename to widget/GfxInfoX11.h
diff --git a/widget/xpwidgets/InputData.cpp b/widget/InputData.cpp
similarity index 100%
rename from widget/xpwidgets/InputData.cpp
rename to widget/InputData.cpp
diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/PuppetWidget.cpp
similarity index 100%
rename from widget/xpwidgets/PuppetWidget.cpp
rename to widget/PuppetWidget.cpp
diff --git a/widget/xpwidgets/PuppetWidget.h b/widget/PuppetWidget.h
similarity index 100%
rename from widget/xpwidgets/PuppetWidget.h
rename to widget/PuppetWidget.h
diff --git a/widget/xpwidgets/ScreenProxy.cpp b/widget/ScreenProxy.cpp
similarity index 100%
rename from widget/xpwidgets/ScreenProxy.cpp
rename to widget/ScreenProxy.cpp
diff --git a/widget/xpwidgets/ScreenProxy.h b/widget/ScreenProxy.h
similarity index 100%
rename from widget/xpwidgets/ScreenProxy.h
rename to widget/ScreenProxy.h
diff --git a/widget/shared/SharedWidgetUtils.cpp b/widget/SharedWidgetUtils.cpp
similarity index 100%
rename from widget/shared/SharedWidgetUtils.cpp
rename to widget/SharedWidgetUtils.cpp
diff --git a/widget/xpwidgets/WidgetUtils.cpp b/widget/WidgetUtils.cpp
similarity index 100%
rename from widget/xpwidgets/WidgetUtils.cpp
rename to widget/WidgetUtils.cpp
diff --git a/widget/WidgetUtils.h b/widget/WidgetUtils.h
index 9511b298898..25bc8c8e6e9 100644
--- a/widget/WidgetUtils.h
+++ b/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
diff --git a/widget/android/moz.build b/widget/android/moz.build
index 7c1cff8cbb1..fd7237e8211 100644
--- a/widget/android/moz.build
+++ b/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
diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build
index 3c42e615710..0cf5fdfa03d 100644
--- a/widget/cocoa/moz.build
+++ b/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 += [
diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build
index 11a22c5dc8a..d320e275fa1 100644
--- a/widget/gonk/moz.build
+++ b/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
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
index 7a3cb7af280..8d30a64dccd 100644
--- a/widget/gtk/moz.build
+++ b/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']:
diff --git a/widget/moz.build b/widget/moz.build
index 7512cd9a406..c348c2ced56 100644
--- a/widget/moz.build
+++ b/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,6 +123,42 @@ 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',
@@ -126,3 +166,56 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
 
 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']
diff --git a/widget/xpwidgets/nsAppShellSingleton.h b/widget/nsAppShellSingleton.h
similarity index 100%
rename from widget/xpwidgets/nsAppShellSingleton.h
rename to widget/nsAppShellSingleton.h
diff --git a/widget/xpwidgets/nsBaseAppShell.cpp b/widget/nsBaseAppShell.cpp
similarity index 100%
rename from widget/xpwidgets/nsBaseAppShell.cpp
rename to widget/nsBaseAppShell.cpp
diff --git a/widget/xpwidgets/nsBaseAppShell.h b/widget/nsBaseAppShell.h
similarity index 100%
rename from widget/xpwidgets/nsBaseAppShell.h
rename to widget/nsBaseAppShell.h
diff --git a/widget/xpwidgets/nsBaseClipboard.cpp b/widget/nsBaseClipboard.cpp
similarity index 100%
rename from widget/xpwidgets/nsBaseClipboard.cpp
rename to widget/nsBaseClipboard.cpp
diff --git a/widget/xpwidgets/nsBaseClipboard.h b/widget/nsBaseClipboard.h
similarity index 100%
rename from widget/xpwidgets/nsBaseClipboard.h
rename to widget/nsBaseClipboard.h
diff --git a/widget/xpwidgets/nsBaseDragService.cpp b/widget/nsBaseDragService.cpp
similarity index 100%
rename from widget/xpwidgets/nsBaseDragService.cpp
rename to widget/nsBaseDragService.cpp
diff --git a/widget/xpwidgets/nsBaseDragService.h b/widget/nsBaseDragService.h
similarity index 100%
rename from widget/xpwidgets/nsBaseDragService.h
rename to widget/nsBaseDragService.h
diff --git a/widget/xpwidgets/nsBaseFilePicker.cpp b/widget/nsBaseFilePicker.cpp
similarity index 100%
rename from widget/xpwidgets/nsBaseFilePicker.cpp
rename to widget/nsBaseFilePicker.cpp
diff --git a/widget/xpwidgets/nsBaseFilePicker.h b/widget/nsBaseFilePicker.h
similarity index 100%
rename from widget/xpwidgets/nsBaseFilePicker.h
rename to widget/nsBaseFilePicker.h
diff --git a/widget/xpwidgets/nsBaseScreen.cpp b/widget/nsBaseScreen.cpp
similarity index 100%
rename from widget/xpwidgets/nsBaseScreen.cpp
rename to widget/nsBaseScreen.cpp
diff --git a/widget/xpwidgets/nsBaseScreen.h b/widget/nsBaseScreen.h
similarity index 100%
rename from widget/xpwidgets/nsBaseScreen.h
rename to widget/nsBaseScreen.h
diff --git a/widget/xpwidgets/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
similarity index 100%
rename from widget/xpwidgets/nsBaseWidget.cpp
rename to widget/nsBaseWidget.cpp
diff --git a/widget/xpwidgets/nsBaseWidget.h b/widget/nsBaseWidget.h
similarity index 100%
rename from widget/xpwidgets/nsBaseWidget.h
rename to widget/nsBaseWidget.h
diff --git a/widget/xpwidgets/nsClipboardHelper.cpp b/widget/nsClipboardHelper.cpp
similarity index 100%
rename from widget/xpwidgets/nsClipboardHelper.cpp
rename to widget/nsClipboardHelper.cpp
diff --git a/widget/xpwidgets/nsClipboardHelper.h b/widget/nsClipboardHelper.h
similarity index 100%
rename from widget/xpwidgets/nsClipboardHelper.h
rename to widget/nsClipboardHelper.h
diff --git a/widget/xpwidgets/nsClipboardProxy.cpp b/widget/nsClipboardProxy.cpp
similarity index 100%
rename from widget/xpwidgets/nsClipboardProxy.cpp
rename to widget/nsClipboardProxy.cpp
diff --git a/widget/xpwidgets/nsClipboardProxy.h b/widget/nsClipboardProxy.h
similarity index 100%
rename from widget/xpwidgets/nsClipboardProxy.h
rename to widget/nsClipboardProxy.h
diff --git a/widget/xpwidgets/nsColorPickerProxy.cpp b/widget/nsColorPickerProxy.cpp
similarity index 100%
rename from widget/xpwidgets/nsColorPickerProxy.cpp
rename to widget/nsColorPickerProxy.cpp
diff --git a/widget/xpwidgets/nsColorPickerProxy.h b/widget/nsColorPickerProxy.h
similarity index 100%
rename from widget/xpwidgets/nsColorPickerProxy.h
rename to widget/nsColorPickerProxy.h
diff --git a/widget/xpwidgets/nsContentProcessWidgetFactory.cpp b/widget/nsContentProcessWidgetFactory.cpp
similarity index 100%
rename from widget/xpwidgets/nsContentProcessWidgetFactory.cpp
rename to widget/nsContentProcessWidgetFactory.cpp
diff --git a/widget/xpwidgets/nsFilePickerProxy.cpp b/widget/nsFilePickerProxy.cpp
similarity index 100%
rename from widget/xpwidgets/nsFilePickerProxy.cpp
rename to widget/nsFilePickerProxy.cpp
diff --git a/widget/xpwidgets/nsFilePickerProxy.h b/widget/nsFilePickerProxy.h
similarity index 100%
rename from widget/xpwidgets/nsFilePickerProxy.h
rename to widget/nsFilePickerProxy.h
diff --git a/widget/xpwidgets/nsHTMLFormatConverter.cpp b/widget/nsHTMLFormatConverter.cpp
similarity index 100%
rename from widget/xpwidgets/nsHTMLFormatConverter.cpp
rename to widget/nsHTMLFormatConverter.cpp
diff --git a/widget/xpwidgets/nsHTMLFormatConverter.h b/widget/nsHTMLFormatConverter.h
similarity index 100%
rename from widget/xpwidgets/nsHTMLFormatConverter.h
rename to widget/nsHTMLFormatConverter.h
diff --git a/widget/xpwidgets/nsIWidgetListener.cpp b/widget/nsIWidgetListener.cpp
similarity index 100%
rename from widget/xpwidgets/nsIWidgetListener.cpp
rename to widget/nsIWidgetListener.cpp
diff --git a/widget/xpwidgets/nsIdleService.cpp b/widget/nsIdleService.cpp
similarity index 100%
rename from widget/xpwidgets/nsIdleService.cpp
rename to widget/nsIdleService.cpp
diff --git a/widget/xpwidgets/nsIdleService.h b/widget/nsIdleService.h
similarity index 100%
rename from widget/xpwidgets/nsIdleService.h
rename to widget/nsIdleService.h
diff --git a/widget/xpwidgets/nsNativeTheme.cpp b/widget/nsNativeTheme.cpp
similarity index 100%
rename from widget/xpwidgets/nsNativeTheme.cpp
rename to widget/nsNativeTheme.cpp
diff --git a/widget/xpwidgets/nsNativeTheme.h b/widget/nsNativeTheme.h
similarity index 100%
rename from widget/xpwidgets/nsNativeTheme.h
rename to widget/nsNativeTheme.h
diff --git a/widget/xpwidgets/nsPrimitiveHelpers.cpp b/widget/nsPrimitiveHelpers.cpp
similarity index 100%
rename from widget/xpwidgets/nsPrimitiveHelpers.cpp
rename to widget/nsPrimitiveHelpers.cpp
diff --git a/widget/xpwidgets/nsPrimitiveHelpers.h b/widget/nsPrimitiveHelpers.h
similarity index 100%
rename from widget/xpwidgets/nsPrimitiveHelpers.h
rename to widget/nsPrimitiveHelpers.h
diff --git a/widget/xpwidgets/nsPrintOptionsImpl.cpp b/widget/nsPrintOptionsImpl.cpp
similarity index 100%
rename from widget/xpwidgets/nsPrintOptionsImpl.cpp
rename to widget/nsPrintOptionsImpl.cpp
diff --git a/widget/xpwidgets/nsPrintOptionsImpl.h b/widget/nsPrintOptionsImpl.h
similarity index 100%
rename from widget/xpwidgets/nsPrintOptionsImpl.h
rename to widget/nsPrintOptionsImpl.h
diff --git a/widget/xpwidgets/nsPrintSession.cpp b/widget/nsPrintSession.cpp
similarity index 100%
rename from widget/xpwidgets/nsPrintSession.cpp
rename to widget/nsPrintSession.cpp
diff --git a/widget/xpwidgets/nsPrintSession.h b/widget/nsPrintSession.h
similarity index 100%
rename from widget/xpwidgets/nsPrintSession.h
rename to widget/nsPrintSession.h
diff --git a/widget/xpwidgets/nsPrintSettingsImpl.cpp b/widget/nsPrintSettingsImpl.cpp
similarity index 100%
rename from widget/xpwidgets/nsPrintSettingsImpl.cpp
rename to widget/nsPrintSettingsImpl.cpp
diff --git a/widget/xpwidgets/nsPrintSettingsImpl.h b/widget/nsPrintSettingsImpl.h
similarity index 100%
rename from widget/xpwidgets/nsPrintSettingsImpl.h
rename to widget/nsPrintSettingsImpl.h
diff --git a/widget/xpwidgets/nsScreenManagerProxy.cpp b/widget/nsScreenManagerProxy.cpp
similarity index 100%
rename from widget/xpwidgets/nsScreenManagerProxy.cpp
rename to widget/nsScreenManagerProxy.cpp
diff --git a/widget/xpwidgets/nsScreenManagerProxy.h b/widget/nsScreenManagerProxy.h
similarity index 100%
rename from widget/xpwidgets/nsScreenManagerProxy.h
rename to widget/nsScreenManagerProxy.h
diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/nsTransferable.cpp
similarity index 100%
rename from widget/xpwidgets/nsTransferable.cpp
rename to widget/nsTransferable.cpp
diff --git a/widget/xpwidgets/nsTransferable.h b/widget/nsTransferable.h
similarity index 100%
rename from widget/xpwidgets/nsTransferable.h
rename to widget/nsTransferable.h
diff --git a/widget/xpwidgets/nsXPLookAndFeel.cpp b/widget/nsXPLookAndFeel.cpp
similarity index 100%
rename from widget/xpwidgets/nsXPLookAndFeel.cpp
rename to widget/nsXPLookAndFeel.cpp
diff --git a/widget/xpwidgets/nsXPLookAndFeel.h b/widget/nsXPLookAndFeel.h
similarity index 100%
rename from widget/xpwidgets/nsXPLookAndFeel.h
rename to widget/nsXPLookAndFeel.h
diff --git a/widget/qt/moz.build b/widget/qt/moz.build
index 9018ad6878e..6b5f6327554 100644
--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -38,7 +38,7 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
-    '/widget/xpwidgets',
+    '/widget',
 ]
 
 if CONFIG['MOZ_X11']:
diff --git a/widget/shared/WidgetUtils.h b/widget/shared/WidgetUtils.h
deleted file mode 100644
index 9d8cfd8f174..00000000000
--- a/widget/shared/WidgetUtils.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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/. */
-
-#ifndef __mozilla_widget_WidgetUtils_h__
-#define __mozilla_widget_WidgetUtils_h__
-
-#include "nsCOMPtr.h"
-#include "nsIWidget.h"
-#include "nsPIDOMWindow.h"
-#include "nsIDOMWindow.h"
-#include "mozilla/EventForwards.h"
-
-namespace mozilla {
-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
diff --git a/widget/shared/moz.build b/widget/shared/moz.build
index ffbc0b8dab2..995718e0b6c 100644
--- a/widget/shared/moz.build
+++ b/widget/shared/moz.build
@@ -13,7 +13,6 @@ EXPORTS.mozilla += [
 
 UNIFIED_SOURCES += [
     'nsShmImage.cpp',
-    'SharedWidgetUtils.cpp',
     'VsyncDispatcher.cpp',
     'WidgetEventImpl.cpp',
 ]
diff --git a/widget/windows/moz.build b/widget/windows/moz.build
index af4d5199043..fcd1c41e1aa 100644
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -93,10 +93,10 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
-    '../xpwidgets',
     '/layout/generic',
     '/layout/xul',
     '/toolkit/xre',
+    '/widget',
     '/xpcom/base',
 ]
 
diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build
index 08b12b13b31..1a64418fee4 100644
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -37,10 +37,10 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../',
     '../../shared',
-    '../../xpwidgets',
     '/layout/generic',
     '/layout/xul',
     '/toolkit/xre',
+    '/widget',
     '/xpcom/base',
 ]
 
diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build
deleted file mode 100644
index 1460c63365b..00000000000
--- a/widget/xpwidgets/moz.build
+++ /dev/null
@@ -1,101 +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/.
-
-EXPORTS += [
-    'ContentHelper.h',
-    'GfxDriverInfo.h',
-    'GfxInfoBase.h',
-    'GfxInfoCollector.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',
-    'WidgetUtils.cpp',
-]
-
-# nsBaseWidget.cpp needs to be built separately because of name clashes in the OS X headers
-SOURCES += [
-    'nsBaseWidget.cpp',
-]
-
-if CONFIG['MOZ_X11']:
-    UNIFIED_SOURCES += [
-        'GfxInfoX11.cpp'
-    ]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'windows'):
-    UNIFIED_SOURCES += [
-        'nsBaseClipboard.cpp',
-    ]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3', 'cocoa', 'windows',
-                                    'android', 'gonk'):
-    UNIFIED_SOURCES += [
-        'nsBaseFilePicker.cpp',
-    ]
-
-if CONFIG['MOZ_WIDGET_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 += [
-    '../shared',
-    '/layout/base',
-    '/layout/forms',
-    '/layout/generic',
-    '/layout/xul',
-    '/view',
-]
-
-widget_dir = CONFIG['MOZ_WIDGET_TOOLKIT']
-if widget_dir in ('gtk3', 'gtk2'):
-    # gtk3 shares includes with gtk2
-    widget_dir = 'gtk'
-
-LOCAL_INCLUDES += [
-    '../%s' % widget_dir,
-]
-FINAL_LIBRARY = 'xul'
-
-if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
-    DEFINES['MOZ_ENABLE_D3D10_LAYER'] = True
-
-CXXFLAGS += CONFIG['TK_CFLAGS']