| author | Brian R. Bondy <netzen@gmail.com> |
| Tue, 03 Jan 2012 22:09:29 -0500 | |
| changeset 84951 | e57e271bf32838bd8c9d7b96d96409e445970fee |
| parent 84950 | 683a5696109003cd8c4be625f282e50b1f94a748 |
| child 84952 | d26fad81f51a9f840d93b13742486e28325b0d92 |
| push id | unknown |
| push user | unknown |
| push date | unknown |
| reviewers | roc |
| bugs | 679226 |
| milestone | 12.0a1 |
--- a/accessible/accessible-docs.html +++ b/accessible/accessible-docs.html @@ -814,17 +814,17 @@ watch our application is that calls the AccessibleObjectFromWindow(). This usually happens right after a window gets focused.<br> </p> <p>When the WIN32 API function AccessibleObjectFromWindow() is called, Windows sends the window in question a <a 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 navigating to children and then siblings, etc. Every navigation function such as accNavigate(), get_accChild() and get_accParent() returns an IAccessible pointer. <br> </p> <p>To create the root IAccessible for a window the first time it gets
--- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp +++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp @@ -609,17 +609,17 @@ toplevel_event_watcher(GSignalInvocation } return TRUE; } 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 // check if accessibility enabled/disabled by environment variable bool isGnomeATEnabled = false; const char *envValue = PR_GetEnv(sAccEnv); if (envValue) { isGnomeATEnabled = !!atoi(envValue);
--- a/accessible/src/mac/mozAccessibleProtocol.h +++ b/accessible/src/mac/mozAccessibleProtocol.h @@ -35,17 +35,17 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ #import <Cocoa/Cocoa.h> #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 that parent/child relationship. This protocol is thus used to make sure it knows it's talking to us, and not just some random |id|. */
--- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -379,17 +379,17 @@ pref("browser.dom.window.dump.enabled", // Temporarily relax file:// origin checks so that we can use <img>s // from other dirs as webgl textures and more. Remove me when we have // installable apps or wifi support. 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. pref("dom.screenEnabledProperty.enabled", true); pref("dom.screenBrightnessProperty.enabled", true); // Ignore X-Frame-Options headers. pref("b2g.ignoreXFrameOptions", true);
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -2258,17 +2258,17 @@ nsEventStatus nsPluginInstanceOwner::Pro (::GetKeyState(VK_RBUTTON) ? MK_RBUTTON : 0) | (::GetKeyState(VK_XBUTTON1) ? MK_XBUTTON1 : 0) | (::GetKeyState(VK_XBUTTON2) ? MK_XBUTTON2 : 0); } } 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 || anEvent.message == NS_MOUSE_DOUBLECLICK || anEvent.message == NS_MOUSE_ENTER_SYNTH || anEvent.message == NS_MOUSE_EXIT_SYNTH || anEvent.message == NS_MOUSE_MOVE, "Incorrect event type for coordinate translation");
--- a/dom/plugins/ipc/PluginInstanceParent.cpp +++ b/dom/plugins/ipc/PluginInstanceParent.cpp @@ -1617,17 +1617,17 @@ PluginInstanceParent::RecvNegotiatedCarb focus from dom -> child: Focus manager calls on widget to set the focus on the window. We pick up the resulting wm_setfocus event here, and forward that over ipc to the child which calls set focus on itself. 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. */ static const PRUnichar kPluginInstanceParentProperty[] = L"PluginInstanceParentProperty"; // static LRESULT CALLBACK
--- a/mobile/android/app/Makefile.in +++ b/mobile/android/app/Makefile.in @@ -61,20 +61,20 @@ STL_FLAGS= LIBS += \ $(EXTRA_DSO_LIBS) \ $(XPCOM_STANDALONE_GLUE_LDOPTS) \ $(NULL) 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) OS_LIBS += $(call EXPAND_LIBNAME,version) endif ifdef _MSC_VER # Always enter a Windows program through wmain, whether or not we're
--- a/mobile/xul/app/Makefile.in +++ b/mobile/xul/app/Makefile.in @@ -62,20 +62,20 @@ STL_FLAGS= LIBS += \ $(EXTRA_DSO_LIBS) \ $(XPCOM_STANDALONE_GLUE_LDOPTS) \ $(NULL) 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) OS_LIBS += $(call EXPAND_LIBNAME,version) endif ifdef _MSC_VER # Always enter a Windows program through wmain, whether or not we're
--- a/testing/crashtest/crashtests.list +++ b/testing/crashtest/crashtests.list @@ -50,15 +50,15 @@ include ../../image/test/crashtests/cras include ../../dom/plugins/test/crashtests/crashtests.list include ../../parser/htmlparser/tests/crashtests/crashtests.list 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 include ../../xpcom/string/crashtests/crashtests.list
--- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -2013,17 +2013,17 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, POSSIBILITY OF SUCH DAMAGE. </pre> <hr> <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. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright @@ -2252,17 +2252,17 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT <hr> <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>, <span class="path">tools/profiler/sps/</span>, <span class="path">gfx/ots/</span> and <span class="path">gfx/ycbcr</span>. </p>
--- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -102,17 +102,17 @@ CPPSRCS += \ $(NULL) RCINCLUDE = xulrunner.rc 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 ifneq (,$(filter WINNT OS2,$(OS_ARCH))) DEFINES += -DZLIB_DLL=1 endif ifeq ($(OS_ARCH),OS2) @@ -122,19 +122,19 @@ CPPSRCS += \ nsGFXDeps.cpp \ $(NULL) ifndef MOZ_NATIVE_ZLIB 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 # dependent libraries STATIC_LIBS += \ jsipc_s \ domipc_s \ domplugins_s \ @@ -517,17 +517,17 @@ endif ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 EXTRA_DSO_LDOPTS += $(FT2_LIBS) 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 ifndef MOZ_TREE_CAIRO EXTRA_DSO_LDOPTS += $(FT2_LIBS) endif endif @@ -572,21 +572,21 @@ ifdef MOZ_ENABLE_QT EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS) endif 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) DEFINES += \ -D_IMPL_NS_COM \ -D_IMPL_NS_STRINGAPI \ -DEXPORT_XPT_API \
--- a/toolkit/library/nsDllMain.cpp +++ b/toolkit/library/nsDllMain.cpp @@ -8,17 +8,17 @@ * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * 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. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Benjamin Smedberg <benjamin@smedbergs.us>
--- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -375,19 +375,19 @@ MAKEFILES_docshell=" docshell/shistory/public/Makefile docshell/shistory/src/Makefile docshell/build/Makefile " 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=" xpcom/string/Makefile xpcom/string/public/Makefile xpcom/string/src/Makefile xpcom/Makefile xpcom/base/Makefile @@ -590,72 +590,72 @@ add_makefiles " if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then add_makefiles " content/xbl/builtin/win/Makefile dom/system/windows/Makefile image/decoders/icon/win/Makefile 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 add_makefiles " content/xbl/builtin/mac/Makefile dom/plugins/ipc/interpose/Makefile dom/system/cocoa/Makefile image/decoders/icon/mac/Makefile intl/locale/src/mac/Makefile netwerk/system/mac/Makefile toolkit/system/osxproxy/Makefile toolkit/themes/pinstripe/Makefile toolkit/themes/pinstripe/global/Makefile 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 " embedding/android/Makefile embedding/android/locales/Makefile " 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 if [ "$MOZ_WIDGET_TOOLKIT" != "cocoa" ]; then add_makefiles " toolkit/themes/winstripe/Makefile toolkit/themes/winstripe/global/Makefile @@ -1072,17 +1072,17 @@ if [ "$ENABLE_TESTS" ]; then then add_makefiles " dom/plugins/test/mochitest/Makefile " fi 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 fi # # Feature specific makefiles @@ -1239,17 +1239,17 @@ if [ "$MOZ_ENABLE_QTNETWORK" ]; then add_makefiles " netwerk/system/qt/Makefile " fi if [ "$MOZ_ENABLE_XREMOTE" ]; then add_makefiles " toolkit/components/remote/Makefile - widget/src/xremoteclient/Makefile + widget/xremoteclient/Makefile " fi if [ "$MOZ_FEEDS" ]; then add_makefiles " toolkit/components/feeds/Makefile " fi @@ -1358,21 +1358,21 @@ fi if [ "$MOZ_URL_CLASSIFIER" ]; then add_makefiles " toolkit/components/url-classifier/Makefile " 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 if [ "$MOZ_XUL" ]; then add_makefiles " content/xul/templates/Makefile content/xul/templates/public/Makefile
--- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk @@ -95,17 +95,17 @@ tier_platform_dirs += ipc js/ipc tier_platform_dirs += \ hal \ js/xpconnect \ intl/chardet \ $(NULL) ifdef MOZ_ENABLE_GTK2 ifdef MOZ_X11 -tier_platform_dirs += widget/src/gtkxtbin +tier_platform_dirs += widget/gtkxtbin endif endif tier_platform_dirs += \ modules/libjar \ storage \ $(NULL) @@ -194,17 +194,17 @@ ifdef MOZ_JPROF tier_platform_dirs += tools/jprof endif 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 tier_platform_dirs += extensions/spellcheck endif tier_platform_dirs += toolkit
--- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -132,18 +132,18 @@ endif ifeq ($(MOZ_WIDGET_TOOLKIT),android) CPPSRCS += nsAndroidStartup.cpp DEFINES += -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"' 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 SHARED_LIBRARY_LIBS += $(DEPTH)/toolkit/crashreporter/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) ifeq ($(OS_ARCH),WINNT) SHARED_LIBRARY_LIBS += \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \
rename from widget/public/LookAndFeel.h rename to widget/LookAndFeel.h --- a/widget/public/LookAndFeel.h +++ b/widget/LookAndFeel.h @@ -49,17 +49,17 @@ struct nsSize; namespace mozilla { 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 // see patch in bug 57757 for more information eColorID_WindowBackground, eColorID_WindowForeground, eColorID_WidgetBackground, @@ -200,17 +200,17 @@ public: eColorID__moz_comboboxtext, eColorID__moz_combobox, // keep this one last, please eColorID_LAST_COLOR }; // 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, // pixel width of caret eIntID_CaretWidth, // show the caret when text is selected? eIntID_ShowCaretDuringSelection, // select textfields when focused via tab/accesskey? @@ -419,17 +419,17 @@ public: }; enum { eScrollThumbStyle_Normal, eScrollThumbStyle_Proportional }; // 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, // The width/height ratio of the cursor. If used, the CaretWidth int metric // should be added to the calculated caret width. eFloatID_CaretAspectRatio };
--- a/widget/Makefile.in +++ b/widget/Makefile.in @@ -35,18 +35,155 @@ # # ***** END LICENSE BLOCK ***** DEPTH = .. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ +MODULE = widget +XPIDL_MODULE = widget +GRE_MODULE = 1 + include $(DEPTH)/config/autoconf.mk -DIRS = public src +DIRS = shared xpwidgets + +ifneq (,$(filter os2 cocoa qt android gonk,$(MOZ_WIDGET_TOOLKIT))) +DIRS += $(MOZ_WIDGET_TOOLKIT) +endif + +ifeq ($(MOZ_WIDGET_TOOLKIT),windows) +DIRS += windows build +endif ifdef ENABLE_TESTS -TOOL_DIRS += tests +TOOL_DIRS += tests +endif + +# +# Don't build the DSO under the 'build' directory as windows does. +# +# The DSOs get built in the toolkit dir itself. Do this so that +# multiple implementations of widget can be built on the same +# source tree. +# +ifdef MOZ_ENABLE_GTK2 +DIRS += gtk2 +ifdef MOZ_X11 +DIRS += gtkxtbin +endif +endif + + +EXPORTS_NAMESPACES = IPC + +EXPORTS_IPC = \ + nsGUIEventIPC.h \ + $(NULL) + +EXPORTS_NAMESPACES += mozilla + +EXPORTS_mozilla = \ + LookAndFeel.h \ + $(NULL) + +ifdef MOZ_INSTRUMENT_EVENT_LOOP +EXPORTS_mozilla += \ + WidgetTraceEvent.h \ + $(NULL) +endif + +EXPORTS = \ + nsIWidget.h \ + nsGUIEvent.h \ + nsEvent.h \ + nsNativeWidget.h \ + nsWidgetInitData.h \ + nsWidgetsCID.h \ + nsIPluginWidget.h \ + nsINativeKeyBindings.h \ + nsIDeviceContextSpec.h \ + nsIRollupListener.h \ + $(NULL) + +ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) +EXPORTS += \ + nsINativeMenuService.h \ + nsIPrintDialogService.h \ + $(NULL) +endif + +ifeq ($(MOZ_WIDGET_TOOLKIT),os2) +EXPORTS += nsIDragSessionOS2.h endif +ifneq (,$(filter android gonk,$(MOZ_WIDGET_TOOLKIT))) +EXPORTS += \ + nsIPrintDialogService.h \ + $(NULL) +endif + +ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT))) +EXPORTS += \ + nsIDragSessionGTK.h \ + nsIPrintDialogService.h \ + $(NULL) +endif + +XPIDLSRCS = \ + nsIAppShell.idl \ + nsIFilePicker.idl \ + nsISound.idl \ + nsITransferable.idl \ + nsIClipboardDragDropHooks.idl \ + nsIClipboardDragDropHookList.idl \ + nsIDragSession.idl \ + nsIDragService.idl \ + nsIFormatConverter.idl \ + nsIClipboard.idl \ + nsIClipboardHelper.idl \ + nsIClipboardOwner.idl \ + nsIBaseWindow.idl \ + nsIBidiKeyboard.idl \ + nsIScreen.idl \ + nsIScreenManager.idl \ + nsIPrintSession.idl \ + nsIPrintSettings.idl \ + nsIPrintSettingsService.idl \ + nsIPrintOptions.idl \ + nsIIdleService.idl \ + nsIGfxInfo.idl \ + nsIGfxInfoDebug.idl \ + nsIIMEPicker.idl \ + $(NULL) + +ifeq ($(MOZ_WIDGET_TOOLKIT),windows) +XPIDLSRCS += nsIPrintSettingsWin.idl \ + nsIWinTaskbar.idl \ + nsITaskbarPreview.idl \ + nsITaskbarTabPreview.idl \ + nsITaskbarWindowPreview.idl \ + nsITaskbarPreviewController.idl \ + nsITaskbarPreviewButton.idl \ + nsITaskbarProgress.idl \ + nsITaskbarPreviewButton.idl \ + nsITaskbarOverlayIconController.idl \ + nsIJumpListBuilder.idl \ + nsIJumpListItem.idl \ + $(NULL) +endif + +ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) +XPIDLSRCS += nsIMacDockSupport.idl \ + nsIStandaloneNativeMenu.idl \ + $(NULL) +endif + +ifeq ($(MOZ_WIDGET_TOOLKIT),os2) +XPIDLSRCS += nsIRwsService.idl +endif + +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) + include $(topsrcdir)/config/rules.mk
rename from widget/src/android/AndroidDirectTexture.cpp rename to widget/android/AndroidDirectTexture.cpp
rename from widget/src/android/AndroidDirectTexture.h rename to widget/android/AndroidDirectTexture.h
rename from widget/src/android/AndroidGraphicBuffer.cpp rename to widget/android/AndroidGraphicBuffer.cpp
rename from widget/src/android/AndroidGraphicBuffer.h rename to widget/android/AndroidGraphicBuffer.h
rename from widget/src/android/AndroidJavaWrappers.cpp rename to widget/android/AndroidJavaWrappers.cpp
rename from widget/src/android/Makefile.in rename to widget/android/Makefile.in --- a/widget/src/android/Makefile.in +++ b/widget/android/Makefile.in @@ -30,17 +30,17 @@ # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widget_android @@ -93,17 +93,17 @@ SHARED_LIBRARY_LIBS = ../xpwidgets/libxp EXPORTS = AndroidBridge.h AndroidJavaWrappers.h include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_WIDGET #DEFINES += -DDEBUG_WIDGETS LOCAL_INCLUDES += \ - -I$(topsrcdir)/widget/src/xpwidgets \ - -I$(topsrcdir)/widget/src/shared \ + -I$(topsrcdir)/widget/xpwidgets \ + -I$(topsrcdir)/widget/shared \ -I$(topsrcdir)/dom/system/android \ -I$(topsrcdir)/toolkit/components/places \ -I$(topsrcdir)/docshell/base \ -I$(srcdir) \ $(NULL) include $(topsrcdir)/ipc/chromium/chromium-config.mk
rename from widget/src/android/nsDeviceContextAndroid.cpp rename to widget/android/nsDeviceContextAndroid.cpp
rename from widget/src/android/nsDeviceContextAndroid.h rename to widget/android/nsDeviceContextAndroid.h
rename from widget/src/android/nsIdleServiceAndroid.cpp rename to widget/android/nsIdleServiceAndroid.cpp
rename from widget/src/android/nsIdleServiceAndroid.h rename to widget/android/nsIdleServiceAndroid.h
rename from widget/src/android/nsPrintOptionsAndroid.cpp rename to widget/android/nsPrintOptionsAndroid.cpp
rename from widget/src/android/nsPrintOptionsAndroid.h rename to widget/android/nsPrintOptionsAndroid.h
rename from widget/src/android/nsScreenManagerAndroid.cpp rename to widget/android/nsScreenManagerAndroid.cpp
rename from widget/src/android/nsScreenManagerAndroid.h rename to widget/android/nsScreenManagerAndroid.h
rename from widget/src/build/Makefile.in rename to widget/build/Makefile.in --- a/widget/src/build/Makefile.in +++ b/widget/build/Makefile.in @@ -30,17 +30,17 @@ # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = gkwidget
rename from widget/src/cocoa/ComplexTextInputPanel.mm rename to widget/cocoa/ComplexTextInputPanel.mm
rename from widget/src/cocoa/Makefile.in rename to widget/cocoa/Makefile.in --- a/widget/src/cocoa/Makefile.in +++ b/widget/cocoa/Makefile.in @@ -30,17 +30,17 @@ # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widget_mac
rename from widget/src/cocoa/crashtests/373122-1-inner.html rename to widget/cocoa/crashtests/373122-1-inner.html
rename from widget/src/cocoa/crashtests/373122-1.html rename to widget/cocoa/crashtests/373122-1.html
rename from widget/src/cocoa/crashtests/397209-1.html rename to widget/cocoa/crashtests/397209-1.html
rename from widget/src/cocoa/crashtests/403296-1.xhtml rename to widget/cocoa/crashtests/403296-1.xhtml
rename from widget/src/cocoa/crashtests/419737-1.html rename to widget/cocoa/crashtests/419737-1.html
rename from widget/src/cocoa/crashtests/435223-1.html rename to widget/cocoa/crashtests/435223-1.html
rename from widget/src/cocoa/crashtests/444864-1.html rename to widget/cocoa/crashtests/444864-1.html
rename from widget/src/cocoa/crashtests/449111-1.html rename to widget/cocoa/crashtests/449111-1.html
rename from widget/src/cocoa/crashtests/460349-1.xhtml rename to widget/cocoa/crashtests/460349-1.xhtml
rename from widget/src/cocoa/crashtests/460387-1.html rename to widget/cocoa/crashtests/460387-1.html
rename from widget/src/cocoa/crashtests/464589-1.html rename to widget/cocoa/crashtests/464589-1.html
rename from widget/src/cocoa/crashtests/crashtests.list rename to widget/cocoa/crashtests/crashtests.list
rename from widget/src/cocoa/nsStandaloneNativeMenu.h rename to widget/cocoa/nsStandaloneNativeMenu.h
rename from widget/src/cocoa/nsStandaloneNativeMenu.mm rename to widget/cocoa/nsStandaloneNativeMenu.mm
rename from widget/src/cocoa/resources/MainMenu.nib/classes.nib rename to widget/cocoa/resources/MainMenu.nib/classes.nib
rename from widget/src/cocoa/resources/MainMenu.nib/info.nib rename to widget/cocoa/resources/MainMenu.nib/info.nib
rename from widget/src/cocoa/resources/MainMenu.nib/keyedobjects.nib rename to widget/cocoa/resources/MainMenu.nib/keyedobjects.nib
rename from widget/src/gonk/Makefile.in rename to widget/gonk/Makefile.in --- a/widget/src/gonk/Makefile.in +++ b/widget/gonk/Makefile.in @@ -30,17 +30,17 @@ # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widget_gonk @@ -62,15 +62,15 @@ CPPSRCS = \ SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_WIDGET LOCAL_INCLUDES += \ - -I$(topsrcdir)/widget/src/xpwidgets \ - -I$(topsrcdir)/widget/src/shared \ + -I$(topsrcdir)/widget/xpwidgets \ + -I$(topsrcdir)/widget/shared \ -I$(topsrcdir)/dom/system/android \ -I$(srcdir) \ $(NULL) include $(topsrcdir)/ipc/chromium/chromium-config.mk
rename from widget/src/gtk2/Makefile.in rename to widget/gtk2/Makefile.in --- a/widget/src/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in @@ -30,17 +30,17 @@ # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = widget_gtk2
rename from widget/src/gtk2/crashtests/crashtests.list rename to widget/gtk2/crashtests/crashtests.list
rename from widget/src/gtk2/maiRedundantObjectFactory.c rename to widget/gtk2/maiRedundantObjectFactory.c
rename from widget/src/gtk2/maiRedundantObjectFactory.h rename to widget/gtk2/maiRedundantObjectFactory.h
rename from widget/src/gtk2/nsPrintDialogGTK.cpp rename to widget/gtk2/nsPrintDialogGTK.cpp --- a/widget/src/gtk2/nsPrintDialogGTK.cpp +++ b/widget/gtk2/nsPrintDialogGTK.cpp @@ -62,17 +62,17 @@ using namespace mozilla; using namespace mozilla::widget; static const char header_footer_tags[][4] = {"", "&T", "&U", "&D", "&P", "&PT"}; #define CUSTOM_VALUE_INDEX ArrayLength(header_footer_tags) -// XXXdholbert Duplicated from widget/src/gtk2/nsFilePicker.cpp +// XXXdholbert Duplicated from widget/gtk2/nsFilePicker.cpp // Needs to be unified in some generic utility class. static GtkWindow * get_gtk_window_for_nsiwidget(nsIWidget *widget) { // Get native GdkWindow GdkWindow *gdk_win = GDK_WINDOW(widget->GetNativeData(NS_NATIVE_WIDGET)); if (!gdk_win) return NULL;
rename from widget/src/gtkxtbin/Makefile.in rename to widget/gtkxtbin/Makefile.in --- a/widget/src/gtkxtbin/Makefile.in +++ b/widget/gtkxtbin/Makefile.in @@ -32,17 +32,17 @@ # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = gtkxtbin LIBRARY_NAME = gtkxtbin
rename from widget/public/nsIClipboardDragDropHookList.idl rename to widget/nsIClipboardDragDropHookList.idl