Bug 679226 - Fold widget/src into widget. r=roc

Brli · Jan 4, 2012 · 9cb2484 · 9cb2484
1 parent f8bc126
commit 9cb2484
Show file tree

Hide file tree

Showing 580 changed files with 1,048 additions and 1,143 deletions.
diff --git a/accessible/accessible-docs.html b/accessible/accessible-docs.html
@@ -819,7 +819,7 @@ <h3 style="margin-left: 40px;"><a name="Creation_of_IAccessible_Objects"></a>Cre
  href="http://lxr.mozilla.org/seamonkey/search?string=WM_GETOBJECT">WM_GETOBJECT</a>
 message requesting an IAccessible for your root object in the window. In
 our case, this event is received in <a
- href="http://lxr.mozilla.org/seamonkey/source/widget/src/windows/nsWindow.cpp#4370">mozilla/widget/src/windows/nsWindow.cpp</a>.
+ href="http://lxr.mozilla.org/mozilla-central/source/widget/windows/nsWindow.cpp#4370">mozilla/widget/windows/nsWindow.cpp</a>.
 We send back an IAccessible pointer which can be used by the client to
 get information about this root object. The assistive technology will
 use that root IAccessible to traverse the rest of the object tree, by

diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
@@ -614,7 +614,7 @@ toplevel_event_watcher(GSignalInvocationHint* ihint,
 bool
 nsApplicationAccessibleWrap::Init()
 {
-    // XXX following code is copied from widget/src/gtk2/nsWindow.cpp
+    // XXX following code is copied from widget/gtk2/nsWindow.cpp
     // we should put it to somewhere that can be used from both modules
     // see bug 390761
 

diff --git a/accessible/src/mac/mozAccessibleProtocol.h b/accessible/src/mac/mozAccessibleProtocol.h
@@ -40,7 +40,7 @@
 
 #import "mozView.h"
 
-/* This protocol's primary use is so widget/src/cocoa can talk back to us
+/* This protocol's primary use is so widget/cocoa can talk back to us
    properly.
    
    ChildView owns the topmost mozRootAccessible, and needs to take care of setting up 

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
@@ -384,7 +384,7 @@ pref("security.fileuri.strict_origin_policy", false);
 
 // Temporarily force-enable GL compositing.  This is default-disabled
 // deep within the bowels of the widgetry system.  Remove me when GL
-// compositing isn't default disabled in widget/src/android.
+// compositing isn't default disabled in widget/android.
 pref("layers.acceleration.force-enabled", true);
 
 // screen.enabled and screen.brightness properties.

diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -2263,7 +2263,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
     if (pPluginEvent) {
       // Make event coordinates relative to our enclosing widget,
       // not the widget they were received on.
-      // See use of NPEvent in widget/src/windows/nsWindow.cpp
+      // See use of NPEvent in widget/windows/nsWindow.cpp
       // for why this assert should be safe
       NS_ASSERTION(anEvent.message == NS_MOUSE_BUTTON_DOWN ||
                    anEvent.message == NS_MOUSE_BUTTON_UP ||

diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp
@@ -1622,7 +1622,7 @@ PluginInstanceParent::RecvNegotiatedCarbon()
 
   focus from child -> focus manager:
     Child picks up the local wm_setfocus and sends it via ipc over
-    here. We then post a custom event to widget/src/windows/nswindow
+    here. We then post a custom event to widget/windows/nswindow
     which fires off a gui event letting the browser know.
 */
 

diff --git a/mobile/android/app/Makefile.in b/mobile/android/app/Makefile.in
@@ -66,10 +66,10 @@ LIBS += \
 
 ifeq ($(MOZ_PLATFORM_MAEMO),6)
 LIBS += \
-  $(LIBXUL_DIST)/../widget/src/qt/faststartupqt/$(LIB_PREFIX)faststartupqt.$(LIB_SUFFIX) \
+  $(LIBXUL_DIST)/../widget/qt/faststartupqt/$(LIB_PREFIX)faststartupqt.$(LIB_SUFFIX) \
   $(MOZ_QT_LIBS) \
   $(NULL)
-LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/qt/faststartupqt $(TK_CFLAGS)
+LOCAL_INCLUDES += -I$(topsrcdir)/widget/qt/faststartupqt $(TK_CFLAGS)
 endif
 
 ifeq ($(OS_ARCH),WINNT)

diff --git a/mobile/xul/app/Makefile.in b/mobile/xul/app/Makefile.in
@@ -67,10 +67,10 @@ LIBS += \
 
 ifeq ($(MOZ_PLATFORM_MAEMO),6)
 LIBS += \
-  $(LIBXUL_DIST)/../widget/src/qt/faststartupqt/$(LIB_PREFIX)faststartupqt.$(LIB_SUFFIX) \
+  $(LIBXUL_DIST)/../widget/qt/faststartupqt/$(LIB_PREFIX)faststartupqt.$(LIB_SUFFIX) \
   $(MOZ_QT_LIBS) \
   $(NULL)
-LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/qt/faststartupqt $(TK_CFLAGS)
+LOCAL_INCLUDES += -I$(topsrcdir)/widget/qt/faststartupqt $(TK_CFLAGS)
 endif
 
 ifeq ($(OS_ARCH),WINNT)

diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
@@ -55,9 +55,9 @@ include ../../security/manager/ssl/crashtests/crashtests.list
 
 include ../../view/crashtests/crashtests.list
 
-include ../../widget/src/cocoa/crashtests/crashtests.list
-include ../../widget/src/gtk2/crashtests/crashtests.list
-include ../../widget/src/crashtests/crashtests.list
+include ../../widget/cocoa/crashtests/crashtests.list
+include ../../widget/gtk2/crashtests/crashtests.list
+include ../../widget/crashtests/crashtests.list
 
 include ../../media/libpng/crashtests/crashtests.list
 

diff --git a/toolkit/content/license.html b/toolkit/content/license.html
@@ -2018,7 +2018,7 @@ <h1><a name="angle"></a>ANGLE License</h1>
 
     <h1><a name="apple"></a>Apple License</h1>
 
-    <p>This license applies to certain files in the directories <span class="path">js/src/assembler/assembler/</span>, <span class="path">js/src/assembler/wtf/</span>, <span class="path">js/src/yarr</span>, and <span class="path">widget/src/cocoa</span>.</p>
+    <p>This license applies to certain files in the directories <span class="path">js/src/assembler/assembler/</span>, <span class="path">js/src/assembler/wtf/</span>, <span class="path">js/src/yarr</span>, and <span class="path">widget/cocoa</span>.</p>
 
 <pre>
 Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
@@ -2257,7 +2257,7 @@ <h1><a name="chromium"></a>Chromium License</h1>
 
     <p>This license applies to parts of the code in
       <span class="path">editor/libeditor/base/nsEditorEventListener.cpp</span>,
-      <span class="path">widget/src/cocoa/GfxInfo.mm</span>
+      <span class="path">widget/cocoa/GfxInfo.mm</span>
       and also some files in the directories
       <span class="path">ipc/chromium/</span>,
       <span class="path">dom/plugins/</span>,

diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
@@ -107,7 +107,7 @@ ifndef MOZ_NATIVE_ZLIB
 CPPSRCS += dlldeps-zlib.cpp
 endif
 
-LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/windows
+LOCAL_INCLUDES += -I$(topsrcdir)/widget/windows
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 endif
 
@@ -127,9 +127,9 @@ CPPSRCS += dlldeps-zlib.cpp
 endif
 
 RESFILE = xulrunos2.res
-RCFLAGS += -i $(topsrcdir)/widget/src/os2
+RCFLAGS += -i $(topsrcdir)/widget/os2
 
-LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2
+LOCAL_INCLUDES += -I$(topsrcdir)/widget/os2
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 endif
 
@@ -522,7 +522,7 @@ endif
 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
 EXTRA_DSO_LDOPTS += $(FT2_LIBS) $(MOZ_PANGO_LIBS)
-EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/../widget/src/qt/faststartupqt/$(LIB_PREFIX)faststartupqt.$(LIB_SUFFIX)
+EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/../widget/qt/faststartupqt/$(LIB_PREFIX)faststartupqt.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_TREE_FREETYPE
@@ -577,11 +577,11 @@ include $(topsrcdir)/config/rules.mk
 export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
 	$(INSTALL) $^ .
 
-# need widget/src/windows for resource.h (included from widget.rc)
+# need widget/windows for resource.h (included from widget.rc)
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/config \
-  -I$(topsrcdir)/widget/src/windows \
-  -I$(topsrcdir)/widget/src/build \
+  -I$(topsrcdir)/widget/windows \
+  -I$(topsrcdir)/widget/build \
   $(NULL)
 
 OS_LIBS += $(LIBICONV)

diff --git a/toolkit/library/nsDllMain.cpp b/toolkit/library/nsDllMain.cpp
@@ -13,7 +13,7 @@
  * License.
  *
  * The Original Code is mozilla.org code. This file was copied in part from
- * mozilla/widget/src/windows/nsToolkit.cpp
+ * mozilla/widget/windows/nsToolkit.cpp
  *
  * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.

diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
@@ -380,9 +380,9 @@ MAKEFILES_docshell="
 MAKEFILES_widget="
   widget/Makefile
   widget/public/Makefile
-  widget/src/Makefile
-  widget/src/shared/Makefile
-  widget/src/xpwidgets/Makefile
+  widget/Makefile
+  widget/shared/Makefile
+  widget/xpwidgets/Makefile
 "
 
 MAKEFILES_xpcom="
@@ -595,8 +595,8 @@ if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
     intl/locale/src/windows/Makefile
     netwerk/system/win32/Makefile
     toolkit/system/windowsproxy/Makefile
-    widget/src/build/Makefile
-    widget/src/windows/Makefile
+    widget/build/Makefile
+    widget/windows/Makefile
     xpcom/reflect/xptcall/src/md/win32/Makefile
   "
 elif [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" ]; then
@@ -613,20 +613,20 @@ elif [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" ]; then
     toolkit/themes/pinstripe/mozapps/Makefile
     toolkit/components/alerts/mac/Makefile
     toolkit/components/alerts/mac/growl/Makefile
-    widget/src/cocoa/Makefile
+    widget/cocoa/Makefile
   "
 elif [ "$MOZ_WIDGET_TOOLKIT" = "gtk2" ]; then
   add_makefiles "
     image/decoders/icon/gtk/Makefile
-    widget/src/gtk2/Makefile
+    widget/gtk2/Makefile
   "
 elif [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
   add_makefiles "
     dom/plugins/base/android/Makefile
     dom/system/android/Makefile
     image/decoders/icon/android/Makefile
     netwerk/system/android/Makefile
-    widget/src/android/Makefile
+    widget/android/Makefile
   "
   if [ "$MOZ_BUILD_APP" = "mobile/xul" ]; then
     add_makefiles "
@@ -636,21 +636,21 @@ elif [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
   fi
 elif [ "$MOZ_WIDGET_TOOLKIT" = "gonk" ]; then
   add_makefiles "
-    widget/src/gonk/Makefile
+    widget/gonk/Makefile
   "
 elif [ "$MOZ_WIDGET_TOOLKIT" = "qt" ]; then
   add_makefiles "
     image/decoders/icon/qt/Makefile
     image/decoders/icon/qt/public/Makefile
-    widget/src/qt/Makefile
-    widget/src/qt/faststartupqt/Makefile
+    widget/qt/Makefile
+    widget/qt/faststartupqt/Makefile
   "
 elif [ "$MOZ_WIDGET_TOOLKIT" = "os2" ]; then
   add_makefiles "
     image/decoders/icon/os2/Makefile
     intl/locale/src/os2/Makefile
     toolkit/themes/pmstripe/global/Makefile
-    widget/src/os2/Makefile
+    widget/os2/Makefile
     xpcom/reflect/xptcall/src/md/os2/Makefile
   "
 fi
@@ -1077,7 +1077,7 @@ if [ "$ENABLE_TESTS" ]; then
   if [ "$OS_ARCH" = "WINNT" ]; then
     add_makefiles "
       toolkit/xre/test/win/Makefile
-      widget/src/windows/tests/Makefile
+      widget/windows/tests/Makefile
       xpcom/tests/windows/Makefile
     "
   fi
@@ -1244,7 +1244,7 @@ fi
 if [ "$MOZ_ENABLE_XREMOTE" ]; then
   add_makefiles "
     toolkit/components/remote/Makefile
-    widget/src/xremoteclient/Makefile
+    widget/xremoteclient/Makefile
   "
 fi
 
@@ -1363,11 +1363,11 @@ fi
 
 if [ "$MOZ_X11" ]; then
   add_makefiles "
-    widget/src/shared/x11/Makefile
+    widget/shared/x11/Makefile
   "
   if [ "$MOZ_WIDGET_TOOLKIT" = "gtk2" ]; then
     add_makefiles "
-      widget/src/gtkxtbin/Makefile
+      widget/gtkxtbin/Makefile
     "
   fi
 fi

diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
@@ -100,7 +100,7 @@ tier_platform_dirs += \
 
 ifdef MOZ_ENABLE_GTK2
 ifdef MOZ_X11
-tier_platform_dirs     += widget/src/gtkxtbin
+tier_platform_dirs     += widget/gtkxtbin
 endif
 endif
 
@@ -199,7 +199,7 @@ tier_platform_dirs  += tools/profiler
 tier_platform_dirs	+= xpfe/components
 
 ifdef MOZ_ENABLE_XREMOTE
-tier_platform_dirs += widget/src/xremoteclient
+tier_platform_dirs += widget/xremoteclient
 endif
 
 ifdef MOZ_SPELLCHECK

diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
@@ -137,8 +137,8 @@ endif
 SHARED_LIBRARY_LIBS += ../profile/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX)
 
 ifdef MOZ_ENABLE_XREMOTE
-SHARED_LIBRARY_LIBS += $(DEPTH)/widget/src/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX)
-LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/xremoteclient
+SHARED_LIBRARY_LIBS += $(DEPTH)/widget/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX)
+LOCAL_INCLUDES += -I$(topsrcdir)/widget/xremoteclient
 endif
 
 ifdef MOZ_CRASHREPORTER

diff --git a/widget/public/LookAndFeel.h → widget/LookAndFeel.h b/widget/public/LookAndFeel.h → widget/LookAndFeel.h
@@ -54,7 +54,7 @@ class LookAndFeel
 {
 public:
   // When modifying this list, also modify nsXPLookAndFeel::sColorPrefs
-  // in widget/src/xpwidgts/nsXPLookAndFeel.cpp.
+  // in widget/xpwidgts/nsXPLookAndFeel.cpp.
   enum ColorID {
 
     // WARNING : NO NEGATIVE VALUE IN THIS ENUMERATION
@@ -205,7 +205,7 @@ class LookAndFeel
   };
 
   // When modifying this list, also modify nsXPLookAndFeel::sIntPrefs
-  // in widget/src/xpwidgts/nsXPLookAndFeel.cpp.
+  // in widget/xpwidgts/nsXPLookAndFeel.cpp.
   enum IntID {
     // default, may be overriden by OS
     eIntID_CaretBlinkTime,
@@ -424,7 +424,7 @@ class LookAndFeel
   };
 
   // When modifying this list, also modify nsXPLookAndFeel::sFloatPrefs
-  // in widget/src/xpwidgts/nsXPLookAndFeel.cpp.
+  // in widget/xpwidgts/nsXPLookAndFeel.cpp.
   enum FloatID {
     eFloatID_IMEUnderlineRelativeSize,
     eFloatID_SpellCheckerUnderlineRelativeSize,