diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 67ac3e19088..9f89b457405 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 3e52bbe5eb3..48c3494a597 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 67ac3e19088..9f89b457405 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8426fbb1432..8b1a888e008 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "1adfbae4582a2cebf4b35c822044299aa8dd1026", + "revision": "8d15cd3ac0d07cde9ff36ce611ae47e6ef30d9b0", "repo_path": "/integration/gaia-central" } diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index b0b9308c862..e23c51fd854 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index cdee45f731c..fb5df089ead 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 08599d12b15..e29cafb0397 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 8605ef239ed..eecebdf6777 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 1a53811158c..d62639c8da4 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index e069cc91cb7..ac814e18583 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/config/config.mk b/config/config.mk index a1cbfc49b5e..e407f845e53 100644 --- a/config/config.mk +++ b/config/config.mk @@ -420,8 +420,7 @@ ifdef _MSC_VER OS_LDFLAGS += $(DELAYLOAD_LDFLAGS) endif # _MSC_VER -# Does the makefile specifies the internal XPCOM API linkage? -ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY)) +ifneq (,$(LIBXUL_LIBRARY)) DEFINES += -DMOZILLA_INTERNAL_API endif diff --git a/configure.in b/configure.in index 59cb2e5c396..bbc7b400328 100644 --- a/configure.in +++ b/configure.in @@ -8618,6 +8618,11 @@ AC_SUBST(MOZ_FOLD_LIBS) AC_SUBST(MOZ_ENABLE_SZIP) AC_SUBST(MOZ_SZIP_FLAGS) +if test "$MOZ_DEBUG"; then + MOZ_EM_DEBUG=1 +fi +AC_SUBST(MOZ_EM_DEBUG) + if test -n "$COMPILE_ENVIRONMENT"; then AC_MSG_CHECKING([for posix_fallocate]) AC_TRY_LINK([#define _XOPEN_SOURCE 600 diff --git a/content/media/webaudio/test/test_oscillatorNodeStart.html b/content/media/webaudio/test/test_oscillatorNodeStart.html index 7acd6b41309..d368a3f8b34 100644 --- a/content/media/webaudio/test/test_oscillatorNodeStart.html +++ b/content/media/webaudio/test/test_oscillatorNodeStart.html @@ -31,8 +31,23 @@ addLoadEvent(function() { ok(isSilent, "OscillatorNode should be silent before calling start."); SimpleTest.finish(); } + + // Debug Logging for bug 966322 + + ok(true, "Load event ran"); + + var bs = context.createBufferSource(); + bs.buffer = context.createBuffer(1, 1, context.sampleRate); + bs.start(); + bs.onended = function() { + ok(true, "Graph is running"); + } + }); +// Debug Logging for bug 966322 +ok(true, "script ran"); + diff --git a/dom/apps/src/Makefile.in b/dom/apps/src/Makefile.in deleted file mode 100644 index 9671cb737d4..00000000000 --- a/dom/apps/src/Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ -# 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/. - -ifdef MOZ_DEBUG - DEFINES += -DMOZ_DEBUG=1 -endif diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm index 01f75fe5717..46209e279c3 100755 --- a/dom/apps/src/Webapps.jsm +++ b/dom/apps/src/Webapps.jsm @@ -55,7 +55,7 @@ XPCOMUtils.defineLazyGetter(this, "libcutils", function() { #endif function debug(aMsg) { -#ifdef MOZ_DEBUG +#ifdef DEBUG dump("-*- Webapps.jsm : " + aMsg + "\n"); #endif } diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index bca7dd31b11..f0dfce4d233 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -65,29 +65,7 @@ endif endif -ifdef USE_MMX -CSRCS += pixman-mmx.c -DEFINES += -DUSE_MMX -endif - -ifdef USE_SSE2 -CSRCS += pixman-sse2.c -DEFINES += -DUSE_SSE -DUSE_SSE2 -endif - -ifdef USE_VMX -CSRCS += pixman-vmx.c -DEFINES += -DUSE_VMX -endif - -ifdef USE_ARM_SIMD_GCC -CSRCS += pixman-arm-simd.c -DEFINES += -DUSE_ARM_SIMD -endif - ifdef USE_ARM_NEON_GCC -CSRCS += pixman-arm-neon.c -DEFINES += -DUSE_ARM_NEON ARM_NEON_CFLAGS = -mfpu=neon endif diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build index 503b3405dcf..ede0e0d7dc6 100644 --- a/gfx/cairo/libpixman/src/moz.build +++ b/gfx/cairo/libpixman/src/moz.build @@ -75,3 +75,24 @@ if CONFIG['_MSC_VER']: DEFINES['PACKAGE'] = 'mozpixman' DEFINES['_USE_MATH_DEFINES'] = True + +if CONFIG['USE_MMX']: + DEFINES['USE_MMX'] = True + SOURCES += ['pixman-mmx.c'] + +if CONFIG['USE_SSE2']: + DEFINES['USE_SSE'] = True + DEFINES['USE_SSE2'] = True + SOURCES += ['pixman-sse2.c'] + +if CONFIG['USE_VMX']: + DEFINES['USE_VMX'] = True + SOURCES += ['pixman-vmx.c'] + +if CONFIG['USE_ARM_SIMD_GCC']: + DEFINES['USE_ARM_SIMD'] = True + SOURCES += ['pixman-arm-simd.c'] + +if CONFIG['USE_ARM_NEON_GCC']: + DEFINES['USE_ARM_NEON'] = True + SOURCES += ['pixman-arm-neon.c'] diff --git a/intl/unicharutil/util/internal/Makefile.in b/intl/unicharutil/util/internal/Makefile.in index a4e3eb4c9b3..facde1e53e5 100644 --- a/intl/unicharutil/util/internal/Makefile.in +++ b/intl/unicharutil/util/internal/Makefile.in @@ -12,4 +12,3 @@ LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) endif DIST_INSTALL = 1 -MOZILLA_INTERNAL_API = 1 diff --git a/intl/unicharutil/util/internal/moz.build b/intl/unicharutil/util/internal/moz.build index 0be580e234e..05ed7ca03e4 100644 --- a/intl/unicharutil/util/internal/moz.build +++ b/intl/unicharutil/util/internal/moz.build @@ -14,4 +14,3 @@ LOCAL_INCLUDES += [ '..', '../../src', ] - diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in index 109e0d18cfa..20c8b746316 100644 --- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -10,10 +10,6 @@ ifndef MOZ_NATIVE_LIBEVENT # { vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) -else # } else { -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) endif # } vpath %.cc \ @@ -26,39 +22,6 @@ vpath %.mm \ $(srcdir)/src/chrome/common \ $(NULL) -# libevent - -ifndef MOZ_NATIVE_LIBEVENT # { - -ifneq ($(OS_ARCH),WINNT) # (if OS_POSIX) { - -LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent -LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/include - -ifeq ($(OS_ARCH),Darwin) # (OS_MACOSX) { -LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/mac - -else # } else { - -ifneq (,$(filter-out DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) # (OS_LINUX) { -ifeq ($(OS_TARGET),Android) # { -LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/android -else # } else { -LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/linux -endif # } - -else # } else (OS_BSD) { - -LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/bsd - -endif # } - -endif # } - -endif # } - -endif # } - OS_CXXFLAGS += $(TK_CFLAGS) include $(topsrcdir)/config/rules.mk @@ -66,10 +29,10 @@ include $(topsrcdir)/config/rules.mk ifdef MOZ_NATIVE_LIBEVENT # { export-preqs = \ - $(call mkdir_deps,$(DIST)/third_party/libevent) \ + $(call mkdir_deps,$(CURDIR)/third_party/libevent) \ $(NULL) export:: $(export-preqs) - echo '#include ' > $(DIST)/third_party/libevent/event.h + echo '#include ' > $(CURDIR)/third_party/libevent/event.h endif # } diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index 5df73f9afff..8798b3d1ff4 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -142,6 +142,10 @@ elif not CONFIG['MOZ_NATIVE_LIBEVENT']: 'src/third_party/libevent/strlcpy.c', ] DEFINES['HAVE_CONFIG_H'] = True + LOCAL_INCLUDES += [ + 'src/third_party/libevent', + 'src/third_party/libevent/include', + ] if os_posix: SOURCES += [ @@ -203,6 +207,7 @@ if os_macosx: UNIFIED_SOURCES += [ 'src/third_party/libevent/kqueue.c', ] + LOCAL_INCLUDES += ['src/third_party/libevent/mac'] if os_linux: SOURCES += [ @@ -231,6 +236,10 @@ if os_linux: SOURCES += [ 'src/third_party/libevent/epoll.c', ] + if CONFIG['OS_TARGET'] == 'Android': + LOCAL_INCLUDES += ['src/third_party/libevent/android'] + else: + LOCAL_INCLUDES += ['src/third_party/libevent/linux'] if os_bsd: SOURCES += [ @@ -260,6 +269,7 @@ if os_bsd: SOURCES += [ 'src/third_party/libevent/kqueue.c', ] + LOCAL_INCLUDES += ['src/third_party/libevent/bsd'] if CONFIG['_MSC_VER']: SOURCES += [ diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index 4580021df37..8aae20dfaba 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -8,9 +8,6 @@ GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc # This file is generated by the moz.build backend. include ipdlsrcs.mk -LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders - - include $(topsrcdir)/config/rules.mk diff --git a/ipc/ipdl/moz.build b/ipc/ipdl/moz.build index 466672254bb..1f4c1d63a40 100644 --- a/ipc/ipdl/moz.build +++ b/ipc/ipdl/moz.build @@ -12,3 +12,5 @@ FAIL_ON_WARNINGS = True include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' + +GENERATED_INCLUDES += ['/ipc/ipdl/_ipdlheaders'] diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 5c12ac2990e..fa9d3448973 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -29,8 +29,6 @@ endif ifdef JS_HAS_CTYPES ifdef MOZ_NATIVE_FFI LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS) -else -LOCAL_INCLUDES = -Ictypes/libffi/include endif ifdef MOZ_NATIVE_FFI @@ -205,11 +203,6 @@ DIST_GARBAGE = config.cache config.log config.status* \ distclean:: $(RM) $(DIST_GARBAGE) -ifneq (,$(filter WINNT,$(OS_ARCH))) -# _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s() -DEFINES += -D_CRT_RAND_S -endif - ifneq ($(findstring -L,$(NSPR_LIBS)),) NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS))) else @@ -406,23 +399,6 @@ selfhosted.out.h: $(selfhosted_out_h_deps) $(PYTHON) $(srcdir)/builtin/embedjs.py $(SELFHOSTED_DEFINES) \ -p '$(CPP)' -m $(srcdir)/js.msg -o $@ $(selfhosting_srcs) -############################################### -# BEGIN kludges for the Nitro assembler -# - -# Needed to "configure" it correctly. Unfortunately these -# flags wind up being applied to all code in js/src, not just -# the code in js/src/assembler. -CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 - -ifneq (,$(ENABLE_YARR_JIT)) -CXXFLAGS += -DENABLE_JIT=1 -endif - -# -# END kludges for the Nitro assembler -############################################### - ############################################### # Generating source package tarballs # (only possible when tar is found) diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in index dcde600909a..513aef4d3c5 100644 --- a/js/src/gdb/Makefile.in +++ b/js/src/gdb/Makefile.in @@ -6,8 +6,6 @@ LIBS = ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) -LOCAL_INCLUDES += -I$(srcdir)/.. -I.. - ifdef MOZ_SHARED_ICU EXTRA_LIBS += $(MOZ_ICU_LIBS) endif diff --git a/js/src/gdb/moz.build b/js/src/gdb/moz.build index 4b8a796a8fe..deb32e91dda 100644 --- a/js/src/gdb/moz.build +++ b/js/src/gdb/moz.build @@ -21,3 +21,6 @@ UNIFIED_SOURCES += [ # on its behalf. for var in ('EXPORT_JS_API', 'IMPL_MFBT'): DEFINES[var] = True + +LOCAL_INCLUDES += ['..'] +GENERATED_INCLUDES += ['..'] diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in index 31d9720ad15..297b7339931 100644 --- a/js/src/jsapi-tests/Makefile.in +++ b/js/src/jsapi-tests/Makefile.in @@ -6,8 +6,6 @@ LIBS = ../$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) -LOCAL_INCLUDES += -I$(srcdir)/.. -I.. - ifdef MOZ_SHARED_ICU EXTRA_LIBS += $(MOZ_ICU_LIBS) endif diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build index a9cf6f34f88..c44f1d667b2 100644 --- a/js/src/jsapi-tests/moz.build +++ b/js/src/jsapi-tests/moz.build @@ -81,3 +81,6 @@ DEFINES['EXPORT_JS_API'] = True # Building against js_static requires that we declare mfbt sybols "exported" # on its behalf. DEFINES['IMPL_MFBT'] = True + +LOCAL_INCLUDES += ['..'] +GENERATED_INCLUDES += ['..'] diff --git a/js/src/moz.build b/js/src/moz.build index 3b937e7c9e7..b796bee1f1a 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -343,6 +343,8 @@ if CONFIG['OS_ARCH'] == 'WINNT': 'assembler/jit/ExecutableAllocatorWin.cpp', 'yarr/OSAllocatorWin.cpp', ] + # _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s() + DEFINES['_CRT_RAND_S'] = True else: SOURCES += [ 'assembler/jit/ExecutableAllocatorPosix.cpp', @@ -370,6 +372,10 @@ if CONFIG['JS_HAS_CTYPES']: 'ctypes/CTypes.cpp', 'ctypes/Library.cpp', ] + if not CONFIG['MOZ_NATIVE_FFI']: + GENERATED_INCLUDES += [ + 'ctypes/libffi/include', + ] if CONFIG['MOZ_VTUNE']: SOURCES += [ @@ -437,3 +443,12 @@ if CONFIG['_MSC_VER']: SOURCES['builtin/RegExp.cpp'].no_pgo = True # Bug 772303 elif CONFIG['CPU_ARCH'] == 'x86_64' and CONFIG['JS_HAS_CTYPES']: SOURCES['ctypes/CTypes.cpp'].no_pgo = True # Bug 810661 + +# Needed to "configure" it correctly. Unfortunately these +# flags wind up being applied to all code in js/src, not just +# the code in js/src/assembler. +DEFINES['USE_SYSTEM_MALLOC'] = 1 +DEFINES['ENABLE_ASSEMBLER'] = 1 + +if CONFIG['ENABLE_YARR_JIT']: + DEFINES['ENABLE_JIT'] = 1 diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in index 0261f61aa19..0777e781ef0 100644 --- a/js/src/shell/Makefile.in +++ b/js/src/shell/Makefile.in @@ -12,8 +12,6 @@ ifdef MOZ_SHARED_ICU EXTRA_LIBS += $(MOZ_ICU_LIBS) endif -LOCAL_INCLUDES += -I$(srcdir)/.. -I.. - ifeq ($(OS_ARCH),Darwin) ifeq ($(TARGET_CPU),x86_64) DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000 diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build index 42b1dfa532e..e9ac97a30d9 100644 --- a/js/src/shell/moz.build +++ b/js/src/shell/moz.build @@ -23,3 +23,6 @@ if CONFIG['_MSC_VER']: # necessary to link PGO lib on gcc when a object/static lib are compiled # for PGO. NO_PGO = True + +LOCAL_INCLUDES += ['..'] +GENERATED_INCLUDES += ['..'] diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp index b9e0c7208c3..125067b001d 100644 --- a/layout/base/FrameLayerBuilder.cpp +++ b/layout/base/FrameLayerBuilder.cpp @@ -2293,18 +2293,16 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList, { PROFILER_LABEL("ContainerState", "ProcessDisplayItems"); - const nsIFrame* lastAnimatedGeometryRoot = nullptr; - nsPoint topLeft; + const nsIFrame* lastAnimatedGeometryRoot = mContainerReferenceFrame; + nsPoint topLeft(0,0); // When NO_COMPONENT_ALPHA is set, items will be flattened into a single // layer, so we need to choose which active scrolled root to use for all // items. if (aFlags & NO_COMPONENT_ALPHA) { - if (!ChooseAnimatedGeometryRoot(aList, &lastAnimatedGeometryRoot)) { - lastAnimatedGeometryRoot = mContainerReferenceFrame; + if (ChooseAnimatedGeometryRoot(aList, &lastAnimatedGeometryRoot)) { + topLeft = lastAnimatedGeometryRoot->GetOffsetToCrossDoc(mContainerReferenceFrame); } - - topLeft = lastAnimatedGeometryRoot->GetOffsetToCrossDoc(mContainerReferenceFrame); } int32_t maxLayers = nsDisplayItem::MaxActiveLayers(); @@ -2344,7 +2342,14 @@ ContainerState::ProcessDisplayItems(const nsDisplayList& aList, animatedGeometryRoot = lastAnimatedGeometryRoot; } else { forceInactive = false; - animatedGeometryRoot = nsLayoutUtils::GetAnimatedGeometryRootFor(item, mBuilder); + if (mManager->IsWidgetLayerManager()) { + animatedGeometryRoot = nsLayoutUtils::GetAnimatedGeometryRootFor(item, mBuilder); + } else { + // For inactive layer subtrees, splitting content into ThebesLayers + // based on animated geometry roots is pointless. It's more efficient + // to build the minimum number of layers. + animatedGeometryRoot = mContainerReferenceFrame; + } if (animatedGeometryRoot != lastAnimatedGeometryRoot) { lastAnimatedGeometryRoot = animatedGeometryRoot; topLeft = animatedGeometryRoot->GetOffsetToCrossDoc(mContainerReferenceFrame); diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp index 5fa2faaa709..a13b0794f9b 100644 --- a/layout/base/nsCSSRendering.cpp +++ b/layout/base/nsCSSRendering.cpp @@ -614,15 +614,10 @@ nsCSSRendering::PaintOutline(nsPresContext* aPresContext, false #endif ) { - // FIXME: This behavior doesn't make sense; we should switch back to - // using aBorderArea. But since this has been broken since bug - // 133165 in August of 2004, that switch should be made in its own - // patch changing only that behavior. - innerRect = aForFrame->GetVisualOverflowRect(); + innerRect = aBorderArea; } else { - innerRect = GetOutlineInnerRect(aForFrame); + innerRect = GetOutlineInnerRect(aForFrame) + aBorderArea.TopLeft(); } - innerRect += aBorderArea.TopLeft(); nscoord offset = ourOutline->mOutlineOffset; innerRect.Inflate(offset, offset); // If the dirty rect is completely inside the border area (e.g., only the diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index ce221ff17db..b996c4c0bc5 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -2965,18 +2965,23 @@ void nsDisplayWrapList::Paint(nsDisplayListBuilder* aBuilder, NS_ERROR("nsDisplayWrapList should have been flattened away for painting"); } +/** + * Returns true if all descendant display items can be placed in the same + * ThebesLayer --- GetLayerState returns LAYER_INACTIVE or LAYER_NONE, + * and they all have the expected animated geometry root. + */ static LayerState -RequiredLayerStateForChildrenInternal(nsDisplayListBuilder* aBuilder, - LayerManager* aManager, - const ContainerLayerParameters& aParameters, - const nsDisplayList& aList, - nsIFrame* aAnimatedGeometryRoot) +RequiredLayerStateForChildren(nsDisplayListBuilder* aBuilder, + LayerManager* aManager, + const ContainerLayerParameters& aParameters, + const nsDisplayList& aList, + nsIFrame* aExpectedAnimatedGeometryRootForChildren) { LayerState result = LAYER_INACTIVE; for (nsDisplayItem* i = aList.GetBottom(); i; i = i->GetAbove()) { - nsIFrame* f = i->Frame(); if (result == LAYER_INACTIVE && - nsLayoutUtils::GetAnimatedGeometryRootFor(f) != aAnimatedGeometryRoot) { + nsLayoutUtils::GetAnimatedGeometryRootFor(i, aBuilder) != + aExpectedAnimatedGeometryRootForChildren) { result = LAYER_ACTIVE; } @@ -2992,8 +2997,8 @@ RequiredLayerStateForChildrenInternal(nsDisplayListBuilder* aBuilder, nsDisplayList* list = i->GetSameCoordinateSystemChildren(); if (list) { LayerState childState = - RequiredLayerStateForChildrenInternal(aBuilder, aManager, aParameters, *list, - aAnimatedGeometryRoot); + RequiredLayerStateForChildren(aBuilder, aManager, aParameters, *list, + aExpectedAnimatedGeometryRootForChildren); if (childState > result) { result = childState; } @@ -3003,18 +3008,6 @@ RequiredLayerStateForChildrenInternal(nsDisplayListBuilder* aBuilder, return result; } -LayerState -nsDisplayWrapList::RequiredLayerStateForChildren(nsDisplayListBuilder* aBuilder, - LayerManager* aManager, - const ContainerLayerParameters& aParameters, - const nsDisplayList& aList, - nsIFrame* aItemFrame) -{ - return RequiredLayerStateForChildrenInternal( - aBuilder, aManager, aParameters, aList, - nsLayoutUtils::GetAnimatedGeometryRootFor(aItemFrame)); -} - nsRect nsDisplayWrapList::GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) { nsRect bounds; @@ -3190,7 +3183,8 @@ nsDisplayOpacity::GetLayerState(nsDisplayListBuilder* aBuilder, if (NeedsActiveLayer()) return LAYER_ACTIVE; - return RequiredLayerStateForChildren(aBuilder, aManager, aParameters, mList, mFrame); + return RequiredLayerStateForChildren(aBuilder, aManager, aParameters, mList, + nsLayoutUtils::GetAnimatedGeometryRootFor(this, aBuilder)); } bool @@ -4478,11 +4472,12 @@ nsDisplayTransform::GetLayerState(nsDisplayListBuilder* aBuilder, return LAYER_ACTIVE; } - return mStoredList.RequiredLayerStateForChildren(aBuilder, - aManager, - aParameters, - *mStoredList.GetChildren(), - mFrame); + // Expect the child display items to have this frame as their animated + // geometry root (since it will be their reference frame). If they have a + // different animated geometry root, we'll make this an active layer so the + // animation can be accelerated. + return RequiredLayerStateForChildren(aBuilder, aManager, aParameters, + *mStoredList.GetChildren(), Frame()); } bool nsDisplayTransform::ComputeVisibility(nsDisplayListBuilder *aBuilder, diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h index b59d803f929..b187ae76238 100644 --- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -2490,17 +2490,6 @@ public: return nullptr; } - /** - * Returns true if all descendant display items can be placed in the same - * ThebesLayer --- GetLayerState returns LAYER_INACTIVE or LAYER_NONE, - * and they all have the given aAnimatedGeometryRoot. - */ - static LayerState RequiredLayerStateForChildren(nsDisplayListBuilder* aBuilder, - LayerManager* aManager, - const ContainerLayerParameters& aParameters, - const nsDisplayList& aList, - nsIFrame* aItemFrame); - protected: nsDisplayWrapList() {} diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index e6102dc3e80..1e5aabb70fc 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -1304,23 +1304,24 @@ nsLayoutUtils::IsFixedPosFrameInDisplayPort(const nsIFrame* aFrame, nsRect* aDis return ViewportHasDisplayPort(aFrame->PresContext(), aDisplayPort); } -nsIFrame* -nsLayoutUtils::GetAnimatedGeometryRootFor(nsIFrame* aFrame, - const nsIFrame* aStopAtAncestor) +static nsIFrame* +GetAnimatedGeometryRootForFrame(nsIFrame* aFrame, + const nsIFrame* aStopAtAncestor) { nsIFrame* f = aFrame; nsIFrame* stickyFrame = nullptr; while (f != aStopAtAncestor) { - if (IsPopup(f)) + if (nsLayoutUtils::IsPopup(f)) break; if (ActiveLayerTracker::IsOffsetOrMarginStyleAnimated(f)) break; - if (!f->GetParent() && ViewportHasDisplayPort(f->PresContext())) { + if (!f->GetParent() && + nsLayoutUtils::ViewportHasDisplayPort(f->PresContext())) { // Viewport frames in a display port need to be animated geometry roots // for background-attachment:fixed elements. break; } - nsIFrame* parent = GetCrossDocParentFrame(f); + nsIFrame* parent = nsLayoutUtils::GetCrossDocParentFrame(f); if (!parent) break; nsIAtom* parentType = parent->GetType(); @@ -1351,7 +1352,7 @@ nsLayoutUtils::GetAnimatedGeometryRootFor(nsIFrame* aFrame, } } // Fixed-pos frames are parented by the viewport frame, which has no parent - if (IsFixedPosFrameInDisplayPort(f)) { + if (nsLayoutUtils::IsFixedPosFrameInDisplayPort(f)) { return f; } f = parent; @@ -1368,7 +1369,7 @@ nsLayoutUtils::GetAnimatedGeometryRootFor(nsDisplayItem* aItem, nsDisplayScrollLayer* scrollLayerItem = static_cast(aItem); nsIFrame* scrolledFrame = scrollLayerItem->GetScrolledFrame(); - return nsLayoutUtils::GetAnimatedGeometryRootFor(scrolledFrame, + return GetAnimatedGeometryRootForFrame(scrolledFrame, aBuilder->FindReferenceFrameFor(scrolledFrame)); } if (aItem->ShouldFixToViewport(aBuilder)) { @@ -1379,10 +1380,10 @@ nsLayoutUtils::GetAnimatedGeometryRootFor(nsDisplayItem* aItem, nsIFrame* viewportFrame = nsLayoutUtils::GetClosestFrameOfType(f, nsGkAtoms::viewportFrame); NS_ASSERTION(viewportFrame, "no viewport???"); - return nsLayoutUtils::GetAnimatedGeometryRootFor(viewportFrame, + return GetAnimatedGeometryRootForFrame(viewportFrame, aBuilder->FindReferenceFrameFor(viewportFrame)); } - return nsLayoutUtils::GetAnimatedGeometryRootFor(f, aItem->ReferenceFrame()); + return GetAnimatedGeometryRootForFrame(f, aItem->ReferenceFrame()); } // static diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h index 7ae017c10fc..0748fe4e96a 100644 --- a/layout/base/nsLayoutUtils.h +++ b/layout/base/nsLayoutUtils.h @@ -408,28 +408,22 @@ public: nsRect* aDisplayPort = nullptr); /** - * Finds the nearest ancestor frame that is considered to have (or will have) - * "animated geometry". For example the scrolled frames of scrollframes which - * are actively being scrolled fall into this category. Frames with certain - * CSS properties that are being animated (e.g. 'left'/'top' etc) are also - * placed in this category. Frames with animated CSS transforms are not - * put in this category because they can be handled directly by - * nsDisplayTransform. - * Stop searching at aStopAtAncestor if there is no such ancestor before it - * in the ancestor chain. + * Finds the nearest ancestor frame to aItem that is considered to have (or + * will have) "animated geometry". For example the scrolled frames of + * scrollframes which are actively being scrolled fall into this category. + * Frames with certain CSS properties that are being animated (e.g. + * 'left'/'top' etc) are also placed in this category. * Frames with different active geometry roots are in different ThebesLayers, * so that we can animate the geometry root by changing its transform (either * on the main thread or in the compositor). - * This function is idempotent: a frame returned by GetAnimatedGeometryRootFor - * is always returned again if you pass it to GetAnimatedGeometryRootFor. + * The animated geometry root is required to be a descendant (or equal to) + * aItem's ReferenceFrame(), which means that we will fall back to + * returning aItem->ReferenceFrame() when we can't find another animated + * geometry root. */ - static nsIFrame* GetAnimatedGeometryRootFor(nsIFrame* aFrame, - const nsIFrame* aStopAtAncestor = nullptr); - static nsIFrame* GetAnimatedGeometryRootFor(nsDisplayItem* aItem, nsDisplayListBuilder* aBuilder); - /** * GetScrollableFrameFor returns the scrollable frame for a scrolled frame */ diff --git a/layout/forms/nsColorControlFrame.cpp b/layout/forms/nsColorControlFrame.cpp index 0c42cbf9c8a..ff3fbd37411 100644 --- a/layout/forms/nsColorControlFrame.cpp +++ b/layout/forms/nsColorControlFrame.cpp @@ -49,7 +49,7 @@ nsColorControlFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsColorControlFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("ColorControl"), aResult); @@ -105,7 +105,7 @@ nsColorControlFrame::UpdateColor() NS_LITERAL_STRING("background-color:") + color, true); } -NS_IMETHODIMP +nsresult nsColorControlFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/forms/nsColorControlFrame.h b/layout/forms/nsColorControlFrame.h index 060d705abf7..af81c494636 100644 --- a/layout/forms/nsColorControlFrame.h +++ b/layout/forms/nsColorControlFrame.h @@ -31,7 +31,7 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif // nsIAnonymousContentCreator @@ -40,7 +40,7 @@ public: uint32_t aFilter) MOZ_OVERRIDE; // nsIFrame - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; virtual bool IsLeaf() const MOZ_OVERRIDE { return true; } diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 768e0979530..0a33d182991 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -756,7 +756,7 @@ nsComboboxControlFrame::GetPrefWidth(nsRenderingContext *aRenderingContext) return prefWidth; } -NS_IMETHODIMP +nsresult nsComboboxControlFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -884,7 +884,7 @@ nsComboboxControlFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsComboboxControlFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("ComboboxControl"), aResult); @@ -1097,7 +1097,7 @@ nsComboboxControlFrame::OnSetSelectedIndex(int32_t aOldIndex, int32_t aNewIndex) // End nsISelectControlFrame //---------------------------------------------------------------------- -NS_IMETHODIMP +nsresult nsComboboxControlFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) @@ -1226,7 +1226,7 @@ public: ~(nsIFrame::eReplacedContainsBlock)); } - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); @@ -1247,7 +1247,7 @@ nsComboboxDisplayFrame::GetType() const return nsGkAtoms::comboboxDisplayFrame; } -NS_IMETHODIMP +nsresult nsComboboxDisplayFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -1368,7 +1368,7 @@ nsComboboxControlFrame::GetChildLists(nsTArray* aLists) const mPopupFrames.AppendIfNonempty(aLists, kSelectPopupList); } -NS_IMETHODIMP +nsresult nsComboboxControlFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { diff --git a/layout/forms/nsComboboxControlFrame.h b/layout/forms/nsComboboxControlFrame.h index 45621171c12..bb942e8b9c1 100644 --- a/layout/forms/nsComboboxControlFrame.h +++ b/layout/forms/nsComboboxControlFrame.h @@ -69,12 +69,12 @@ public: virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aCX, + virtual nsresult Reflow(nsPresContext* aCX, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus); @@ -100,10 +100,10 @@ public: } #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; virtual const nsFrameList& GetChildList(ChildListID aListID) const MOZ_OVERRIDE; virtual void GetChildLists(nsTArray* aLists) const MOZ_OVERRIDE; diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp index 625b7a82201..c2e0b3c0a01 100644 --- a/layout/forms/nsFieldSetFrame.cpp +++ b/layout/forms/nsFieldSetFrame.cpp @@ -44,7 +44,7 @@ nsFieldSetFrame::GetType() const } #ifdef DEBUG -NS_IMETHODIMP +nsresult nsFieldSetFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -338,7 +338,7 @@ nsFieldSetFrame::ComputeSize(nsRenderingContext *aRenderingContext, return result; } -NS_IMETHODIMP +nsresult nsFieldSetFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -556,7 +556,7 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext, return NS_OK; } -NS_IMETHODIMP +nsresult nsFieldSetFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -564,7 +564,7 @@ nsFieldSetFrame::AppendFrames(ChildListID aListID, return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP +nsresult nsFieldSetFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -573,7 +573,7 @@ nsFieldSetFrame::InsertFrames(ChildListID aListID, return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP +nsresult nsFieldSetFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { diff --git a/layout/forms/nsFieldSetFrame.h b/layout/forms/nsFieldSetFrame.h index 256b840d6ba..69794ddabdd 100644 --- a/layout/forms/nsFieldSetFrame.h +++ b/layout/forms/nsFieldSetFrame.h @@ -32,7 +32,7 @@ public: */ virtual nsRect VisualBorderRectRelativeToSelf() const MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); @@ -44,12 +44,12 @@ public: void PaintBorderBackground(nsRenderingContext& aRenderingContext, nsPoint aPt, const nsRect& aDirtyRect, uint32_t aBGFlags); - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList); - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList); - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame); virtual nsIAtom* GetType() const; @@ -68,12 +68,12 @@ public: #endif #ifdef DEBUG - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList); #endif #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const { + virtual nsresult GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("FieldSet"), aResult); } #endif diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index 1cc4d095002..7c0d128b035 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -259,7 +259,7 @@ nsFileControlFrame::SyncDisabledState() } } -NS_IMETHODIMP +nsresult nsFileControlFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -286,7 +286,7 @@ nsFileControlFrame::ContentStatesChanged(nsEventStates aStates) } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsFileControlFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("FileControl"), aResult); diff --git a/layout/forms/nsFileControlFrame.h b/layout/forms/nsFileControlFrame.h index 89bee12004a..097066d0b6e 100644 --- a/layout/forms/nsFileControlFrame.h +++ b/layout/forms/nsFileControlFrame.h @@ -43,10 +43,10 @@ public: virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; virtual void ContentStatesChanged(nsEventStates aStates); diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp index 024c38a59d4..5659e6456bd 100644 --- a/layout/forms/nsFormControlFrame.cpp +++ b/layout/forms/nsFormControlFrame.cpp @@ -73,7 +73,7 @@ nsFormControlFrame::GetBaseline() const return mRect.height - GetUsedBorderAndPadding().bottom; } -NS_METHOD +nsresult nsFormControlFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -132,7 +132,7 @@ nsFormControlFrame::SetFocus(bool aOn, bool aRepaint) { } -NS_METHOD +nsresult nsFormControlFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) diff --git a/layout/forms/nsFormControlFrame.h b/layout/forms/nsFormControlFrame.h index 3a5ca931d12..51629250029 100644 --- a/layout/forms/nsFormControlFrame.h +++ b/layout/forms/nsFormControlFrame.h @@ -41,7 +41,7 @@ public: * Respond to a gui event * @see nsIFrame::HandleEvent */ - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) MOZ_OVERRIDE; @@ -51,7 +51,7 @@ public: * Respond to the request to resize and/or reflow * @see nsIFrame::Reflow */ - NS_IMETHOD Reflow(nsPresContext* aCX, + virtual nsresult Reflow(nsPresContext* aCX, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp index 80a96169455..a996d162d83 100644 --- a/layout/forms/nsGfxButtonControlFrame.cpp +++ b/layout/forms/nsGfxButtonControlFrame.cpp @@ -43,7 +43,7 @@ nsGfxButtonControlFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsGfxButtonControlFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("ButtonControl"), aResult); @@ -178,7 +178,7 @@ nsGfxButtonControlFrame::GetLabel(nsXPIDLString& aLabel) return NS_OK; } -NS_IMETHODIMP +nsresult nsGfxButtonControlFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -216,7 +216,7 @@ nsGfxButtonControlFrame::GetContentInsertionFrame() return this; } -NS_IMETHODIMP +nsresult nsGfxButtonControlFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) diff --git a/layout/forms/nsGfxButtonControlFrame.h b/layout/forms/nsGfxButtonControlFrame.h index 3512ab5ed03..65d84954b82 100644 --- a/layout/forms/nsGfxButtonControlFrame.h +++ b/layout/forms/nsGfxButtonControlFrame.h @@ -26,14 +26,14 @@ public: virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) MOZ_OVERRIDE; virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif NS_DECL_QUERYFRAME @@ -44,7 +44,7 @@ public: uint32_t aFilter) MOZ_OVERRIDE; virtual nsIFrame* CreateFrameFor(nsIContent* aContent) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/forms/nsGfxCheckboxControlFrame.h b/layout/forms/nsGfxCheckboxControlFrame.h index 979cf10e632..1b0b63c3ac0 100644 --- a/layout/forms/nsGfxCheckboxControlFrame.h +++ b/layout/forms/nsGfxCheckboxControlFrame.h @@ -17,7 +17,7 @@ public: virtual ~nsGfxCheckboxControlFrame(); #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { return MakeFrameName(NS_LITERAL_STRING("CheckboxControl"), aResult); } #endif diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp index 6e6ab4d2d27..b110e340abb 100644 --- a/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/layout/forms/nsHTMLButtonControlFrame.cpp @@ -76,7 +76,7 @@ nsHTMLButtonControlFrame::SetFocus(bool aOn, bool aRepaint) { } -NS_IMETHODIMP +nsresult nsHTMLButtonControlFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) @@ -162,7 +162,7 @@ nsHTMLButtonControlFrame::GetPrefWidth(nsRenderingContext* aRenderingContext) return result; } -NS_IMETHODIMP +nsresult nsHTMLButtonControlFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -375,7 +375,7 @@ nsHTMLButtonControlFrame::SetAdditionalStyleContext(int32_t aIndex, mRenderer.SetStyleContext(aIndex, aStyleContext); } -NS_IMETHODIMP +nsresult nsHTMLButtonControlFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -383,7 +383,7 @@ nsHTMLButtonControlFrame::AppendFrames(ChildListID aListID, return NS_ERROR_UNEXPECTED; } -NS_IMETHODIMP +nsresult nsHTMLButtonControlFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -392,7 +392,7 @@ nsHTMLButtonControlFrame::InsertFrames(ChildListID aListID, return NS_ERROR_UNEXPECTED; } -NS_IMETHODIMP +nsresult nsHTMLButtonControlFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { diff --git a/layout/forms/nsHTMLButtonControlFrame.h b/layout/forms/nsHTMLButtonControlFrame.h index 20630b271ed..bcdaaa4a895 100644 --- a/layout/forms/nsHTMLButtonControlFrame.h +++ b/layout/forms/nsHTMLButtonControlFrame.h @@ -34,12 +34,12 @@ public: virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) MOZ_OVERRIDE; @@ -51,14 +51,14 @@ public: virtual void SetAdditionalStyleContext(int32_t aIndex, nsStyleContext* aStyleContext) MOZ_OVERRIDE; - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; #ifdef ACCESSIBILITY @@ -68,7 +68,7 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { return MakeFrameName(NS_LITERAL_STRING("HTMLButtonControl"), aResult); } #endif diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp index 27e24ca58ea..ffabdb5a5f7 100644 --- a/layout/forms/nsImageControlFrame.cpp +++ b/layout/forms/nsImageControlFrame.cpp @@ -38,12 +38,12 @@ public: NS_DECL_QUERYFRAME NS_DECL_FRAMEARENA_HELPERS - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus); @@ -54,12 +54,12 @@ public: #endif #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const { + virtual nsresult GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("ImageControl"), aResult); } #endif - NS_IMETHOD GetCursor(const nsPoint& aPoint, + virtual nsresult GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor); // nsIFormContromFrame virtual void SetFocus(bool aOn, bool aRepaint); @@ -132,7 +132,7 @@ nsImageControlFrame::GetType() const return nsGkAtoms::imageControlFrame; } -NS_METHOD +nsresult nsImageControlFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -146,7 +146,7 @@ nsImageControlFrame::Reflow(nsPresContext* aPresContext, return nsImageControlFrameSuper::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus); } -NS_METHOD +nsresult nsImageControlFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) @@ -191,7 +191,7 @@ nsImageControlFrame::SetFocus(bool aOn, bool aRepaint) { } -NS_IMETHODIMP +nsresult nsImageControlFrame::GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) { diff --git a/layout/forms/nsLegendFrame.cpp b/layout/forms/nsLegendFrame.cpp index a01ff3ecd05..b2d37eb95a7 100644 --- a/layout/forms/nsLegendFrame.cpp +++ b/layout/forms/nsLegendFrame.cpp @@ -47,7 +47,7 @@ NS_QUERYFRAME_HEAD(nsLegendFrame) NS_QUERYFRAME_ENTRY(nsLegendFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) -NS_IMETHODIMP +nsresult nsLegendFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -84,7 +84,7 @@ int32_t nsLegendFrame::GetAlign() } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsLegendFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Legend"), aResult); diff --git a/layout/forms/nsLegendFrame.h b/layout/forms/nsLegendFrame.h index 747b1ef41d2..4f24e0d43a8 100644 --- a/layout/forms/nsLegendFrame.h +++ b/layout/forms/nsLegendFrame.h @@ -17,7 +17,7 @@ public: nsLegendFrame(nsStyleContext* aContext) : nsBlockFrame(aContext) {} - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -27,7 +27,7 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif int32_t GetAlign(); diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 23317b7acbc..774b82a68fb 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -328,7 +328,7 @@ nsListControlFrame::GetMinWidth(nsRenderingContext *aRenderingContext) return result; } -NS_IMETHODIMP +nsresult nsListControlFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -848,7 +848,7 @@ nsListControlFrame::CaptureMouseEvents(bool aGrabMouseEvents) } //--------------------------------------------------------- -NS_IMETHODIMP +nsresult nsListControlFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) @@ -897,7 +897,7 @@ nsListControlFrame::HandleEvent(nsPresContext* aPresContext, //--------------------------------------------------------- -NS_IMETHODIMP +nsresult nsListControlFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -1436,7 +1436,7 @@ nsListControlFrame::AboutToRollup() } } -NS_IMETHODIMP +nsresult nsListControlFrame::DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus) @@ -1472,7 +1472,7 @@ nsListControlFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsListControlFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("ListControl"), aResult); diff --git a/layout/forms/nsListControlFrame.h b/layout/forms/nsListControlFrame.h index 383b209d8ec..daaf484a662 100644 --- a/layout/forms/nsListControlFrame.h +++ b/layout/forms/nsListControlFrame.h @@ -58,17 +58,17 @@ public: NS_DECL_FRAMEARENA_HELPERS // nsIFrame - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aCX, + virtual nsresult Reflow(nsPresContext* aCX, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -77,7 +77,7 @@ public: nsIFrame* aParent, nsIFrame* aPrevInFlow) MOZ_OVERRIDE; - NS_IMETHOD DidReflow(nsPresContext* aPresContext, + virtual nsresult DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus) MOZ_OVERRIDE; virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; @@ -102,7 +102,7 @@ public: } #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif // nsIFormControlFrame diff --git a/layout/forms/nsMeterFrame.cpp b/layout/forms/nsMeterFrame.cpp index b7a3996fa60..f5ae60dcfc9 100644 --- a/layout/forms/nsMeterFrame.cpp +++ b/layout/forms/nsMeterFrame.cpp @@ -91,7 +91,7 @@ NS_QUERYFRAME_HEAD(nsMeterFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) -NS_IMETHODIMP nsMeterFrame::Reflow(nsPresContext* aPresContext, +nsresult nsMeterFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) @@ -186,7 +186,7 @@ nsMeterFrame::ReflowBarFrame(nsIFrame* aBarFrame, xoffset, yoffset, 0); } -NS_IMETHODIMP +nsresult nsMeterFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/forms/nsMeterFrame.h b/layout/forms/nsMeterFrame.h index 8895e745572..35c0181e3b7 100644 --- a/layout/forms/nsMeterFrame.h +++ b/layout/forms/nsMeterFrame.h @@ -27,13 +27,13 @@ public: virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aCX, + virtual nsresult Reflow(nsPresContext* aCX, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { return MakeFrameName(NS_LITERAL_STRING("Meter"), aResult); } #endif @@ -45,7 +45,7 @@ public: virtual void AppendAnonymousContentTo(nsBaseContentList& aElements, uint32_t aFilter) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp index c3637205f69..4f7079dafe3 100644 --- a/layout/forms/nsNumberControlFrame.cpp +++ b/layout/forms/nsNumberControlFrame.cpp @@ -60,7 +60,7 @@ nsNumberControlFrame::DestroyFrom(nsIFrame* aDestructRoot) nsContainerFrame::DestroyFrom(aDestructRoot); } -NS_IMETHODIMP +nsresult nsNumberControlFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -167,7 +167,7 @@ nsNumberControlFrame::SyncDisabledState() } } -NS_IMETHODIMP +nsresult nsNumberControlFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/forms/nsNumberControlFrame.h b/layout/forms/nsNumberControlFrame.h index cc5f9d1c259..a3a3d31d300 100644 --- a/layout/forms/nsNumberControlFrame.h +++ b/layout/forms/nsNumberControlFrame.h @@ -50,12 +50,12 @@ public: virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE; #endif - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; @@ -65,7 +65,7 @@ public: uint32_t aFilter) MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { return MakeFrameName(NS_LITERAL_STRING("NumberControl"), aResult); } #endif diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp index 74d04adb77d..923d7acf3a2 100644 --- a/layout/forms/nsProgressFrame.cpp +++ b/layout/forms/nsProgressFrame.cpp @@ -96,7 +96,7 @@ nsProgressFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, BuildDisplayListForInline(aBuilder, aDirtyRect, aLists); } -NS_IMETHODIMP nsProgressFrame::Reflow(nsPresContext* aPresContext, +nsresult nsProgressFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) @@ -200,7 +200,7 @@ nsProgressFrame::ReflowBarFrame(nsIFrame* aBarFrame, xoffset, yoffset, 0); } -NS_IMETHODIMP +nsresult nsProgressFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/forms/nsProgressFrame.h b/layout/forms/nsProgressFrame.h index ab283746c51..05531690a4e 100644 --- a/layout/forms/nsProgressFrame.h +++ b/layout/forms/nsProgressFrame.h @@ -32,13 +32,13 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aCX, + virtual nsresult Reflow(nsPresContext* aCX, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { return MakeFrameName(NS_LITERAL_STRING("Progress"), aResult); } #endif @@ -50,7 +50,7 @@ public: virtual void AppendAnonymousContentTo(nsBaseContentList& aElements, uint32_t aFilter) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/forms/nsRangeFrame.cpp b/layout/forms/nsRangeFrame.cpp index 8b3327d44ee..bfacac07b74 100644 --- a/layout/forms/nsRangeFrame.cpp +++ b/layout/forms/nsRangeFrame.cpp @@ -246,7 +246,7 @@ nsRangeFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, } } -NS_IMETHODIMP +nsresult nsRangeFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -669,7 +669,7 @@ nsRangeFrame::DoUpdateRangeProgressFrame(nsIFrame* aRangeProgressFrame, aRangeProgressFrame->SetRect(progRect); } -NS_IMETHODIMP +nsresult nsRangeFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/forms/nsRangeFrame.h b/layout/forms/nsRangeFrame.h index f355846599e..a90fe072b22 100644 --- a/layout/forms/nsRangeFrame.h +++ b/layout/forms/nsRangeFrame.h @@ -42,13 +42,13 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { return MakeFrameName(NS_LITERAL_STRING("Range"), aResult); } #endif @@ -64,7 +64,7 @@ public: virtual void AppendAnonymousContentTo(nsBaseContentList& aElements, uint32_t aFilter) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/forms/nsSelectsAreaFrame.cpp b/layout/forms/nsSelectsAreaFrame.cpp index d6d9192a36a..c57c3f83c02 100644 --- a/layout/forms/nsSelectsAreaFrame.cpp +++ b/layout/forms/nsSelectsAreaFrame.cpp @@ -151,7 +151,7 @@ nsSelectsAreaFrame::BuildDisplayListInternal(nsDisplayListBuilder* aBuilder, } } -NS_IMETHODIMP +nsresult nsSelectsAreaFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/forms/nsSelectsAreaFrame.h b/layout/forms/nsSelectsAreaFrame.h index c89e1ba728f..cf570c502f4 100644 --- a/layout/forms/nsSelectsAreaFrame.h +++ b/layout/forms/nsSelectsAreaFrame.h @@ -23,7 +23,7 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists); - NS_IMETHOD Reflow(nsPresContext* aCX, + virtual nsresult Reflow(nsPresContext* aCX, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index 8576cb1a01f..2da0606601f 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -462,7 +462,7 @@ nsTextControlFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext, return autoSize; } -NS_IMETHODIMP +nsresult nsTextControlFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -1042,7 +1042,7 @@ nsTextControlFrame::GetSelectionRange(int32_t* aSelectionStart, /////END INTERFACE IMPLEMENTATIONS ////NSIFRAME -NS_IMETHODIMP +nsresult nsTextControlFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -1187,7 +1187,7 @@ nsTextControlFrame::GetMaxLength(int32_t* aSize) // END IMPLEMENTING NS_IFORMCONTROLFRAME -NS_IMETHODIMP +nsresult nsTextControlFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -1370,7 +1370,7 @@ nsTextControlFrame::RestoreState(nsPresState* aState) return NS_OK; } -NS_IMETHODIMP +nsresult nsTextControlFrame::PeekOffset(nsPeekOffsetStruct *aPos) { return NS_ERROR_FAILURE; diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h index d9fcfd77b8e..d930968049a 100644 --- a/layout/forms/nsTextControlFrame.h +++ b/layout/forms/nsTextControlFrame.h @@ -50,7 +50,7 @@ public: nsSize aMargin, nsSize aBorder, nsSize aPadding, bool aShrinkWrap) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -65,7 +65,7 @@ public: #endif #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { aResult.AssignLiteral("nsTextControlFrame"); return NS_OK; @@ -87,7 +87,7 @@ public: // Utility methods to set current widget state - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder, @@ -138,13 +138,13 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; /** handler for attribute changes to mContent */ - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; nsresult GetText(nsString& aText); - NS_IMETHOD PeekOffset(nsPeekOffsetStruct *aPos) MOZ_OVERRIDE; + virtual nsresult PeekOffset(nsPeekOffsetStruct *aPos) MOZ_OVERRIDE; NS_DECL_QUERYFRAME diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp index 2f9bb6323dd..f1255aadba8 100644 --- a/layout/generic/nsBRFrame.cpp +++ b/layout/generic/nsBRFrame.cpp @@ -34,7 +34,7 @@ public: virtual bool PeekOffsetWord(bool aForward, bool aWordSelectEatSpace, bool aIsKeyboardSelect, int32_t* aOffset, PeekWordState* aState); - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); @@ -76,7 +76,7 @@ BRFrame::~BRFrame() { } -NS_IMETHODIMP +nsresult BRFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 93da7c6f559..c2c57ad904e 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -384,7 +384,7 @@ nsBlockFrame::List(FILE* out, const char* aPrefix, uint32_t aFlags) const fprintf_stderr(out, "%s>\n", aPrefix); } -NS_IMETHODIMP +nsresult nsBlockFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Block"), aResult); @@ -392,7 +392,7 @@ nsBlockFrame::GetFrameName(nsAString& aResult) const #endif #ifdef DEBUG -NS_IMETHODIMP_(nsFrameState) +nsFrameState nsBlockFrame::GetDebugStateBits() const { // We don't want to include our cursor flag in the bits the @@ -933,7 +933,7 @@ CalculateContainingBlockSizeForAbsolutes(const nsHTMLReflowState& aReflowState, return cbSize; } -NS_IMETHODIMP +nsresult nsBlockFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, @@ -2664,7 +2664,7 @@ nsBlockFrame::SlideLine(nsBlockReflowState& aState, } } -NS_IMETHODIMP +nsresult nsBlockFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -4678,7 +4678,7 @@ nsBlockFrame::RemovePushedFloats() ////////////////////////////////////////////////////////////////////// // Frame list manipulation routines -NS_IMETHODIMP +nsresult nsBlockFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -4723,7 +4723,7 @@ nsBlockFrame::AppendFrames(ChildListID aListID, return NS_OK; } -NS_IMETHODIMP +nsresult nsBlockFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -5009,7 +5009,7 @@ static bool BlockHasAnyFloats(nsIFrame* aFrame) return false; } -NS_IMETHODIMP +nsresult nsBlockFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { @@ -6469,7 +6469,7 @@ nsBlockFrame::Init(nsIContent* aContent, } } -NS_IMETHODIMP +nsresult nsBlockFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h index 3983a77e3c8..a84a9d0fd83 100644 --- a/layout/generic/nsBlockFrame.h +++ b/layout/generic/nsBlockFrame.h @@ -108,14 +108,14 @@ public: virtual void Init(nsIContent* aContent, nsIFrame* aParent, nsIFrame* aPrevInFlow) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; virtual const nsFrameList& GetChildList(ChildListID aListID) const MOZ_OVERRIDE; virtual void GetChildLists(nsTArray* aLists) const MOZ_OVERRIDE; @@ -140,11 +140,11 @@ public: #ifdef DEBUG_FRAME_DUMP void List(FILE* out = stderr, const char* aPrefix = "", uint32_t aFlags = 0) const MOZ_OVERRIDE; - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif #ifdef DEBUG - NS_IMETHOD_(nsFrameState) GetDebugStateBits() const MOZ_OVERRIDE; + virtual nsFrameState GetDebugStateBits() const MOZ_OVERRIDE; #endif #ifdef ACCESSIBILITY @@ -261,12 +261,12 @@ public: nsHTMLReflowMetrics& aMetrics, nscoord aConsumed); - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp index 26465c4d8c0..fb76fb37c4a 100644 --- a/layout/generic/nsBulletFrame.cpp +++ b/layout/generic/nsBulletFrame.cpp @@ -68,7 +68,7 @@ nsBulletFrame::DestroyFrom(nsIFrame* aDestructRoot) } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsBulletFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Bullet"), aResult); @@ -1651,7 +1651,7 @@ nsBulletFrame::GetDesiredSize(nsPresContext* aCX, } } -NS_IMETHODIMP +nsresult nsBulletFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, diff --git a/layout/generic/nsBulletFrame.h b/layout/generic/nsBulletFrame.h index 57ed99da4b8..7e146a28998 100644 --- a/layout/generic/nsBulletFrame.h +++ b/layout/generic/nsBulletFrame.h @@ -61,11 +61,11 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif // nsIHTMLReflow - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp index 4eebfda0a70..46d10944452 100644 --- a/layout/generic/nsCanvasFrame.cpp +++ b/layout/generic/nsCanvasFrame.cpp @@ -82,7 +82,7 @@ nsCanvasFrame::SetHasFocus(bool aHasFocus) return NS_OK; } -NS_IMETHODIMP +nsresult nsCanvasFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -92,7 +92,7 @@ nsCanvasFrame::SetInitialChildList(ChildListID aListID, return nsContainerFrame::SetInitialChildList(aListID, aChildList); } -NS_IMETHODIMP +nsresult nsCanvasFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -125,7 +125,7 @@ nsCanvasFrame::AppendFrames(ChildListID aListID, return NS_OK; } -NS_IMETHODIMP +nsresult nsCanvasFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -139,7 +139,7 @@ nsCanvasFrame::InsertFrames(ChildListID aListID, return AppendFrames(aListID, aFrameList); } -NS_IMETHODIMP +nsresult nsCanvasFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { @@ -450,7 +450,7 @@ nsCanvasFrame::GetPrefWidth(nsRenderingContext *aRenderingContext) return result; } -NS_IMETHODIMP +nsresult nsCanvasFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -591,7 +591,7 @@ nsCanvasFrame::GetType() const return nsGkAtoms::canvasFrame; } -NS_IMETHODIMP +nsresult nsCanvasFrame::GetContentForEvent(WidgetEvent* aEvent, nsIContent** aContent) { @@ -610,7 +610,7 @@ nsCanvasFrame::GetContentForEvent(WidgetEvent* aEvent, } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsCanvasFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Canvas"), aResult); diff --git a/layout/generic/nsCanvasFrame.h b/layout/generic/nsCanvasFrame.h index 4c7f1b86e98..a34e63cc722 100644 --- a/layout/generic/nsCanvasFrame.h +++ b/layout/generic/nsCanvasFrame.h @@ -40,19 +40,19 @@ public: virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -98,9 +98,9 @@ public: } #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif - NS_IMETHOD GetContentForEvent(mozilla::WidgetEvent* aEvent, + virtual nsresult GetContentForEvent(mozilla::WidgetEvent* aEvent, nsIContent** aContent) MOZ_OVERRIDE; nsRect CanvasArea() const; diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp index 5084cf51c6e..24047ef2271 100644 --- a/layout/generic/nsColumnSetFrame.cpp +++ b/layout/generic/nsColumnSetFrame.cpp @@ -120,7 +120,7 @@ nsColumnSetFrame::PaintColumnRule(nsRenderingContext* aCtx, } } -NS_IMETHODIMP +nsresult nsColumnSetFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -949,7 +949,7 @@ nsColumnSetFrame::FindBestBalanceHeight(const nsHTMLReflowState& aReflowState, aRunWasFeasible = feasible; } -NS_IMETHODIMP +nsresult nsColumnSetFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -1041,7 +1041,7 @@ nsColumnSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, } } -NS_IMETHODIMP +nsresult nsColumnSetFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -1053,7 +1053,7 @@ nsColumnSetFrame::AppendFrames(ChildListID aListID, return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP +nsresult nsColumnSetFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -1066,7 +1066,7 @@ nsColumnSetFrame::InsertFrames(ChildListID aListID, return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP +nsresult nsColumnSetFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { diff --git a/layout/generic/nsColumnSetFrame.h b/layout/generic/nsColumnSetFrame.h index 96aacf5cd0d..82dbb9924b3 100644 --- a/layout/generic/nsColumnSetFrame.h +++ b/layout/generic/nsColumnSetFrame.h @@ -14,20 +14,20 @@ public: nsColumnSetFrame(nsStyleContext* aContext); - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; @@ -71,7 +71,7 @@ public: const nsPoint& aPt); #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE { return MakeFrameName(NS_LITERAL_STRING("ColumnSet"), aResult); } #endif diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp index c8fa362f50c..de9d759f19b 100644 --- a/layout/generic/nsContainerFrame.cpp +++ b/layout/generic/nsContainerFrame.cpp @@ -67,7 +67,7 @@ nsContainerFrame::Init(nsIContent* aContent, } } -NS_IMETHODIMP +nsresult nsContainerFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -91,7 +91,7 @@ nsContainerFrame::SetInitialChildList(ChildListID aListID, return result; } -NS_IMETHODIMP +nsresult nsContainerFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -120,7 +120,7 @@ nsContainerFrame::AppendFrames(ChildListID aListID, return NS_OK; } -NS_IMETHODIMP +nsresult nsContainerFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -153,7 +153,7 @@ nsContainerFrame::InsertFrames(ChildListID aListID, return NS_OK; } -NS_IMETHODIMP +nsresult nsContainerFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { diff --git a/layout/generic/nsContainerFrame.h b/layout/generic/nsContainerFrame.h index da46262458d..83ac45e17fe 100644 --- a/layout/generic/nsContainerFrame.h +++ b/layout/generic/nsContainerFrame.h @@ -55,14 +55,14 @@ public: virtual void Init(nsIContent* aContent, nsIFrame* aParent, nsIFrame* aPrevInFlow) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; virtual const nsFrameList& GetChildList(ChildListID aList) const MOZ_OVERRIDE; diff --git a/layout/generic/nsFirstLetterFrame.cpp b/layout/generic/nsFirstLetterFrame.cpp index a73114f3c5b..d3dcda12b9b 100644 --- a/layout/generic/nsFirstLetterFrame.cpp +++ b/layout/generic/nsFirstLetterFrame.cpp @@ -34,7 +34,7 @@ NS_QUERYFRAME_HEAD(nsFirstLetterFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsFirstLetterFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Letter"), aResult); @@ -76,7 +76,7 @@ nsFirstLetterFrame::Init(nsIContent* aContent, nsContainerFrame::Init(aContent, aParent, aPrevInFlow); } -NS_IMETHODIMP +nsresult nsFirstLetterFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -91,7 +91,7 @@ nsFirstLetterFrame::SetInitialChildList(ChildListID aListID, return NS_OK; } -NS_IMETHODIMP +nsresult nsFirstLetterFrame::GetChildFrameContainingOffset(int32_t inContentOffset, bool inHint, int32_t* outFrameContentOffset, @@ -153,7 +153,7 @@ nsFirstLetterFrame::ComputeSize(nsRenderingContext *aRenderingContext, aCBSize, aAvailableWidth, aMargin, aBorder, aPadding, aFlags); } -NS_IMETHODIMP +nsresult nsFirstLetterFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, diff --git a/layout/generic/nsFirstLetterFrame.h b/layout/generic/nsFirstLetterFrame.h index cb48ea57975..70bc2d3fca7 100644 --- a/layout/generic/nsFirstLetterFrame.h +++ b/layout/generic/nsFirstLetterFrame.h @@ -26,10 +26,10 @@ public: virtual void Init(nsIContent* aContent, nsIFrame* aParent, nsIFrame* aPrevInFlow) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif virtual nsIAtom* GetType() const MOZ_OVERRIDE; @@ -53,7 +53,7 @@ public: nsSize aCBSize, nscoord aAvailableWidth, nsSize aMargin, nsSize aBorder, nsSize aPadding, uint32_t aFlags) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -63,7 +63,7 @@ public: virtual int GetSkipSides(const nsHTMLReflowState* aReflowState = nullptr) const MOZ_OVERRIDE; //override of nsFrame method - NS_IMETHOD GetChildFrameContainingOffset(int32_t inContentOffset, + virtual nsresult GetChildFrameContainingOffset(int32_t inContentOffset, bool inHint, int32_t* outFrameContentOffset, nsIFrame **outChildFrame) MOZ_OVERRIDE; diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp index 24ed03a49c7..d6c5ef7506e 100644 --- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -1375,7 +1375,7 @@ nsFlexContainerFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsFlexContainerFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("FlexContainer"), aResult); @@ -2694,7 +2694,7 @@ FlexLine::PositionItemsInCrossAxis(nscoord aLineStartPosition, } } -NS_IMETHODIMP +nsresult nsFlexContainerFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/generic/nsFlexContainerFrame.h b/layout/generic/nsFlexContainerFrame.h index 43fc33947d2..db16ca5f8f2 100644 --- a/layout/generic/nsFlexContainerFrame.h +++ b/layout/generic/nsFlexContainerFrame.h @@ -40,7 +40,7 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -52,7 +52,7 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif // Flexbox-specific public methods bool IsHorizontal(); diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 5461cec87b3..a06eb503b49 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -539,7 +539,7 @@ nsFrame::Init(nsIContent* aContent, InitBoxMetrics(false); } -NS_IMETHODIMP nsFrame::SetInitialChildList(ChildListID aListID, +nsresult nsFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { // XXX This shouldn't be getting called at all, but currently is for backwards @@ -553,7 +553,7 @@ NS_IMETHODIMP nsFrame::SetInitialChildList(ChildListID aListID, #endif } -NS_IMETHODIMP +nsresult nsFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -561,7 +561,7 @@ nsFrame::AppendFrames(ChildListID aListID, return NS_ERROR_UNEXPECTED; } -NS_IMETHODIMP +nsresult nsFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -570,7 +570,7 @@ nsFrame::InsertFrames(ChildListID aListID, return NS_ERROR_UNEXPECTED; } -NS_IMETHODIMP +nsresult nsFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { @@ -679,7 +679,7 @@ nsFrame::DestroyFrom(nsIFrame* aDestructRoot) shell->FreeFrame(id, this); } -NS_IMETHODIMP +nsresult nsFrame::GetOffsets(int32_t &aStart, int32_t &aEnd) const { aStart = 0; @@ -2317,7 +2317,7 @@ nsIFrame::MarkAbsoluteFramesForDisplayList(nsDisplayListBuilder* aBuilder, } } -NS_IMETHODIMP +nsresult nsFrame::GetContentForEvent(WidgetEvent* aEvent, nsIContent** aContent) { @@ -2340,7 +2340,7 @@ nsFrame::FireDOMEvent(const nsAString& aDOMEventName, nsIContent *aContent) } } -NS_IMETHODIMP +nsresult nsFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) @@ -2491,7 +2491,7 @@ nsFrame::GetDataForTableSelection(const nsFrameSelection* aFrameSelection, return NS_OK; } -NS_IMETHODIMP +nsresult nsFrame::IsSelectable(bool* aSelectable, uint8_t* aSelectStyle) const { if (!aSelectable) //it's ok if aSelectStyle is null @@ -3638,7 +3638,7 @@ nsIFrame::AssociateImage(const nsStyleImage& aImage, nsPresContext* aPresContext loader->AssociateRequestToFrame(req, this); } -NS_IMETHODIMP +nsresult nsFrame::GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) { @@ -4137,7 +4137,7 @@ nsFrame::ShrinkWidthToFit(nsRenderingContext *aRenderingContext, return result; } -NS_IMETHODIMP +nsresult nsFrame::WillReflow(nsPresContext* aPresContext) { #ifdef DEBUG_dbaron_off @@ -4152,7 +4152,7 @@ nsFrame::WillReflow(nsPresContext* aPresContext) return NS_OK; } -NS_IMETHODIMP +nsresult nsFrame::DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus) @@ -4234,7 +4234,7 @@ nsFrame::CanContinueTextRun() const return false; } -NS_IMETHODIMP +nsresult nsFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -4248,14 +4248,14 @@ nsFrame::Reflow(nsPresContext* aPresContext, return NS_OK; } -NS_IMETHODIMP +nsresult nsFrame::CharacterDataChanged(CharacterDataChangeInfo* aInfo) { NS_NOTREACHED("should only be called for text frames"); return NS_OK; } -NS_IMETHODIMP +nsresult nsFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -5354,7 +5354,7 @@ nsIFrame::List(FILE* out, const char* aPrefix, uint32_t aFlags) const fprintf_stderr(out, "%s\n", str.get()); } -NS_IMETHODIMP +nsresult nsFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Frame"), aResult); @@ -5409,7 +5409,7 @@ nsIFrame::RootFrameList(nsPresContext* aPresContext, FILE* out, const char* aPre #endif #ifdef DEBUG -NS_IMETHODIMP_(nsFrameState) +nsFrameState nsFrame::GetDebugStateBits() const { // We'll ignore these flags for the purposes of comparing frame state: @@ -5532,7 +5532,7 @@ nsFrame::IsSelfEmpty() return false; } -NS_IMETHODIMP +nsresult nsFrame::GetSelectionController(nsPresContext *aPresContext, nsISelectionController **aSelCon) { if (!aPresContext || !aSelCon) @@ -5574,7 +5574,7 @@ nsIFrame::GetConstFrameSelection() const } #ifdef DEBUG -NS_IMETHODIMP +nsresult nsFrame::DumpRegressionData(nsPresContext* aPresContext, FILE* out, int32_t aIndent) { IndentBy(out, aIndent); @@ -5650,7 +5650,7 @@ nsIFrame::IsFrameSelected() const GetContent()->GetChildCount()); } -NS_IMETHODIMP +nsresult nsFrame::GetPointFromOffset(int32_t inOffset, nsPoint* outPoint) { NS_PRECONDITION(outPoint != nullptr, "Null parameter"); @@ -5673,7 +5673,7 @@ nsFrame::GetPointFromOffset(int32_t inOffset, nsPoint* outPoint) return NS_OK; } -NS_IMETHODIMP +nsresult nsFrame::GetChildFrameContainingOffset(int32_t inContentOffset, bool inHint, int32_t* outFrameContentOffset, nsIFrame **outChildFrame) { NS_PRECONDITION(outChildFrame && outFrameContentOffset, "Null parameter"); @@ -6108,7 +6108,7 @@ static bool IsMovingInFrameDirection(nsIFrame* frame, nsDirection aDirection, bo return aDirection == (isReverseDirection ? eDirPrevious : eDirNext); } -NS_IMETHODIMP +nsresult nsIFrame::PeekOffset(nsPeekOffsetStruct* aPos) { if (!aPos) @@ -6528,7 +6528,7 @@ nsFrame::BreakWordBetweenPunctuation(const PeekWordState* aState, return aState->mSeenNonPunctuationSinceWhitespace; } -NS_IMETHODIMP +nsresult nsFrame::CheckVisibility(nsPresContext* , int32_t , int32_t , bool , bool *, bool *) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index 0a1c2a109ec..6a63298fedd 100644 --- a/layout/generic/nsFrame.h +++ b/layout/generic/nsFrame.h @@ -144,14 +144,14 @@ public: virtual void Init(nsIContent* aContent, nsIFrame* aParent, nsIFrame* asPrevInFlow) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; virtual nsStyleContext* GetAdditionalStyleContext(int32_t aIndex) const MOZ_OVERRIDE; @@ -162,18 +162,18 @@ public: virtual const nsFrameList& GetChildList(ChildListID aListID) const MOZ_OVERRIDE; virtual void GetChildLists(nsTArray* aLists) const MOZ_OVERRIDE; - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) MOZ_OVERRIDE; - NS_IMETHOD GetContentForEvent(mozilla::WidgetEvent* aEvent, + virtual nsresult GetContentForEvent(mozilla::WidgetEvent* aEvent, nsIContent** aContent) MOZ_OVERRIDE; - NS_IMETHOD GetCursor(const nsPoint& aPoint, + virtual nsresult GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) MOZ_OVERRIDE; - NS_IMETHOD GetPointFromOffset(int32_t inOffset, + virtual nsresult GetPointFromOffset(int32_t inOffset, nsPoint* outPoint) MOZ_OVERRIDE; - NS_IMETHOD GetChildFrameContainingOffset(int32_t inContentOffset, + virtual nsresult GetChildFrameContainingOffset(int32_t inContentOffset, bool inHint, int32_t* outFrameContentOffset, nsIFrame* *outChildFrame) MOZ_OVERRIDE; @@ -185,8 +185,8 @@ public: int8_t aOutSideLimit ); - NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE; + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; virtual nsSplittableType GetSplittableType() const MOZ_OVERRIDE; @@ -200,9 +200,9 @@ public: virtual void SetNextInFlow(nsIFrame*) MOZ_OVERRIDE; virtual nsIAtom* GetType() const MOZ_OVERRIDE; - NS_IMETHOD IsSelectable(bool* aIsSelectable, uint8_t* aSelectStyle) const MOZ_OVERRIDE; + virtual nsresult IsSelectable(bool* aIsSelectable, uint8_t* aSelectStyle) const MOZ_OVERRIDE; - NS_IMETHOD GetSelectionController(nsPresContext *aPresContext, nsISelectionController **aSelCon) MOZ_OVERRIDE; + virtual nsresult GetSelectionController(nsPresContext *aPresContext, nsISelectionController **aSelCon) MOZ_OVERRIDE; virtual bool PeekOffsetNoAmount(bool aForward, int32_t* aOffset) MOZ_OVERRIDE; virtual bool PeekOffsetCharacter(bool aForward, int32_t* aOffset, @@ -222,9 +222,9 @@ public: bool aPunctAfter, bool aWhitespaceAfter, bool aIsKeyboardSelect); - NS_IMETHOD CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *_retval) MOZ_OVERRIDE; + virtual nsresult CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *_retval) MOZ_OVERRIDE; - NS_IMETHOD GetOffsets(int32_t &aStart, int32_t &aEnd) const MOZ_OVERRIDE; + virtual nsresult GetOffsets(int32_t &aStart, int32_t &aEnd) const MOZ_OVERRIDE; virtual void ChildIsDirty(nsIFrame* aChild) MOZ_OVERRIDE; #ifdef ACCESSIBILITY @@ -295,7 +295,7 @@ public: nscoord ShrinkWidthToFit(nsRenderingContext *aRenderingContext, nscoord aWidthInCB); - NS_IMETHOD WillReflow(nsPresContext* aPresContext) MOZ_OVERRIDE; + virtual nsresult WillReflow(nsPresContext* aPresContext) MOZ_OVERRIDE; /** * Calculates the size of this frame after reflowing (calling Reflow on, and * updating the size and position of) its children, as necessary. The @@ -318,11 +318,11 @@ public: * Note: if it's only the overflow rect(s) of a frame that need to be * updated, then UpdateOverflow should be called instead of Reflow. */ - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; - NS_IMETHOD DidReflow(nsPresContext* aPresContext, + virtual nsresult DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus) MOZ_OVERRIDE; @@ -652,7 +652,7 @@ public: * Get a printable from of the name of the frame type. * XXX This should be eliminated and we use GetType() instead... */ - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; nsresult MakeFrameName(const nsAString& aKind, nsAString& aResult) const; // Helper function to return the index in parent of the frame's content // object. Returns -1 on error or if the frame doesn't have a content object @@ -665,7 +665,7 @@ public: * Return the state bits that are relevant to regression tests (that * is, those bits which indicate a real difference when they differ */ - NS_IMETHOD_(nsFrameState) GetDebugStateBits() const MOZ_OVERRIDE; + virtual nsFrameState GetDebugStateBits() const MOZ_OVERRIDE; /** * Called to dump out regression data that describes the layout * of the frame and its children, and so on. The format of the @@ -674,7 +674,7 @@ public: * the caveat that some base types are defined. * For more information, see XXX. */ - NS_IMETHOD DumpRegressionData(nsPresContext* aPresContext, + virtual nsresult DumpRegressionData(nsPresContext* aPresContext, FILE* out, int32_t aIndent) MOZ_OVERRIDE; /** diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp index c3a1cd06654..21d252b064b 100644 --- a/layout/generic/nsFrameSetFrame.cpp +++ b/layout/generic/nsFrameSetFrame.cpp @@ -83,21 +83,21 @@ public: NS_DECL_FRAMEARENA_HELPERS #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const; + virtual nsresult GetFrameName(nsAString& aResult) const; #endif - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus); - NS_IMETHOD GetCursor(const nsPoint& aPoint, + virtual nsresult GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor); virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder, const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); @@ -137,7 +137,7 @@ public: NS_DECL_FRAMEARENA_HELPERS #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const + virtual nsresult GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("FramesetBlank"), aResult); } @@ -147,7 +147,7 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); @@ -392,7 +392,7 @@ nsHTMLFramesetFrame::Init(nsIContent* aContent, mNonBorderChildCount = mChildCount; } -NS_IMETHODIMP +nsresult nsHTMLFramesetFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -678,7 +678,7 @@ void nsHTMLFramesetFrame::GetSizeOfChild(nsIFrame* aChild, } -NS_METHOD nsHTMLFramesetFrame::HandleEvent(nsPresContext* aPresContext, +nsresult nsHTMLFramesetFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) { @@ -702,7 +702,7 @@ NS_METHOD nsHTMLFramesetFrame::HandleEvent(nsPresContext* aPresContext, return NS_OK; } -NS_IMETHODIMP +nsresult nsHTMLFramesetFrame::GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) { @@ -839,7 +839,7 @@ nscolor nsHTMLFramesetFrame::GetBorderColor(nsIContent* aContent) return GetBorderColor(); } -NS_IMETHODIMP +nsresult nsHTMLFramesetFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -1149,7 +1149,7 @@ nsHTMLFramesetFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsHTMLFramesetFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Frameset"), aResult); @@ -1436,7 +1436,7 @@ void nsHTMLFramesetBorderFrame::SetColor(nscolor aColor) } -NS_IMETHODIMP +nsresult nsHTMLFramesetBorderFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -1573,7 +1573,7 @@ void nsHTMLFramesetBorderFrame::PaintBorder(nsRenderingContext& aRenderingContex } -NS_IMETHODIMP +nsresult nsHTMLFramesetBorderFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) @@ -1597,7 +1597,7 @@ nsHTMLFramesetBorderFrame::HandleEvent(nsPresContext* aPresContext, return NS_OK; } -NS_IMETHODIMP +nsresult nsHTMLFramesetBorderFrame::GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) { @@ -1610,7 +1610,7 @@ nsHTMLFramesetBorderFrame::GetCursor(const nsPoint& aPoint, } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP nsHTMLFramesetBorderFrame::GetFrameName(nsAString& aResult) const +nsresult nsHTMLFramesetBorderFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("FramesetBorder"), aResult); } @@ -1643,7 +1643,7 @@ nscoord nsHTMLFramesetBlankFrame::GetIntrinsicHeight() return 0; } -NS_IMETHODIMP +nsresult nsHTMLFramesetBlankFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/generic/nsFrameSetFrame.h b/layout/generic/nsFrameSetFrame.h index b3593e6839a..a1ba0247c46 100644 --- a/layout/generic/nsFrameSetFrame.h +++ b/layout/generic/nsFrameSetFrame.h @@ -76,7 +76,7 @@ public: nsIFrame* aParent, nsIFrame* aPrevInFlow) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; static bool gDragInProgress; @@ -87,25 +87,25 @@ public: nsSize& aSize, nsIntPoint& aCellIndex); - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) MOZ_OVERRIDE; - NS_IMETHOD GetCursor(const nsPoint& aPoint, + virtual nsresult GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) MOZ_OVERRIDE; virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder, const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif virtual bool IsLeaf() const MOZ_OVERRIDE; diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 4f584c2e4c6..3a4a09a1cb1 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -114,7 +114,7 @@ nsHTMLScrollFrame::DestroyFrom(nsIFrame* aDestructRoot) nsContainerFrame::DestroyFrom(aDestructRoot); } -NS_IMETHODIMP +nsresult nsHTMLScrollFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -124,7 +124,7 @@ nsHTMLScrollFrame::SetInitialChildList(ChildListID aListID, } -NS_IMETHODIMP +nsresult nsHTMLScrollFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -134,7 +134,7 @@ nsHTMLScrollFrame::AppendFrames(ChildListID aListID, return NS_OK; } -NS_IMETHODIMP +nsresult nsHTMLScrollFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -147,7 +147,7 @@ nsHTMLScrollFrame::InsertFrames(ChildListID aListID, return NS_OK; } -NS_IMETHODIMP +nsresult nsHTMLScrollFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { @@ -700,7 +700,7 @@ nsHTMLScrollFrame::GetPrefWidth(nsRenderingContext *aRenderingContext) return NSCoordSaturatingAdd(result, GetIntrinsicVScrollbarWidth(aRenderingContext)); } -NS_IMETHODIMP +nsresult nsHTMLScrollFrame::GetPadding(nsMargin& aMargin) { // Our padding hangs out on the inside of the scrollframe, but XUL doesn't @@ -738,7 +738,7 @@ GetBrowserRoot(nsIContent* aContent) return nullptr; } -NS_IMETHODIMP +nsresult nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -867,7 +867,7 @@ nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext, //////////////////////////////////////////////////////////////////////////////// #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsHTMLScrollFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("HTMLScroll"), aResult); @@ -1034,7 +1034,7 @@ nsXULScrollFrame::DestroyFrom(nsIFrame* aDestructRoot) nsBoxFrame::DestroyFrom(aDestructRoot); } -NS_IMETHODIMP +nsresult nsXULScrollFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -1044,7 +1044,7 @@ nsXULScrollFrame::SetInitialChildList(ChildListID aListID, } -NS_IMETHODIMP +nsresult nsXULScrollFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -1053,7 +1053,7 @@ nsXULScrollFrame::AppendFrames(ChildListID aListID, return rv; } -NS_IMETHODIMP +nsresult nsXULScrollFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -1063,7 +1063,7 @@ nsXULScrollFrame::InsertFrames(ChildListID aListID, return rv; } -NS_IMETHODIMP +nsresult nsXULScrollFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { @@ -1078,7 +1078,7 @@ nsXULScrollFrame::GetSplittableType() const return NS_FRAME_NOT_SPLITTABLE; } -NS_IMETHODIMP +nsresult nsXULScrollFrame::GetPadding(nsMargin& aMargin) { aMargin.SizeTo(0,0,0,0); @@ -1191,7 +1191,7 @@ nsXULScrollFrame::GetMaxSize(nsBoxLayoutState& aState) } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsXULScrollFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("XULScroll"), aResult); diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h index cf84caa49e9..b96a25dd560 100644 --- a/layout/generic/nsGfxScrollFrame.h +++ b/layout/generic/nsGfxScrollFrame.h @@ -445,7 +445,7 @@ public: // Called to set the child frames. We typically have three: the scroll area, // the vertical scrollbar, and the horizontal scrollbar. - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder, @@ -476,10 +476,10 @@ public: virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; - NS_IMETHOD GetPadding(nsMargin& aPadding) MOZ_OVERRIDE; + virtual nsresult GetPadding(nsMargin& aPadding) MOZ_OVERRIDE; virtual bool IsCollapsed() MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -490,16 +490,16 @@ public: // Because there can be only one child frame, these two function return // NS_ERROR_FAILURE - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; virtual nsIScrollableFrame* GetScrollTargetFrame() MOZ_OVERRIDE { @@ -682,7 +682,7 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif #ifdef ACCESSIBILITY @@ -742,7 +742,7 @@ public: // Called to set the child frames. We typically have three: the scroll area, // the vertical scrollbar, and the horizontal scrollbar. - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder, @@ -762,15 +762,15 @@ public: // Because there can be only one child frame, these two function return // NS_ERROR_FAILURE - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; virtual nsIScrollableFrame* GetScrollTargetFrame() MOZ_OVERRIDE { @@ -802,7 +802,7 @@ public: virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE; NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE; - NS_IMETHOD GetPadding(nsMargin& aPadding) MOZ_OVERRIDE; + virtual nsresult GetPadding(nsMargin& aPadding) MOZ_OVERRIDE; virtual bool GetBorderRadii(nscoord aRadii[8]) const MOZ_OVERRIDE { return mHelper.GetBorderRadii(aRadii); @@ -994,7 +994,7 @@ public: } #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif protected: diff --git a/layout/generic/nsHTMLCanvasFrame.cpp b/layout/generic/nsHTMLCanvasFrame.cpp index 3731479df9b..ab0e3eb3f8b 100644 --- a/layout/generic/nsHTMLCanvasFrame.cpp +++ b/layout/generic/nsHTMLCanvasFrame.cpp @@ -170,7 +170,7 @@ nsHTMLCanvasFrame::ComputeSize(nsRenderingContext *aRenderingContext, aMargin, aBorder, aPadding); } -NS_IMETHODIMP +nsresult nsHTMLCanvasFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, @@ -336,7 +336,7 @@ nsHTMLCanvasFrame::AccessibleType() #endif #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsHTMLCanvasFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("HTMLCanvas"), aResult); diff --git a/layout/generic/nsHTMLCanvasFrame.h b/layout/generic/nsHTMLCanvasFrame.h index d2593f591e1..bcc90ffb48d 100644 --- a/layout/generic/nsHTMLCanvasFrame.h +++ b/layout/generic/nsHTMLCanvasFrame.h @@ -63,7 +63,7 @@ public: nsSize aMargin, nsSize aBorder, nsSize aPadding, uint32_t aFlags) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -82,7 +82,7 @@ public: } #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif // Inserted child content gets its frames parented by our child block diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 5d1ddb6d04b..e5a047be0db 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -483,7 +483,7 @@ public: * child list. * @see #Init() */ - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) = 0; /** @@ -501,7 +501,7 @@ public: * aFrameList in the process of moving the frames over to its own * child list. */ - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) = 0; /** @@ -520,7 +520,7 @@ public: * aFrameList in the process of moving the frames over to its own * child list. */ - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) = 0; @@ -539,7 +539,7 @@ public: * NS_ERROR_UNEXPECTED if the frame is an atomic frame, * NS_OK otherwise */ - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) = 0; /** @@ -572,7 +572,7 @@ public: * Get the offsets of the frame. most will be 0,0 * */ - NS_IMETHOD GetOffsets(int32_t &start, int32_t &end) const = 0; + virtual nsresult GetOffsets(int32_t &start, int32_t &end) const = 0; /** * Reset the offsets when splitting frames during Bidi reordering @@ -1206,11 +1206,11 @@ public: * @see WidgetGUIEvent * @see nsEventStatus */ - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) = 0; - NS_IMETHOD GetContentForEvent(mozilla::WidgetEvent* aEvent, + virtual nsresult GetContentForEvent(mozilla::WidgetEvent* aEvent, nsIContent** aContent) = 0; // This structure keeps track of the content node and offsets associated with @@ -1278,7 +1278,7 @@ public: /** * Get the cursor for a given frame. */ - NS_IMETHOD GetCursor(const nsPoint& aPoint, + virtual nsresult GetCursor(const nsPoint& aPoint, Cursor& aCursor) = 0; /** @@ -1286,7 +1286,7 @@ public: * the content. This point should be on the baseline of text with * the correct horizontal offset */ - NS_IMETHOD GetPointFromOffset(int32_t inOffset, + virtual nsresult GetPointFromOffset(int32_t inOffset, nsPoint* outPoint) = 0; /** @@ -1297,7 +1297,7 @@ public: * to stick to the end of the first found frame or the beginning of the * next in case the offset falls on a boundary. */ - NS_IMETHOD GetChildFrameContainingOffset(int32_t inContentOffset, + virtual nsresult GetChildFrameContainingOffset(int32_t inContentOffset, bool inHint,//false stick left int32_t* outFrameContentOffset, nsIFrame* *outChildFrame) = 0; @@ -1328,7 +1328,7 @@ public: * This call is invoked on the primary frame for a character data content * node, when it is changed in the content tree. */ - NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo) = 0; + virtual nsresult CharacterDataChanged(CharacterDataChangeInfo* aInfo) = 0; /** * This call is invoked when the value of a content objects's attribute @@ -1341,7 +1341,7 @@ public: * @param aModType Whether or not the attribute was added, changed, or removed. * The constants are defined in nsIDOMMutationEvent.h. */ - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) = 0; @@ -1698,7 +1698,7 @@ public: * XXX Is this really the semantics we want? Because we have the NS_FRAME_IN_REFLOW * bit we can ensure we don't call it more than once... */ - NS_IMETHOD WillReflow(nsPresContext* aPresContext) = 0; + virtual nsresult WillReflow(nsPresContext* aPresContext) = 0; /** * The frame is given an available size and asked for its desired @@ -1743,7 +1743,7 @@ public: * @param aStatus a return value indicating whether the frame is complete * and whether the next-in-flow is dirty and needs to be reflowed */ - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aReflowMetrics, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) = 0; @@ -1763,7 +1763,7 @@ public: * XXX Don't we want the semantics to dictate that we only call this once for * a given reflow? */ - NS_IMETHOD DidReflow(nsPresContext* aPresContext, + virtual nsresult DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus) = 0; @@ -2297,14 +2297,14 @@ public: * @param aSelectStyle out param. Returns the type of selection style found * (using values defined in nsStyleConsts.h). */ - NS_IMETHOD IsSelectable(bool* aIsSelectable, uint8_t* aSelectStyle) const = 0; + virtual nsresult IsSelectable(bool* aIsSelectable, uint8_t* aSelectStyle) const = 0; /** * Called to retrieve the SelectionController associated with the frame. * @param aSelCon will contain the selection controller associated with * the frame. */ - NS_IMETHOD GetSelectionController(nsPresContext *aPresContext, nsISelectionController **aSelCon) = 0; + virtual nsresult GetSelectionController(nsPresContext *aPresContext, nsISelectionController **aSelCon) = 0; /** * Call to get nsFrameSelection for this frame. @@ -2324,7 +2324,7 @@ public: * return NS_ERROR_FAILURE * @param aPOS is defined in nsFrameSelection */ - NS_IMETHOD PeekOffset(nsPeekOffsetStruct *aPos); + virtual nsresult PeekOffset(nsPeekOffsetStruct *aPos); /** * called to find the previous/next selectable leaf frame. @@ -2352,7 +2352,7 @@ public: * @param aFinished did this frame have the aEndIndex? or is there more work to do * @param _retval return value true or false. false = range is not rendered. */ - NS_IMETHOD CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *_retval)=0; + virtual nsresult CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *_retval)=0; /** * Called to tell a frame that one of its child frames is dirty (i.e., @@ -2605,10 +2605,10 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty())) } // Box methods. Note that these do NOT just get the CSS border, padding, // etc. They also talk to nsITheme. - NS_IMETHOD GetBorderAndPadding(nsMargin& aBorderAndPadding); - NS_IMETHOD GetBorder(nsMargin& aBorder)=0; - NS_IMETHOD GetPadding(nsMargin& aBorderAndPadding)=0; - NS_IMETHOD GetMargin(nsMargin& aMargin)=0; + virtual nsresult GetBorderAndPadding(nsMargin& aBorderAndPadding); + virtual nsresult GetBorder(nsMargin& aBorder)=0; + virtual nsresult GetPadding(nsMargin& aBorderAndPadding)=0; + virtual nsresult GetMargin(nsMargin& aMargin)=0; virtual void SetLayoutManager(nsBoxLayout* aLayout) { } virtual nsBoxLayout* GetLayoutManager() { return nullptr; } NS_HIDDEN_(nsresult) GetClientRect(nsRect& aContentRect); @@ -2621,15 +2621,15 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty())) bool IsNormalDirection() const { return (mState & NS_STATE_IS_DIRECTION_NORMAL) != 0; } NS_HIDDEN_(nsresult) Redraw(nsBoxLayoutState& aState); - NS_IMETHOD RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild)=0; + virtual nsresult RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIFrame* aChild)=0; // XXX take this out after we've branched virtual bool GetMouseThrough() const { return false; } #ifdef DEBUG_LAYOUT - NS_IMETHOD SetDebug(nsBoxLayoutState& aState, bool aDebug)=0; - NS_IMETHOD GetDebug(bool& aDebug)=0; + virtual nsresult SetDebug(nsBoxLayoutState& aState, bool aDebug)=0; + virtual nsresult GetDebug(bool& aDebug)=0; - NS_IMETHOD DumpBox(FILE* out)=0; + virtual nsresult DumpBox(FILE* out)=0; #endif /** @@ -3077,13 +3077,13 @@ public: virtual void DumpFrameTree(); void DumpFrameTreeLimited(); - NS_IMETHOD GetFrameName(nsAString& aResult) const = 0; + virtual nsresult GetFrameName(nsAString& aResult) const = 0; #endif #ifdef DEBUG public: - NS_IMETHOD_(nsFrameState) GetDebugStateBits() const = 0; - NS_IMETHOD DumpRegressionData(nsPresContext* aPresContext, + virtual nsFrameState GetDebugStateBits() const = 0; + virtual nsresult DumpRegressionData(nsPresContext* aPresContext, FILE* out, int32_t aIndent) = 0; #endif }; diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index 28dfe2d9bf1..ae6b5945401 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -797,7 +797,7 @@ nsImageFrame::GetIntrinsicRatio() return mIntrinsicRatio; } -NS_IMETHODIMP +nsresult nsImageFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, @@ -1589,7 +1589,7 @@ nsImageFrame::GetAnchorHREFTargetAndNode(nsIURI** aHref, nsString& aTarget, return status; } -NS_IMETHODIMP +nsresult nsImageFrame::GetContentForEvent(WidgetEvent* aEvent, nsIContent** aContent) { @@ -1630,7 +1630,7 @@ nsImageFrame::GetContentForEvent(WidgetEvent* aEvent, } // XXX what should clicks on transparent pixels do? -NS_IMETHODIMP +nsresult nsImageFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) @@ -1691,7 +1691,7 @@ nsImageFrame::HandleEvent(nsPresContext* aPresContext, return nsSplittableFrame::HandleEvent(aPresContext, aEvent, aEventStatus); } -NS_IMETHODIMP +nsresult nsImageFrame::GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) { @@ -1720,7 +1720,7 @@ nsImageFrame::GetCursor(const nsPoint& aPoint, return nsFrame::GetCursor(aPoint, aCursor); } -NS_IMETHODIMP +nsresult nsImageFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -1747,7 +1747,7 @@ nsImageFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsImageFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("ImageFrame"), aResult); diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h index c290838e8af..2182b65373c 100644 --- a/layout/generic/nsImageFrame.h +++ b/layout/generic/nsImageFrame.h @@ -81,19 +81,19 @@ public: virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext); virtual mozilla::IntrinsicSize GetIntrinsicSize(); virtual nsSize GetIntrinsicRatio(); - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD GetContentForEvent(mozilla::WidgetEvent* aEvent, + virtual nsresult GetContentForEvent(mozilla::WidgetEvent* aEvent, nsIContent** aContent); - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus); - NS_IMETHOD GetCursor(const nsPoint& aPoint, + virtual nsresult GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor); - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType); @@ -109,7 +109,7 @@ public: } #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const; + virtual nsresult GetFrameName(nsAString& aResult) const; void List(FILE* out = stderr, const char* aPrefix = "", uint32_t aFlags = 0) const; #endif diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index da2b24ba647..87faec3a58c 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -44,7 +44,7 @@ NS_QUERYFRAME_HEAD(nsInlineFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsInlineFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Inline"), aResult); @@ -289,7 +289,7 @@ ReparentChildListStyle(nsPresContext* aPresContext, } } -NS_IMETHODIMP +nsresult nsInlineFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, @@ -989,7 +989,7 @@ nsFirstLineFrame::Init(nsIContent* aContent, nsIFrame* aParent, } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsFirstLineFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Line"), aResult); @@ -1016,7 +1016,7 @@ nsFirstLineFrame::PullOneFrame(nsPresContext* aPresContext, InlineReflowState& i return frame; } -NS_IMETHODIMP +nsresult nsFirstLineFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h index 050579d0a6f..30796ec4e66 100644 --- a/layout/generic/nsInlineFrame.h +++ b/layout/generic/nsInlineFrame.h @@ -40,7 +40,7 @@ public: #endif #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif virtual nsIAtom* GetType() const MOZ_OVERRIDE; @@ -72,7 +72,7 @@ public: nsSize aMargin, nsSize aBorder, nsSize aPadding, uint32_t aFlags) MOZ_OVERRIDE; virtual nsRect ComputeTightBounds(gfxContext* aContext) const MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -190,10 +190,10 @@ public: friend nsIFrame* NS_NewFirstLineFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif virtual nsIAtom* GetType() const MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; diff --git a/layout/generic/nsLeafFrame.cpp b/layout/generic/nsLeafFrame.cpp index 711626e8d76..1a356d5aecb 100644 --- a/layout/generic/nsLeafFrame.cpp +++ b/layout/generic/nsLeafFrame.cpp @@ -42,7 +42,7 @@ nsLeafFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext, return nsSize(GetIntrinsicWidth(), GetIntrinsicHeight()); } -NS_IMETHODIMP +nsresult nsLeafFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, @@ -61,7 +61,7 @@ nsLeafFrame::Reflow(nsPresContext* aPresContext, return NS_OK; } -NS_IMETHODIMP +nsresult nsLeafFrame::DoReflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, diff --git a/layout/generic/nsLeafFrame.h b/layout/generic/nsLeafFrame.h index 720b248e018..0a4be293239 100644 --- a/layout/generic/nsLeafFrame.h +++ b/layout/generic/nsLeafFrame.h @@ -51,7 +51,7 @@ public: * borderpadding for the desired height. Ascent will be set to the height, * and descent will be set to 0. */ - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -59,7 +59,7 @@ public: /** * This method does most of the work that Reflow() above need done. */ - NS_IMETHOD DoReflow(nsPresContext* aPresContext, + virtual nsresult DoReflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp index 39e0750a36c..a8ad279caee 100644 --- a/layout/generic/nsLineLayout.cpp +++ b/layout/generic/nsLineLayout.cpp @@ -1133,39 +1133,34 @@ nsLineLayout::CanPlaceFrame(PerFrameData* pfd, NS_PRECONDITION(pfd && pfd->mFrame, "bad args, null pointers for frame data"); *aOptionalBreakAfterFits = true; - // Compute right margin to use - if (0 != pfd->mBounds.width) { - // XXXwaterson this is probably not exactly right; e.g., embeddings, etc. - bool ltr = (NS_STYLE_DIRECTION_LTR == aFrameDirection); - /* - * We want to only apply the end margin if we're the last continuation and - * either not in an {ib} split or the last inline in it. In all other - * cases we want to zero it out. That means zeroing it out if any of these - * conditions hold: - * 1) The frame is not complete (in this case it will get a next-in-flow) - * 2) The frame is complete but has a non-fluid continuation on its - * continuation chain. Note that if it has a fluid continuation, that - * continuation will get destroyed later, so we don't want to drop the - * end-margin in that case. - * 3) The frame is in an {ib} split and is not the last part. - * - * However, none of that applies if this is a letter frame (XXXbz why?) - */ - if ((NS_FRAME_IS_NOT_COMPLETE(aStatus) || - pfd->mFrame->LastInFlow()->GetNextContinuation() || - pfd->mFrame->FrameIsNonLastInIBSplit()) - && !pfd->GetFlag(PFD_ISLETTERFRAME)) { - if (ltr) - pfd->mMargin.right = 0; - else - pfd->mMargin.left = 0; + // XXXwaterson this is probably not exactly right; e.g., embeddings, etc. + bool ltr = NS_STYLE_DIRECTION_LTR == aFrameDirection; + + /* + * We want to only apply the end margin if we're the last continuation and + * either not in an {ib} split or the last inline in it. In all other + * cases we want to zero it out. That means zeroing it out if any of these + * conditions hold: + * 1) The frame is not complete (in this case it will get a next-in-flow) + * 2) The frame is complete but has a non-fluid continuation on its + * continuation chain. Note that if it has a fluid continuation, that + * continuation will get destroyed later, so we don't want to drop the + * end-margin in that case. + * 3) The frame is in an {ib} split and is not the last part. + * + * However, none of that applies if this is a letter frame (XXXbz why?) + */ + if ((NS_FRAME_IS_NOT_COMPLETE(aStatus) || + pfd->mFrame->LastInFlow()->GetNextContinuation() || + pfd->mFrame->FrameIsNonLastInIBSplit()) + && !pfd->GetFlag(PFD_ISLETTERFRAME)) { + if (ltr) { + pfd->mMargin.right = 0; + } else { + pfd->mMargin.left = 0; } } - else { - // Don't apply margin to empty frames. - pfd->mMargin.left = pfd->mMargin.right = 0; - } PerSpanData* psd = mCurrentSpan; if (psd->mNoWrap) { @@ -1173,7 +1168,6 @@ nsLineLayout::CanPlaceFrame(PerFrameData* pfd, return true; } - bool ltr = NS_STYLE_DIRECTION_LTR == aFrameDirection; nscoord endMargin = ltr ? pfd->mMargin.right : pfd->mMargin.left; #ifdef NOISY_CAN_PLACE_FRAME @@ -1290,15 +1284,6 @@ nsLineLayout::CanPlaceFrame(PerFrameData* pfd, void nsLineLayout::PlaceFrame(PerFrameData* pfd, nsHTMLReflowMetrics& aMetrics) { - // If frame is zero width then do not apply its left and right margins. - PerSpanData* psd = mCurrentSpan; - bool emptyFrame = false; - if ((0 == pfd->mBounds.width) && (0 == pfd->mBounds.height)) { - pfd->mBounds.x = psd->mX; - pfd->mBounds.y = mTopEdge; - emptyFrame = true; - } - // Record ascent and update max-ascent and max-descent values if (aMetrics.TopAscent() == nsHTMLReflowMetrics::ASK_FOR_BASELINE) pfd->mAscent = pfd->mFrame->GetBaseline(); @@ -1307,10 +1292,16 @@ nsLineLayout::PlaceFrame(PerFrameData* pfd, nsHTMLReflowMetrics& aMetrics) bool ltr = (NS_STYLE_DIRECTION_LTR == pfd->mFrame->StyleVisibility()->mDirection); // Advance to next X coordinate - psd->mX = pfd->mBounds.XMost() + (ltr ? pfd->mMargin.right : pfd->mMargin.left); + mCurrentSpan->mX = pfd->mBounds.XMost() + + (ltr ? pfd->mMargin.right : pfd->mMargin.left); - // Count the number of non-empty frames on the line... - if (!emptyFrame) { + // Count the number of non-placeholder frames on the line... + if (pfd->mFrame->GetType() == nsGkAtoms::placeholderFrame) { + NS_ASSERTION(pfd->mBounds.width == 0 && pfd->mBounds.height == 0, + "placeholders should have 0 width/height (checking " + "placeholders were never counted by the old code in " + "this function)"); + } else { mTotalPlacedFrames++; } } diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 0e8c2a66614..722a575692d 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -284,7 +284,7 @@ nsObjectFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsObjectFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("ObjectFrame"), aResult); @@ -497,7 +497,7 @@ nsObjectFrame::GetDesiredSize(nsPresContext* aPresContext, // call the superclass in all cases. } -NS_IMETHODIMP +nsresult nsObjectFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, @@ -801,7 +801,7 @@ nsIntPoint nsObjectFrame::GetWindowOriginInPixels(bool aWindowless) PresContext()->AppUnitsToDevPixels(origin.y)); } -NS_IMETHODIMP +nsresult nsObjectFrame::DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus) @@ -1840,7 +1840,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder, #endif } -NS_IMETHODIMP +nsresult nsObjectFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* anEvent, nsEventStatus* anEventStatus) @@ -1934,7 +1934,7 @@ nsObjectFrame::GetPluginInstance(nsNPAPIPluginInstance** aPluginInstance) return mInstanceOwner->GetInstance(aPluginInstance); } -NS_IMETHODIMP +nsresult nsObjectFrame::GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) { if (!mInstanceOwner) { diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h index ff5fb7b5282..fa6afd21a34 100644 --- a/layout/generic/nsObjectFrame.h +++ b/layout/generic/nsObjectFrame.h @@ -58,18 +58,18 @@ public: nsIFrame* aPrevInFlow) MOZ_OVERRIDE; virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext); virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext); - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus); - NS_IMETHOD DidReflow(nsPresContext* aPresContext, + virtual nsresult DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus); virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder, const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD HandleEvent(nsPresContext* aPresContext, + virtual nsresult HandleEvent(nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus); @@ -83,7 +83,7 @@ public: virtual bool NeedsView() { return true; } #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const; + virtual nsresult GetFrameName(nsAString& aResult) const; #endif virtual void DestroyFrom(nsIFrame* aDestructRoot); @@ -94,7 +94,7 @@ public: virtual void SetIsDocumentActive(bool aIsActive) MOZ_OVERRIDE; - NS_IMETHOD GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor); + virtual nsresult GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor); // APIs used by nsRootPresContext to set up the widget position/size/clip // region. diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp index 8467ea8bf38..acb15dfbc5a 100644 --- a/layout/generic/nsPageContentFrame.cpp +++ b/layout/generic/nsPageContentFrame.cpp @@ -17,7 +17,7 @@ NS_NewPageContentFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) NS_IMPL_FRAMEARENA_HELPERS(nsPageContentFrame) -NS_IMETHODIMP +nsresult nsPageContentFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -110,7 +110,7 @@ nsPageContentFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsPageContentFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("PageContent"), aResult); diff --git a/layout/generic/nsPageContentFrame.h b/layout/generic/nsPageContentFrame.h index cff4e9a9a93..6a71ca3c8f9 100644 --- a/layout/generic/nsPageContentFrame.h +++ b/layout/generic/nsPageContentFrame.h @@ -20,7 +20,7 @@ public: friend class nsPageFrame; // nsIFrame - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aMaxSize, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -44,7 +44,7 @@ public: #ifdef DEBUG_FRAME_DUMP // Debugging - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif protected: diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 0e711c5c822..95d34cdd726 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -45,7 +45,7 @@ nsPageFrame::~nsPageFrame() { } -NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext* aPresContext, +nsresult nsPageFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) @@ -169,7 +169,7 @@ nsPageFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsPageFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Page"), aResult); @@ -682,7 +682,7 @@ nsPageBreakFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsPageBreakFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("PageBreak"), aResult); diff --git a/layout/generic/nsPageFrame.h b/layout/generic/nsPageFrame.h index 6681f0a6544..4439809a064 100644 --- a/layout/generic/nsPageFrame.h +++ b/layout/generic/nsPageFrame.h @@ -19,7 +19,7 @@ public: friend nsIFrame* NS_NewPageFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aMaxSize, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -36,7 +36,7 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif ////////////////// @@ -103,7 +103,7 @@ class nsPageBreakFrame : public nsLeafFrame nsPageBreakFrame(nsStyleContext* aContext); ~nsPageBreakFrame(); - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -111,7 +111,7 @@ class nsPageBreakFrame : public nsLeafFrame virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif protected: diff --git a/layout/generic/nsPlaceholderFrame.cpp b/layout/generic/nsPlaceholderFrame.cpp index c47615c15fd..6722c24d6f8 100644 --- a/layout/generic/nsPlaceholderFrame.cpp +++ b/layout/generic/nsPlaceholderFrame.cpp @@ -98,7 +98,7 @@ nsPlaceholderFrame::AddInlinePrefWidth(nsRenderingContext* aRenderingContext, } } -NS_IMETHODIMP +nsresult nsPlaceholderFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -236,7 +236,7 @@ nsPlaceholderFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, #endif // DEBUG || (MOZ_REFLOW_PERF_DSP && MOZ_REFLOW_PERF) #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsPlaceholderFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Placeholder"), aResult); diff --git a/layout/generic/nsPlaceholderFrame.h b/layout/generic/nsPlaceholderFrame.h index 9b6fb14a465..ee97c5aaf86 100644 --- a/layout/generic/nsPlaceholderFrame.h +++ b/layout/generic/nsPlaceholderFrame.h @@ -96,7 +96,7 @@ public: virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE; virtual nsSize GetMaxSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -111,7 +111,7 @@ public: #ifdef DEBUG_FRAME_DUMP void List(FILE* out = stderr, const char* aPrefix = "", uint32_t aFlags = 0) const MOZ_OVERRIDE; - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif // DEBUG /** diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp index 4b3c1a6675f..23a86726dcd 100644 --- a/layout/generic/nsSimplePageSequence.cpp +++ b/layout/generic/nsSimplePageSequence.cpp @@ -117,7 +117,7 @@ nsSimplePageSequenceFrame::SetDesiredSize(nsHTMLReflowMetrics& aDesiredSize, nscoord(aHeight * PresContext()->GetPrintPreviewScale())); } -NS_IMETHODIMP +nsresult nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -303,7 +303,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext, //---------------------------------------------------------------------- #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsSimplePageSequenceFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("SimplePageSequence"), aResult); diff --git a/layout/generic/nsSimplePageSequence.h b/layout/generic/nsSimplePageSequence.h index 8105d1bcd57..c41f954e5a7 100644 --- a/layout/generic/nsSimplePageSequence.h +++ b/layout/generic/nsSimplePageSequence.h @@ -64,7 +64,7 @@ public: NS_DECL_FRAMEARENA_HELPERS // nsIFrame - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aMaxSize, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -109,7 +109,7 @@ public: virtual nsIAtom* GetType() const MOZ_OVERRIDE; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif protected: diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp index 7feba0f6661..58e1a2d674d 100644 --- a/layout/generic/nsSubDocumentFrame.cpp +++ b/layout/generic/nsSubDocumentFrame.cpp @@ -545,7 +545,7 @@ nsSubDocumentFrame::List(FILE* out, const char* aPrefix, uint32_t aFlags) const } } -NS_IMETHODIMP nsSubDocumentFrame::GetFrameName(nsAString& aResult) const +nsresult nsSubDocumentFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("FrameOuter"), aResult); } @@ -645,7 +645,7 @@ nsSubDocumentFrame::ComputeSize(nsRenderingContext *aRenderingContext, aMargin, aBorder, aPadding, aFlags); } -NS_IMETHODIMP +nsresult nsSubDocumentFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -733,7 +733,7 @@ nsSubDocumentFrame::ReflowCallbackCanceled() mPostedReflowCallback = false; } -NS_IMETHODIMP +nsresult nsSubDocumentFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/generic/nsSubDocumentFrame.h b/layout/generic/nsSubDocumentFrame.h index 1cc4aed648a..ac8b083e171 100644 --- a/layout/generic/nsSubDocumentFrame.h +++ b/layout/generic/nsSubDocumentFrame.h @@ -25,7 +25,7 @@ public: #ifdef DEBUG_FRAME_DUMP void List(FILE* out = stderr, const char* aPrefix = "", uint32_t aFlags = 0) const MOZ_OVERRIDE; - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif NS_DECL_QUERYFRAME @@ -61,7 +61,7 @@ public: nsSize aMargin, nsSize aBorder, nsSize aPadding, uint32_t aFlags) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -70,7 +70,7 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp index 4f8ef853d22..c778e2eb785 100644 --- a/layout/generic/nsTextFrame.cpp +++ b/layout/generic/nsTextFrame.cpp @@ -4192,7 +4192,7 @@ nsTextFrame::~nsTextFrame() { } -NS_IMETHODIMP +nsresult nsTextFrame::GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) { @@ -4364,7 +4364,7 @@ nsTextFrame::ClearTextRun(nsTextFrame* aStartContinuation, } } -NS_IMETHODIMP +nsresult nsTextFrame::CharacterDataChanged(CharacterDataChangeInfo* aInfo) { mContent->DeleteProperty(nsGkAtoms::newline); @@ -6354,7 +6354,7 @@ nsTextFrame::SetSelectedRange(uint32_t aStart, uint32_t aEnd, bool aSelected, } } -NS_IMETHODIMP +nsresult nsTextFrame::GetPointFromOffset(int32_t inOffset, nsPoint* outPoint) { @@ -6418,7 +6418,7 @@ nsTextFrame::GetPointFromOffset(int32_t inOffset, return NS_OK; } -NS_IMETHODIMP +nsresult nsTextFrame::GetChildFrameContainingOffset(int32_t aContentOffset, bool aHint, int32_t* aOutOffset, @@ -6799,7 +6799,7 @@ nsTextFrame::PeekOffsetWord(bool aForward, bool aWordSelectEatSpace, bool aIsKey // TODO this needs to be deCOMtaminated with the interface fixed in // nsIFrame.h, but we won't do that until the old textframe is gone. -NS_IMETHODIMP +nsresult nsTextFrame::CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *aRetval) { @@ -6822,7 +6822,7 @@ nsTextFrame::CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, return NS_OK; } -NS_IMETHODIMP +nsresult nsTextFrame::GetOffsets(int32_t &start, int32_t &end) const { start = GetContentOffset(); @@ -7574,7 +7574,7 @@ struct NewlineProperty { } }; -NS_IMETHODIMP +nsresult nsTextFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, @@ -8450,7 +8450,7 @@ nsTextFrame::ToCString(nsCString& aBuf, int32_t* aTotalContentLength) const } } -NS_IMETHODIMP +nsresult nsTextFrame::GetFrameName(nsAString& aResult) const { MakeFrameName(NS_LITERAL_STRING("Text"), aResult); @@ -8483,7 +8483,7 @@ nsTextFrame::List(FILE* out, const char* aPrefix, uint32_t aFlags) const #endif #ifdef DEBUG -NS_IMETHODIMP_(nsFrameState) +nsFrameState nsTextFrame::GetDebugStateBits() const { // mask out our emptystate flags; those are just caches diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h index 3fb02379009..9417571dcb2 100644 --- a/layout/generic/nsTextFrame.h +++ b/layout/generic/nsTextFrame.h @@ -57,10 +57,10 @@ public: virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; - NS_IMETHOD GetCursor(const nsPoint& aPoint, + virtual nsresult GetCursor(const nsPoint& aPoint, nsIFrame::Cursor& aCursor) MOZ_OVERRIDE; - NS_IMETHOD CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE; + virtual nsresult CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE; virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE; @@ -117,12 +117,12 @@ public: #ifdef DEBUG_FRAME_DUMP void List(FILE* out = stderr, const char* aPrefix = "", uint32_t aFlags = 0) const MOZ_OVERRIDE; - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; void ToCString(nsCString& aBuf, int32_t* aTotalContentLength) const; #endif #ifdef DEBUG - NS_IMETHOD_(nsFrameState) GetDebugStateBits() const MOZ_OVERRIDE; + virtual nsFrameState GetDebugStateBits() const MOZ_OVERRIDE; #endif virtual ContentOffsets CalcContentOffsetsFromFramePoint(nsPoint aPoint) MOZ_OVERRIDE; @@ -146,7 +146,7 @@ public: virtual bool PeekOffsetWord(bool aForward, bool aWordSelectEatSpace, bool aIsKeyboardSelect, int32_t* aOffset, PeekWordState* aState) MOZ_OVERRIDE; - NS_IMETHOD CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *_retval) MOZ_OVERRIDE; + virtual nsresult CheckVisibility(nsPresContext* aContext, int32_t aStartIndex, int32_t aEndIndex, bool aRecurse, bool *aFinished, bool *_retval) MOZ_OVERRIDE; // Flags for aSetLengthFlags enum { ALLOW_FRAME_CREATION_AND_DESTRUCTION = 0x01 }; @@ -155,14 +155,14 @@ public: void SetLength(int32_t aLength, nsLineLayout* aLineLayout, uint32_t aSetLengthFlags = 0); - NS_IMETHOD GetOffsets(int32_t &start, int32_t &end)const MOZ_OVERRIDE; + virtual nsresult GetOffsets(int32_t &start, int32_t &end)const MOZ_OVERRIDE; virtual void AdjustOffsetsForBidi(int32_t start, int32_t end) MOZ_OVERRIDE; - NS_IMETHOD GetPointFromOffset(int32_t inOffset, + virtual nsresult GetPointFromOffset(int32_t inOffset, nsPoint* outPoint) MOZ_OVERRIDE; - NS_IMETHOD GetChildFrameContainingOffset(int32_t inContentOffset, + virtual nsresult GetChildFrameContainingOffset(int32_t inContentOffset, bool inHint, int32_t* outFrameContentOffset, nsIFrame* *outChildFrame) MOZ_OVERRIDE; @@ -215,7 +215,7 @@ public: virtual nsresult GetPrefWidthTightBounds(nsRenderingContext* aContext, nscoord* aX, nscoord* aXMost) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp index 1a7565e7de1..ce1dac7e82d 100644 --- a/layout/generic/nsVideoFrame.cpp +++ b/layout/generic/nsVideoFrame.cpp @@ -239,7 +239,7 @@ public: nsCOMPtr mContent; }; -NS_IMETHODIMP +nsresult nsVideoFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aMetrics, const nsHTMLReflowState& aReflowState, @@ -469,7 +469,7 @@ nsVideoFrame::AccessibleType() #endif #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult nsVideoFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("HTMLVideo"), aResult); @@ -604,7 +604,7 @@ nsVideoFrame::UpdatePosterSource(bool aNotify) } } -NS_IMETHODIMP +nsresult nsVideoFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/generic/nsVideoFrame.h b/layout/generic/nsVideoFrame.h index ccac5c2b310..9a276569e7d 100644 --- a/layout/generic/nsVideoFrame.h +++ b/layout/generic/nsVideoFrame.h @@ -45,7 +45,7 @@ public: const nsRect& aDirtyRect, const nsDisplayListSet& aLists) MOZ_OVERRIDE; - NS_IMETHOD AttributeChanged(int32_t aNameSpaceID, + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; @@ -61,7 +61,7 @@ public: virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE; virtual bool IsLeaf() const MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -90,7 +90,7 @@ public: nsIContent *GetCaptionOverlay() { return mCaptionDiv; } #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif already_AddRefed BuildLayer(nsDisplayListBuilder* aBuilder, diff --git a/layout/generic/nsViewportFrame.cpp b/layout/generic/nsViewportFrame.cpp index 913100afa3b..92deda41b63 100644 --- a/layout/generic/nsViewportFrame.cpp +++ b/layout/generic/nsViewportFrame.cpp @@ -43,7 +43,7 @@ ViewportFrame::Init(nsIContent* aContent, } } -NS_IMETHODIMP +nsresult ViewportFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -70,7 +70,7 @@ ViewportFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, BuildDisplayListForChild(aBuilder, kid, aDirtyRect, aLists); } -NS_IMETHODIMP +nsresult ViewportFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -81,7 +81,7 @@ ViewportFrame::AppendFrames(ChildListID aListID, return nsContainerFrame::AppendFrames(aListID, aFrameList); } -NS_IMETHODIMP +nsresult ViewportFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -93,7 +93,7 @@ ViewportFrame::InsertFrames(ChildListID aListID, return nsContainerFrame::InsertFrames(aListID, aPrevFrame, aFrameList); } -NS_IMETHODIMP +nsresult ViewportFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { @@ -173,7 +173,7 @@ ViewportFrame::AdjustReflowStateAsContainingBlock(nsHTMLReflowState* aReflowStat return rect; } -NS_IMETHODIMP +nsresult ViewportFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -299,7 +299,7 @@ ViewportFrame::GetType() const } #ifdef DEBUG_FRAME_DUMP -NS_IMETHODIMP +nsresult ViewportFrame::GetFrameName(nsAString& aResult) const { return MakeFrameName(NS_LITERAL_STRING("Viewport"), aResult); diff --git a/layout/generic/nsViewportFrame.h b/layout/generic/nsViewportFrame.h index e2ac58e905d..79880f84f6e 100644 --- a/layout/generic/nsViewportFrame.h +++ b/layout/generic/nsViewportFrame.h @@ -38,17 +38,17 @@ public: nsIFrame* aParent, nsIFrame* asPrevInFlow) MOZ_OVERRIDE; - NS_IMETHOD SetInitialChildList(ChildListID aListID, + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD AppendFrames(ChildListID aListID, + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD InsertFrames(ChildListID aListID, + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD RemoveFrame(ChildListID aListID, + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder, @@ -57,7 +57,7 @@ public: virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE; - NS_IMETHOD Reflow(nsPresContext* aPresContext, + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; @@ -78,7 +78,7 @@ public: nsRect AdjustReflowStateAsContainingBlock(nsHTMLReflowState* aReflowState) const; #ifdef DEBUG_FRAME_DUMP - NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; + virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE; #endif private: diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp index a89b4ba7945..ceac7382e72 100644 --- a/layout/mathml/nsMathMLContainerFrame.cpp +++ b/layout/mathml/nsMathMLContainerFrame.cpp @@ -735,7 +735,7 @@ nsMathMLContainerFrame::ChildListChanged(int32_t aModType) return ReLayoutChildren(frame); } -NS_IMETHODIMP +nsresult nsMathMLContainerFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { @@ -746,7 +746,7 @@ nsMathMLContainerFrame::AppendFrames(ChildListID aListID, return ChildListChanged(nsIDOMMutationEvent::ADDITION); } -NS_IMETHODIMP +nsresult nsMathMLContainerFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) @@ -759,7 +759,7 @@ nsMathMLContainerFrame::InsertFrames(ChildListID aListID, return ChildListChanged(nsIDOMMutationEvent::ADDITION); } -NS_IMETHODIMP +nsresult nsMathMLContainerFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { @@ -771,7 +771,7 @@ nsMathMLContainerFrame::RemoveFrame(ChildListID aListID, return ChildListChanged(nsIDOMMutationEvent::REMOVAL); } -NS_IMETHODIMP +nsresult nsMathMLContainerFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -881,7 +881,7 @@ nsMathMLContainerFrame::ReflowChild(nsIFrame* aChildFrame, return rv; } -NS_IMETHODIMP +nsresult nsMathMLContainerFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLContainerFrame.h b/layout/mathml/nsMathMLContainerFrame.h index d4faa70e74d..1f9eabf4cf0 100644 --- a/layout/mathml/nsMathMLContainerFrame.h +++ b/layout/mathml/nsMathMLContainerFrame.h @@ -79,16 +79,16 @@ public: ~(nsIFrame::eMathML | nsIFrame::eExcludesIgnorableWhitespace)); } - NS_IMETHOD + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; @@ -106,20 +106,20 @@ public: GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize); - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult WillReflow(nsPresContext* aPresContext) MOZ_OVERRIDE { mPresentationData.flags &= ~NS_MATHML_ERROR; return nsContainerFrame::WillReflow(aPresContext); } - NS_IMETHOD + virtual nsresult DidReflow(nsPresContext* aPresContext, const nsHTMLReflowState* aReflowState, nsDidReflowStatus aStatus) MOZ_OVERRIDE @@ -152,7 +152,7 @@ public: // to re-layout its children using ReLayoutChildren(mParent); // Therefore, there is an overhead here in that our siblings are re-laid // too (e.g., this happens with , , ). - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; @@ -415,7 +415,7 @@ public: // beware, mFrames is not set by nsBlockFrame // cannot use mFrames{.FirstChild()|.etc} since the block code doesn't set mFrames - NS_IMETHOD + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE { @@ -426,7 +426,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE { @@ -438,7 +438,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE @@ -451,7 +451,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE { @@ -485,7 +485,7 @@ public: friend nsIFrame* NS_NewMathMLmathInlineFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); - NS_IMETHOD + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE { @@ -496,7 +496,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE { @@ -508,7 +508,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE @@ -521,7 +521,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE { diff --git a/layout/mathml/nsMathMLSelectedFrame.cpp b/layout/mathml/nsMathMLSelectedFrame.cpp index 46b4cc0cbaf..c39acf0efc6 100644 --- a/layout/mathml/nsMathMLSelectedFrame.cpp +++ b/layout/mathml/nsMathMLSelectedFrame.cpp @@ -56,7 +56,7 @@ nsMathMLSelectedFrame::ChildListChanged(int32_t aModType) return nsMathMLContainerFrame::ChildListChanged(aModType); } -NS_IMETHODIMP +nsresult nsMathMLSelectedFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -99,7 +99,7 @@ nsMathMLSelectedFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, } // Only reflow the selected child ... -NS_IMETHODIMP +nsresult nsMathMLSelectedFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLSelectedFrame.h b/layout/mathml/nsMathMLSelectedFrame.h index 2dce478550b..f715e75664e 100644 --- a/layout/mathml/nsMathMLSelectedFrame.h +++ b/layout/mathml/nsMathMLSelectedFrame.h @@ -18,7 +18,7 @@ public: NS_IMETHOD TransmitAutomaticData() MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; @@ -34,7 +34,7 @@ public: bool aPlaceOrigin, nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp index 4c39dad1ce8..e66319ea917 100644 --- a/layout/mathml/nsMathMLTokenFrame.cpp +++ b/layout/mathml/nsMathMLTokenFrame.cpp @@ -88,7 +88,7 @@ nsMathMLTokenFrame::MarkTextFramesAsTokenMathML() } } -NS_IMETHODIMP +nsresult nsMathMLTokenFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -102,7 +102,7 @@ nsMathMLTokenFrame::SetInitialChildList(ChildListID aListID, return rv; } -NS_IMETHODIMP +nsresult nsMathMLTokenFrame::AppendFrames(ChildListID aListID, nsFrameList& aChildList) { @@ -115,7 +115,7 @@ nsMathMLTokenFrame::AppendFrames(ChildListID aListID, return rv; } -NS_IMETHODIMP +nsresult nsMathMLTokenFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aChildList) diff --git a/layout/mathml/nsMathMLTokenFrame.h b/layout/mathml/nsMathMLTokenFrame.h index 4a7a89d3f39..4a2eaa8a7b2 100644 --- a/layout/mathml/nsMathMLTokenFrame.h +++ b/layout/mathml/nsMathMLTokenFrame.h @@ -34,20 +34,20 @@ public: virtual eMathMLFrameType GetMathMLFrameType() MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmactionFrame.cpp b/layout/mathml/nsMathMLmactionFrame.cpp index e7302fac5d3..c7bd0965302 100644 --- a/layout/mathml/nsMathMLmactionFrame.cpp +++ b/layout/mathml/nsMathMLmactionFrame.cpp @@ -172,7 +172,7 @@ nsMathMLmactionFrame::GetSelectedFrame() return mSelectedFrame; } -NS_IMETHODIMP +nsresult nsMathMLmactionFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -195,7 +195,7 @@ nsMathMLmactionFrame::SetInitialChildList(ChildListID aListID, return rv; } -NS_IMETHODIMP +nsresult nsMathMLmactionFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/mathml/nsMathMLmactionFrame.h b/layout/mathml/nsMathMLmactionFrame.h index 12d2863de01..fe11e8c1b69 100644 --- a/layout/mathml/nsMathMLmactionFrame.h +++ b/layout/mathml/nsMathMLmactionFrame.h @@ -26,14 +26,14 @@ public: nsIFrame* aParent, nsIFrame* aPrevInFlow) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; virtual nsresult ChildListChanged(int32_t aModType) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp index 5d737d11403..38775342386 100644 --- a/layout/mathml/nsMathMLmencloseFrame.cpp +++ b/layout/mathml/nsMathMLmencloseFrame.cpp @@ -672,7 +672,7 @@ nsMathMLmencloseFrame::FixInterFrameSpacing(nsHTMLReflowMetrics& aDesiredSize) return gap; } -NS_IMETHODIMP +nsresult nsMathMLmencloseFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/mathml/nsMathMLmencloseFrame.h b/layout/mathml/nsMathMLmencloseFrame.h index 6e4f8556494..2e2935761bd 100644 --- a/layout/mathml/nsMathMLmencloseFrame.h +++ b/layout/mathml/nsMathMLmencloseFrame.h @@ -57,7 +57,7 @@ public: MeasureForWidth(nsRenderingContext& aRenderingContext, nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp index 8c64f4ca259..a1399593f1c 100644 --- a/layout/mathml/nsMathMLmfencedFrame.cpp +++ b/layout/mathml/nsMathMLmfencedFrame.cpp @@ -40,7 +40,7 @@ nsMathMLmfencedFrame::InheritAutomaticData(nsIFrame* aParent) return NS_OK; } -NS_IMETHODIMP +nsresult nsMathMLmfencedFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -59,7 +59,7 @@ nsMathMLmfencedFrame::SetInitialChildList(ChildListID aListID, return NS_OK; } -NS_IMETHODIMP +nsresult nsMathMLmfencedFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -189,7 +189,7 @@ nsMathMLmfencedFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, } } -NS_IMETHODIMP +nsresult nsMathMLmfencedFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmfencedFrame.h b/layout/mathml/nsMathMLmfencedFrame.h index 01f6c67703a..3c1a4736265 100644 --- a/layout/mathml/nsMathMLmfencedFrame.h +++ b/layout/mathml/nsMathMLmfencedFrame.h @@ -28,11 +28,11 @@ public: NS_IMETHOD InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -46,7 +46,7 @@ public: GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp index bf64b6b4b30..99da363d944 100644 --- a/layout/mathml/nsMathMLmoFrame.cpp +++ b/layout/mathml/nsMathMLmoFrame.cpp @@ -924,7 +924,7 @@ nsMathMLmoFrame::TransmitAutomaticData() return NS_OK; } -NS_IMETHODIMP +nsresult nsMathMLmoFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -937,7 +937,7 @@ nsMathMLmoFrame::SetInitialChildList(ChildListID aListID, return rv; } -NS_IMETHODIMP +nsresult nsMathMLmoFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -1025,7 +1025,7 @@ nsMathMLmoFrame::GetIntrinsicWidthMetrics(nsRenderingContext *aRenderingContext, } } -NS_IMETHODIMP +nsresult nsMathMLmoFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/mathml/nsMathMLmoFrame.h b/layout/mathml/nsMathMLmoFrame.h index 99ebbdb280a..fff6917edc3 100644 --- a/layout/mathml/nsMathMLmoFrame.h +++ b/layout/mathml/nsMathMLmoFrame.h @@ -38,11 +38,11 @@ public: NS_IMETHOD TransmitAutomaticData() MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -54,7 +54,7 @@ public: GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/mathml/nsMathMLmpaddedFrame.cpp b/layout/mathml/nsMathMLmpaddedFrame.cpp index 854abd29417..68f2dac7651 100644 --- a/layout/mathml/nsMathMLmpaddedFrame.cpp +++ b/layout/mathml/nsMathMLmpaddedFrame.cpp @@ -300,7 +300,7 @@ nsMathMLmpaddedFrame::UpdateValue(int32_t aSign, } } -NS_IMETHODIMP +nsresult nsMathMLmpaddedFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmpaddedFrame.h b/layout/mathml/nsMathMLmpaddedFrame.h index a4dfabfe764..a49cceaf1e9 100644 --- a/layout/mathml/nsMathMLmpaddedFrame.h +++ b/layout/mathml/nsMathMLmpaddedFrame.h @@ -27,7 +27,7 @@ public: return TransmitAutomaticDataForMrowLikeElement(); } - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp index 28ead8fc5f2..dde24810c7b 100644 --- a/layout/mathml/nsMathMLmrootFrame.cpp +++ b/layout/mathml/nsMathMLmrootFrame.cpp @@ -145,7 +145,7 @@ GetRadicalXOffsets(nscoord aIndexWidth, nscoord aSqrWidth, *aSqrOffset = dxSqr; } -NS_IMETHODIMP +nsresult nsMathMLmrootFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmrootFrame.h b/layout/mathml/nsMathMLmrootFrame.h index e2b33bfdb9c..1b83da26cde 100644 --- a/layout/mathml/nsMathMLmrootFrame.h +++ b/layout/mathml/nsMathMLmrootFrame.h @@ -34,7 +34,7 @@ public: NS_IMETHOD TransmitAutomaticData() MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmrowFrame.cpp b/layout/mathml/nsMathMLmrowFrame.cpp index 62210bf5ad8..11ecb92ff18 100644 --- a/layout/mathml/nsMathMLmrowFrame.cpp +++ b/layout/mathml/nsMathMLmrowFrame.cpp @@ -33,7 +33,7 @@ nsMathMLmrowFrame::InheritAutomaticData(nsIFrame* aParent) return NS_OK; } -NS_IMETHODIMP +nsresult nsMathMLmrowFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/mathml/nsMathMLmrowFrame.h b/layout/mathml/nsMathMLmrowFrame.h index 9d37f0f0588..46ae8bf27db 100644 --- a/layout/mathml/nsMathMLmrowFrame.h +++ b/layout/mathml/nsMathMLmrowFrame.h @@ -19,7 +19,7 @@ public: friend nsIFrame* NS_NewMathMLmrowFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/mathml/nsMathMLmspaceFrame.cpp b/layout/mathml/nsMathMLmspaceFrame.cpp index ba4c6f7c38d..9254e6ff8f1 100644 --- a/layout/mathml/nsMathMLmspaceFrame.cpp +++ b/layout/mathml/nsMathMLmspaceFrame.cpp @@ -91,7 +91,7 @@ nsMathMLmspaceFrame::ProcessAttributes(nsPresContext* aPresContext) } } -NS_IMETHODIMP +nsresult nsMathMLmspaceFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmspaceFrame.h b/layout/mathml/nsMathMLmspaceFrame.h index 67c850c497d..85af13e97c9 100644 --- a/layout/mathml/nsMathMLmspaceFrame.h +++ b/layout/mathml/nsMathMLmspaceFrame.h @@ -29,7 +29,7 @@ public: virtual bool IsLeaf() const MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmsqrtFrame.cpp b/layout/mathml/nsMathMLmsqrtFrame.cpp index b3101936bc3..a91eb288550 100644 --- a/layout/mathml/nsMathMLmsqrtFrame.cpp +++ b/layout/mathml/nsMathMLmsqrtFrame.cpp @@ -56,7 +56,7 @@ nsMathMLmsqrtFrame::InheritAutomaticData(nsIFrame* aParent) return NS_OK; } -NS_IMETHODIMP +nsresult nsMathMLmsqrtFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/mathml/nsMathMLmsqrtFrame.h b/layout/mathml/nsMathMLmsqrtFrame.h index 3f4fe1db9fe..447815e442b 100644 --- a/layout/mathml/nsMathMLmsqrtFrame.h +++ b/layout/mathml/nsMathMLmsqrtFrame.h @@ -47,7 +47,7 @@ public: NS_IMETHOD InheritAutomaticData(nsIFrame* aParent) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp index 178542392ef..5d6a91e59ac 100644 --- a/layout/mathml/nsMathMLmtableFrame.cpp +++ b/layout/mathml/nsMathMLmtableFrame.cpp @@ -420,7 +420,7 @@ nsMathMLmtableOuterFrame::~nsMathMLmtableOuterFrame() { } -NS_IMETHODIMP +nsresult nsMathMLmtableOuterFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -531,7 +531,7 @@ nsMathMLmtableOuterFrame::GetRowFrameAt(nsPresContext* aPresContext, return nullptr; } -NS_IMETHODIMP +nsresult nsMathMLmtableOuterFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, @@ -649,7 +649,7 @@ nsMathMLmtableFrame::~nsMathMLmtableFrame() { } -NS_IMETHODIMP +nsresult nsMathMLmtableFrame::SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) { @@ -686,7 +686,7 @@ nsMathMLmtrFrame::~nsMathMLmtrFrame() { } -NS_IMETHODIMP +nsresult nsMathMLmtrFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -771,7 +771,7 @@ nsMathMLmtdFrame::GetColSpan() return colspan; } -NS_IMETHODIMP +nsresult nsMathMLmtdFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) @@ -864,7 +864,7 @@ nsMathMLmtdInnerFrame::~nsMathMLmtdInnerFrame() mUniqueStyleText->Destroy(PresContext()); } -NS_IMETHODIMP +nsresult nsMathMLmtdInnerFrame::Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmtableFrame.h b/layout/mathml/nsMathMLmtableFrame.h index 6d10f6d3daf..0fdcbb45758 100644 --- a/layout/mathml/nsMathMLmtableFrame.h +++ b/layout/mathml/nsMathMLmtableFrame.h @@ -28,13 +28,13 @@ public: // overloaded nsTableOuterFrame methods - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; @@ -67,11 +67,11 @@ public: // Overloaded nsTableFrame methods - NS_IMETHOD + virtual nsresult SetInitialChildList(ChildListID aListID, nsFrameList& aChildList) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE { @@ -80,7 +80,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE @@ -90,7 +90,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE { @@ -125,12 +125,12 @@ public: // overloaded nsTableRowFrame methods - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE { @@ -139,7 +139,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE @@ -149,7 +149,7 @@ public: return rv; } - NS_IMETHOD + virtual nsresult RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE { @@ -189,7 +189,7 @@ public: // overloaded nsTableCellFrame methods - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; @@ -234,7 +234,7 @@ public: return NS_OK; } - NS_IMETHOD + virtual nsresult Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp index 712a9592981..17031450599 100644 --- a/layout/mathml/nsMathMLmunderoverFrame.cpp +++ b/layout/mathml/nsMathMLmunderoverFrame.cpp @@ -27,7 +27,7 @@ nsMathMLmunderoverFrame::~nsMathMLmunderoverFrame() { } -NS_IMETHODIMP +nsresult nsMathMLmunderoverFrame::AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) diff --git a/layout/mathml/nsMathMLmunderoverFrame.h b/layout/mathml/nsMathMLmunderoverFrame.h index 521837d2b27..9ec6ac76dbf 100644 --- a/layout/mathml/nsMathMLmunderoverFrame.h +++ b/layout/mathml/nsMathMLmunderoverFrame.h @@ -34,7 +34,7 @@ public: UpdatePresentationData(uint32_t aFlagsValues, uint32_t aFlagsToUpdate) MOZ_OVERRIDE; - NS_IMETHOD + virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType) MOZ_OVERRIDE; diff --git a/layout/reftests/bugs/538935-1-ref.html b/layout/reftests/bugs/538935-1-ref.html index b301c436852..98d150ac02c 100644 --- a/layout/reftests/bugs/538935-1-ref.html +++ b/layout/reftests/bugs/538935-1-ref.html @@ -5,12 +5,12 @@
Hello
Hello
Hello
-
Hello
+
Hello
Hello
Hello
Hello
Hello
-
Hello
+
Hello
diff --git a/layout/reftests/inline/inline-block-margin.html b/layout/reftests/inline/inline-block-margin.html new file mode 100644 index 00000000000..476f13df7ce --- /dev/null +++ b/layout/reftests/inline/inline-block-margin.html @@ -0,0 +1,6 @@ + +margin-left on zero-sized inline-block + +hello world diff --git a/layout/reftests/inline/inline-block-padding.html b/layout/reftests/inline/inline-block-padding.html new file mode 100644 index 00000000000..476f13df7ce --- /dev/null +++ b/layout/reftests/inline/inline-block-padding.html @@ -0,0 +1,6 @@ + +margin-left on zero-sized inline-block + +hello world diff --git a/layout/reftests/inline/inline-block-width.html b/layout/reftests/inline/inline-block-width.html new file mode 100644 index 00000000000..e0ebb9b0810 --- /dev/null +++ b/layout/reftests/inline/inline-block-width.html @@ -0,0 +1,6 @@ + +margin-left on zero-sized inline-block + +hello world diff --git a/layout/reftests/inline/inline-block-zero.html b/layout/reftests/inline/inline-block-zero.html new file mode 100644 index 00000000000..ec0166be494 --- /dev/null +++ b/layout/reftests/inline/inline-block-zero.html @@ -0,0 +1,3 @@ + +margin-left on zero-sized inline-block +hello world diff --git a/layout/reftests/inline/reftest.list b/layout/reftests/inline/reftest.list new file mode 100644 index 00000000000..2ae90d62041 --- /dev/null +++ b/layout/reftests/inline/reftest.list @@ -0,0 +1,7 @@ +== zero-inline-block-margin-left.html zero-inline-block-margin-ref.html +== zero-inline-block-margin-right.html zero-inline-block-margin-ref.html +== zero-inline-block-margin-ref.html zero-inline-block-margin-ref2.html +== inline-block-width.html zero-inline-block-margin-ref.html +== inline-block-padding.html inline-block-width.html +== inline-block-margin.html inline-block-width.html +!= inline-block-width.html inline-block-zero.html diff --git a/layout/reftests/inline/zero-inline-block-margin-left.html b/layout/reftests/inline/zero-inline-block-margin-left.html new file mode 100644 index 00000000000..ac13d0b3970 --- /dev/null +++ b/layout/reftests/inline/zero-inline-block-margin-left.html @@ -0,0 +1,6 @@ + +margin-left on zero-sized inline-block + +hello world diff --git a/layout/reftests/inline/zero-inline-block-margin-ref.html b/layout/reftests/inline/zero-inline-block-margin-ref.html new file mode 100644 index 00000000000..ac4edb346d9 --- /dev/null +++ b/layout/reftests/inline/zero-inline-block-margin-ref.html @@ -0,0 +1,6 @@ + +margin-left on zero-sized inline-block + +hello world diff --git a/layout/reftests/inline/zero-inline-block-margin-ref2.html b/layout/reftests/inline/zero-inline-block-margin-ref2.html new file mode 100644 index 00000000000..24b69ba9d6b --- /dev/null +++ b/layout/reftests/inline/zero-inline-block-margin-ref2.html @@ -0,0 +1,6 @@ + +margin-left on zero-sized inline-block + +hello world diff --git a/layout/reftests/inline/zero-inline-block-margin-right.html b/layout/reftests/inline/zero-inline-block-margin-right.html new file mode 100644 index 00000000000..542649a4a6a --- /dev/null +++ b/layout/reftests/inline/zero-inline-block-margin-right.html @@ -0,0 +1,6 @@ + +margin-left on zero-sized inline-block + +hello world diff --git a/layout/reftests/outline/outline-overflow-block-abspos.html b/layout/reftests/outline/outline-overflow-block-abspos.html new file mode 100644 index 00000000000..ed6af8cac9e --- /dev/null +++ b/layout/reftests/outline/outline-overflow-block-abspos.html @@ -0,0 +1,14 @@ + +outline goes around overflow, floats + + +
diff --git a/layout/reftests/outline/outline-overflow-block-float.html b/layout/reftests/outline/outline-overflow-block-float.html new file mode 100644 index 00000000000..19c61a2874a --- /dev/null +++ b/layout/reftests/outline/outline-overflow-block-float.html @@ -0,0 +1,14 @@ + +outline goes around overflow, floats + + +
diff --git a/layout/reftests/outline/outline-overflow-block-ref.html b/layout/reftests/outline/outline-overflow-block-ref.html new file mode 100644 index 00000000000..9259a5da1f4 --- /dev/null +++ b/layout/reftests/outline/outline-overflow-block-ref.html @@ -0,0 +1,12 @@ + +outline goes around overflow, floats + + +
diff --git a/layout/reftests/outline/outline-overflow-inlineblock-abspos.html b/layout/reftests/outline/outline-overflow-inlineblock-abspos.html new file mode 100644 index 00000000000..5d3eb67eb81 --- /dev/null +++ b/layout/reftests/outline/outline-overflow-inlineblock-abspos.html @@ -0,0 +1,14 @@ + +outline goes around overflow, floats + + +
diff --git a/layout/reftests/outline/outline-overflow-inlineblock-float.html b/layout/reftests/outline/outline-overflow-inlineblock-float.html new file mode 100644 index 00000000000..c20a63e678f --- /dev/null +++ b/layout/reftests/outline/outline-overflow-inlineblock-float.html @@ -0,0 +1,14 @@ + +outline goes around overflow, floats + + +
diff --git a/layout/reftests/outline/outline-overflow-inlineblock-ref.html b/layout/reftests/outline/outline-overflow-inlineblock-ref.html new file mode 100644 index 00000000000..c7ad3174d9b --- /dev/null +++ b/layout/reftests/outline/outline-overflow-inlineblock-ref.html @@ -0,0 +1,12 @@ + +outline goes around overflow, floats + + +
diff --git a/layout/reftests/outline/reftest.list b/layout/reftests/outline/reftest.list index 7384bd4893c..64ccee1447d 100644 --- a/layout/reftests/outline/reftest.list +++ b/layout/reftests/outline/reftest.list @@ -2,3 +2,7 @@ == outline-and-3d-transform-1a.html outline-and-3d-transform-1-ref.html == outline-and-3d-transform-1b.html outline-and-3d-transform-1-ref.html == outline-and-3d-transform-2.html outline-and-3d-transform-2-ref.html +== outline-overflow-block-abspos.html outline-overflow-block-ref.html +== outline-overflow-block-float.html outline-overflow-block-ref.html +== outline-overflow-inlineblock-abspos.html outline-overflow-inlineblock-ref.html +== outline-overflow-inlineblock-float.html outline-overflow-inlineblock-ref.html diff --git a/layout/reftests/printing/reftest.list b/layout/reftests/printing/reftest.list index b8f1fbbfc9b..e4fa1dd8694 100644 --- a/layout/reftests/printing/reftest.list +++ b/layout/reftests/printing/reftest.list @@ -24,7 +24,7 @@ == 115199-2a.html 115199-2-ref.html == 115199-2b.html 115199-2-ref.html == 652178-1.html 652178-1-ref2.html -fuzzy-if(cocoaWidget,1,5000) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),255,100) == 745025-1.html 745025-1-ref.html +fuzzy-if(cocoaWidget,1,5000) fuzzy-if(/^Windows\x20NT\x206\.[12]/.test(http.oscpu),255,100) == 745025-1.html 745025-1-ref.html # Mac page shadow drawing; Windows bug 791480 == 820496-1.html 820496-1-ref.html # NOTE: These tests don't yet rigorously test what they're diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list index 971e76b8b83..a5ec82f7a04 100644 --- a/layout/reftests/reftest.list +++ b/layout/reftests/reftest.list @@ -192,6 +192,9 @@ skip-if(B2G) include image-region/reftest.list # indic shaping with harfbuzz skip-if(B2G) include indic-shaping/reftest.list +# inline layout +include inline/reftest.list + # inline borders and padding skip-if(B2G) include inline-borderpadding/reftest.list diff --git a/layout/reftests/text-overflow/marker-basic-ref.html b/layout/reftests/text-overflow/marker-basic-ref.html index 61a847745d6..c452323f911 100644 --- a/layout/reftests/text-overflow/marker-basic-ref.html +++ b/layout/reftests/text-overflow/marker-basic-ref.html @@ -260,7 +260,7 @@ x1 m { position:absolute; right:0; font-size:16px; }
…‌
-
…‌
+
…‌
    …
    …
diff --git a/layout/reftests/xul/reftest.list b/layout/reftests/xul/reftest.list index 7d6d47a18c9..39365672651 100644 --- a/layout/reftests/xul/reftest.list +++ b/layout/reftests/xul/reftest.list @@ -5,3 +5,5 @@ random-if(Android||B2G) fails-if(winWidget) == menulist-shrinkwrap-2.xul menulis == textbox-overflow-1.xul textbox-overflow-1-ref.xul # for bug 749658 # accesskeys are not normally displayed on Mac, so skip this test skip-if(cocoaWidget) == accesskey.xul accesskey-ref.xul +fails-if(cocoaWidget) == tree-row-outline-1.xul tree-row-outline-1-ref.xul +!= tree-row-outline-1.xul tree-row-outline-1-notref.xul diff --git a/layout/reftests/xul/tree-row-outline-1-notref.xul b/layout/reftests/xul/tree-row-outline-1-notref.xul new file mode 100644 index 00000000000..736d42dae22 --- /dev/null +++ b/layout/reftests/xul/tree-row-outline-1-notref.xul @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/layout/reftests/xul/tree-row-outline-1-ref.xul b/layout/reftests/xul/tree-row-outline-1-ref.xul new file mode 100644 index 00000000000..006d836ac21 --- /dev/null +++ b/layout/reftests/xul/tree-row-outline-1-ref.xul @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/layout/reftests/xul/tree-row-outline-1.xul b/layout/reftests/xul/tree-row-outline-1.xul new file mode 100644 index 00000000000..4b0af1d9625 --- /dev/null +++ b/layout/reftests/xul/tree-row-outline-1.xul @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/layout/style/test/test_value_computation.html b/layout/style/test/test_value_computation.html index 301c527d914..a11d67f116c 100644 --- a/layout/style/test/test_value_computation.html +++ b/layout/style/test/test_value_computation.html @@ -13,7 +13,7 @@ + + + diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py index 33267395c89..2137716b276 100644 --- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py +++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py @@ -312,7 +312,8 @@ VARIABLES = { 'LIBXUL_LIBRARY': (bool, bool, """Whether the library in this directory is linked into libxul. - Implies ``MOZILLA_INTERNAL_API`` and ``FORCE_STATIC_LIB``. + Implies ``FORCE_STATIC_LIB`` and the ``MOZILLA_INTERNAL_API`` + preprocessor macro. """, None), 'LOCAL_INCLUDES': (StrictOrderingOnAppendList, list, diff --git a/python/mozbuild/mozbuild/test/backend/test_android_eclipse.py b/python/mozbuild/mozbuild/test/backend/test_android_eclipse.py index 9d345d2a7fd..6dda593ada4 100644 --- a/python/mozbuild/mozbuild/test/backend/test_android_eclipse.py +++ b/python/mozbuild/mozbuild/test/backend/test_android_eclipse.py @@ -96,6 +96,16 @@ class TestAndroidEclipseBackend(BackendTester): lines = [line.strip() for line in lines] self.assertIn('', lines) + def test_extra_jars(self): + """Ensure we add class path entries to extra jars iff asked to.""" + self.env = self._consume('android_eclipse', AndroidEclipseBackend) + self.assertExists('main2', '.classpath') + # This is brittle but simple. + with open(mozpath.join(self.env.topobjdir, 'android_eclipse', 'main2', '.classpath'), 'rt') as fh: + lines = fh.readlines() + lines = [line.strip() for line in lines] + self.assertIn('' % self.env.topsrcdir, lines) + def test_included_projects(self): """Ensure we include another project correctly.""" self.env = self._consume('android_eclipse', AndroidEclipseBackend) @@ -140,12 +150,6 @@ class TestAndroidEclipseBackend(BackendTester): self.assertNotInManifest('main1', 'assets') self.assertInManifest('main2', 'assets') - def test_manifest_extra_jars(self): - """Ensure we symlink extra jars iff asked to.""" - self.env = self._consume('android_eclipse', AndroidEclipseBackend) - self.assertNotInManifest('main1', 'libs') - self.assertInManifest('main2', 'libs/extra.jar') - if __name__ == '__main__': main() diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in index a17c28f84a1..67ec6a0c0c8 100644 --- a/rdf/tests/dsds/Makefile.in +++ b/rdf/tests/dsds/Makefile.in @@ -3,8 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 - EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ $(XPCOM_LIBS) \ diff --git a/rdf/tests/dsds/moz.build b/rdf/tests/dsds/moz.build index 4574e674710..0960ac95888 100644 --- a/rdf/tests/dsds/moz.build +++ b/rdf/tests/dsds/moz.build @@ -4,15 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -SOURCES += [ - 'nsRDFDataSourceDS.cpp', - 'nsRDFDataSourceFactory.cpp', -] - -LIBRARY_NAME = 'rdfdsds' - -IS_COMPONENT = True - RESOURCE_FILES.samples.rdf += [ 'DataSourceViewer.css', 'DataSourceViewer.xul', diff --git a/rdf/tests/dsds/nsRDFDOMDataSource.cpp b/rdf/tests/dsds/nsRDFDOMDataSource.cpp deleted file mode 100644 index d8c22da124d..00000000000 --- a/rdf/tests/dsds/nsRDFDOMDataSource.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* 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 __gen_nsRDFDOMDataSource_h__ -#define __gen_nsRDFDOMDataSource_h__ - -#include "nsRDFDOMDataSource.h" - -/* starting interface: nsRDFDOMDataSource */ - -/* {0F78DA58-8321-11d2-8EAC-00805F29F370} */ -#define NS_IRDFDATASOURCE_IID_STR "0F78DA58-8321-11d2-8EAC-00805F29F370" -#define NS_IRDFDATASOURCE_IID \ - {0x0F78DA58, 0x8321, 0x11d2, \ - { 0x8E, 0xAC, 0x00, 0x80, 0x5F, 0x29, 0xF3, 0x70 }} - -class nsRDFDOMDataSource : public nsISupports { - public: - NS_DECLARE_STATIC_IID_ACCESSOR(NS_IRDFDATASOURCE_IID) - - /* void Init (in string uri); */ - NS_IMETHOD Init(const char *uri) = 0; - - /* readonly attribute string URI; */ - NS_IMETHOD GetURI(char * *aURI) = 0; - - /* nsIRDFResource GetSource (in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ - NS_IMETHOD GetSource(nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue, nsIRDFResource **_retval) = 0; - - /* nsISimpleEnumerator GetSources (in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ - NS_IMETHOD GetSources(nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue, nsISimpleEnumerator **_retval) = 0; - - /* nsIRDFNode GetTarget (in nsIRDFResource aSource, in nsIRDFResource aProperty, in boolean aTruthValue); */ - NS_IMETHOD GetTarget(nsIRDFResource *aSource, nsIRDFResource *aProperty, bool aTruthValue, nsIRDFNode **_retval) = 0; - - /* nsISimpleEnumerator GetTargets (in nsIRDFResource aSource, in nsIRDFResource aProperty, in boolean aTruthValue); */ - NS_IMETHOD GetTargets(nsIRDFResource *aSource, nsIRDFResource *aProperty, bool aTruthValue, nsISimpleEnumerator **_retval) = 0; - - /* void Assert (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ - NS_IMETHOD Assert(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue) = 0; - - /* void Unassert (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget); */ - NS_IMETHOD Unassert(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget) = 0; - - /* boolean HasAssertion (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ - NS_IMETHOD HasAssertion(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue, bool *_retval) = 0; - - /* void AddObserver (in nsIRDFObserver aObserver); */ - NS_IMETHOD AddObserver(nsIRDFObserver *aObserver) = 0; - - /* void RemoveObserver (in nsIRDFObserver aObserver); */ - NS_IMETHOD RemoveObserver(nsIRDFObserver *aObserver) = 0; - - /* nsISimpleEnumerator ArcLabelsIn (in nsIRDFNode aNode); */ - NS_IMETHOD ArcLabelsIn(nsIRDFNode *aNode, nsISimpleEnumerator **_retval) = 0; - - /* nsISimpleEnumerator ArcLabelsOut (in nsIRDFResource aSource); */ - NS_IMETHOD ArcLabelsOut(nsIRDFResource *aSource, nsISimpleEnumerator **_retval) = 0; - - /* nsISimpleEnumerator GetAllResources (); */ - NS_IMETHOD GetAllResources(nsISimpleEnumerator **_retval) = 0; - - /* void Flush (); */ - NS_IMETHOD Flush() = 0; - - /* nsISimpleEnumerator GetAllCmds (in nsIRDFResource aSource); */ - NS_IMETHOD GetAllCmds(nsIRDFResource *aSource, nsISimpleEnumerator **_retval) = 0; - - /* boolean IsCommandEnabled (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */ - NS_IMETHOD IsCommandEnabled(nsISupportsArray * aSources, nsIRDFResource *aCommand, nsISupportsArray * aArguments, bool *_retval) = 0; - - /* void DoCommand (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */ - NS_IMETHOD DoCommand(nsISupportsArray * aSources, nsIRDFResource *aCommand, nsISupportsArray * aArguments) = 0; - - /* void beginUpdateBatch (); */ - NS_IMETHOD BeginUpdateBatch() = 0; - - /* void endUpdateBatch (); */ - NS_IMETHOD EndUpdateBatch() = 0; -}; - -NS_DEFINE_STATIC_IID_ACCESSOR(nsRDFDOMDataSource, NS_IRDFDATASOURCE_IID) - -#endif /* __gen_nsRDFDOMDataSource_h__ */ diff --git a/rdf/tests/dsds/nsRDFDataSourceDS.cpp b/rdf/tests/dsds/nsRDFDataSourceDS.cpp deleted file mode 100644 index 781463ac647..00000000000 --- a/rdf/tests/dsds/nsRDFDataSourceDS.cpp +++ /dev/null @@ -1,456 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* 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/. */ - - -#include "nsCRT.h" -#include "nsCOMPtr.h" - -#include "nsIRDFService.h" -#include "nsRDFCID.h" -#include "nsIRDFDataSource.h" -#include "nsIRDFRemoteDataSource.h" -#include "rdf.h" - -#include "nsIServiceManager.h" - -#include "nsEnumeratorUtils.h" - -#include "nsXPIDLString.h" - -#ifdef DEBUG -#include -#endif - -/** - * RDF vocabulary describing assertions in inner datasource - * - * For a particular resource, we want to provide all arcs out and - * in that the inner datasource has. - * This is done by introducing helper resources for each triple of - * the form - * x-moz-dsds:\ - * - * For each triple, that has the resource in question as subject, a - * "arcsout" assertion goes from that resource to a x-moz-dsds resource. - * For each triple, that has the resource in question as object, a - * "arcsin" assertion goes from that resource to a x-moz-dsds resource. - * For each x-moz-dsds resource, there is a "subject" arc to the subject, - * a "predicate" arc to the predicate and a "object" arc to the object. - * - * The namespace of this vocabulary is - * "http://www.mozilla.org/rdf/vocab/dsds". - * - * XXX we might want to add a "qname" resource from each resource to a - * somewhat canonical "prefix:localname" literal. - */ - -#define NS_RDF_DSDS_NAMESPACE_URI "http://www.mozilla.org/rdf/vocab/dsds#" -#define NS_RDF_ARCSOUT NS_RDF_DSDS_NAMESPACE_URI "arcsout" -#define NS_RDF_ARCSIN NS_RDF_DSDS_NAMESPACE_URI "arcsin" -#define NS_RDF_SUBJECT NS_RDF_DSDS_NAMESPACE_URI "subject" -#define NS_RDF_PREDICATE NS_RDF_DSDS_NAMESPACE_URI "predicate" -#define NS_RDF_OBJECT NS_RDF_DSDS_NAMESPACE_URI "object" - -#define NC_RDF_Name NC_NAMESPACE_URI "Name" -#define NC_RDF_Value NC_NAMESPACE_URI "Value" -#define NC_RDF_Child NC_NAMESPACE_URI "child" - -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - -class nsRDFDataSourceDataSource : - public nsIRDFDataSource, - public nsIRDFRemoteDataSource { -public: - NS_DECL_ISUPPORTS - NS_DECL_NSIRDFDATASOURCE - NS_DECL_NSIRDFREMOTEDATASOURCE - - nsRDFDataSourceDataSource(); - virtual ~nsRDFDataSourceDataSource(); - -private: - nsCString mURI; - nsCOMPtr mDataSource; - - static nsIRDFResource* kNC_Name; - static nsIRDFResource* kNC_Value; - static nsIRDFResource* kNC_Child; - -}; - -nsIRDFResource* nsRDFDataSourceDataSource::kNC_Name=nullptr; -nsIRDFResource* nsRDFDataSourceDataSource::kNC_Value=nullptr; -nsIRDFResource* nsRDFDataSourceDataSource::kNC_Child=nullptr; - - -nsRDFDataSourceDataSource::nsRDFDataSourceDataSource() -{ -} - -nsRDFDataSourceDataSource::~nsRDFDataSourceDataSource() -{ -} - - -NS_IMPL_ISUPPORTS2(nsRDFDataSourceDataSource, - nsIRDFDataSource, - nsIRDFRemoteDataSource) - -/** - * Implement nsIRDFRemoteDataSource - */ - -/* readonly attribute boolean loaded; */ -NS_IMETHODIMP nsRDFDataSourceDataSource::GetLoaded(bool *aLoaded) -{ - nsCOMPtr remote = - do_QueryInterface(mDataSource); - if (remote) { - return remote->GetLoaded(aLoaded); - } - *aLoaded = true; - return NS_OK; -} - -/* void Init (in string uri); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::Init(const char *uri) -{ - nsresult rv; - - mURI = uri; - - // cut off "rdf:datasource?" - NS_NAMED_LITERAL_CSTRING(prefix, "rdf:datasource"); - nsAutoCString mInnerURI; - mInnerURI = Substring(mURI, prefix.Length() + 1); - // bail if datasorce is empty or we're trying to inspect ourself - if (mInnerURI.IsEmpty() || mInnerURI == prefix) { - mURI.Truncate(); - return NS_ERROR_INVALID_ARG; - } - nsCOMPtr rdf(do_GetService(kRDFServiceCID, &rv)); - rv = rdf->GetDataSource(mInnerURI.get(), getter_AddRefs(mDataSource)); - if (NS_FAILED(rv)) { - mURI.Truncate(); - NS_WARNING("Could not get inner datasource"); - return rv; - } - - // get RDF resources - - if (!kNC_Name) { - rdf->GetResource(NS_LITERAL_CSTRING(NC_RDF_Name), &kNC_Name); - rdf->GetResource(NS_LITERAL_CSTRING(NC_RDF_Child), &kNC_Child); - rdf->GetResource(NS_LITERAL_CSTRING(NC_RDF_Value), &kNC_Value); - } - -#ifdef DEBUG_alecf - printf("nsRDFDataSourceDataSource::Init(%s)\n", uri); -#endif - - return NS_OK; -} - -/* void Refresh (in boolean aBlocking); */ -NS_IMETHODIMP nsRDFDataSourceDataSource::Refresh(bool aBlocking) -{ - nsCOMPtr remote = - do_QueryInterface(mDataSource); - if (remote) { - return remote->Refresh(aBlocking); - } - return NS_OK; -} - -/* void Flush (); */ -NS_IMETHODIMP nsRDFDataSourceDataSource::Flush() -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* void FlushTo (in string aURI); */ -NS_IMETHODIMP nsRDFDataSourceDataSource::FlushTo(const char *aURI) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/** - * Implement nsIRDFDataSource - */ - -/* readonly attribute string URI; */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::GetURI(char * *aURI) -{ -#ifdef DEBUG_alecf - printf("nsRDFDataSourceDataSource::GetURI()\n"); -#endif - *aURI = ToNewCString(mURI); - - return NS_OK; -} - -/* nsIRDFResource GetSource (in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::GetSource(nsIRDFResource *aProperty, - nsIRDFNode *aTarget, - bool aTruthValue, - nsIRDFResource **_retval) -{ - return NS_RDF_NO_VALUE; -} - -/* nsISimpleEnumerator GetSources (in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::GetSources(nsIRDFResource *aProperty, - nsIRDFNode *aTarget, - bool aTruthValue, - nsISimpleEnumerator **_retval) -{ - return NS_RDF_NO_VALUE; -} - -/* nsIRDFNode GetTarget (in nsIRDFResource aSource, in nsIRDFResource aProperty, in boolean aTruthValue); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::GetTarget(nsIRDFResource *aSource, - nsIRDFResource *aProperty, - bool aTruthValue, - nsIRDFNode **_retval) -{ -#ifdef DEBUG_alecf - nsXPIDLCString sourceval; - nsXPIDLCString propval; - aSource->GetValue(getter_Copies(sourceval)); - aProperty->GetValue(getter_Copies(propval)); - printf("GetTarget(%s, %s,..)\n", (const char*)sourceval, - (const char*)propval); -#endif - - return NS_OK; -} - -/* nsISimpleEnumerator GetTargets (in nsIRDFResource aSource, in nsIRDFResource aProperty, in boolean aTruthValue); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::GetTargets(nsIRDFResource *aSource, - nsIRDFResource *aProperty, - bool aTruthValue, - nsISimpleEnumerator **_retval) -{ - nsXPIDLCString sourceval; - aSource->GetValue(getter_Copies(sourceval)); - nsXPIDLCString propval; - aProperty->GetValue(getter_Copies(propval)); -#ifdef DEBUG_alecf - printf("GetTargets(%s, %s,..)\n", (const char*)sourceval, - (const char*)propval); -#endif - - nsresult rv; - bool isProp; - nsCOMPtr arcs; - nsISimpleEnumerator *enumerator; - - if (NS_SUCCEEDED(aProperty->EqualsNode(kNC_Child, &isProp)) && - isProp) { - - // here we need to determine if we need to extract out the source - // or use aSource? - if (StringBeginsWith(sourceval, NS_LITERAL_CSTRING("dsresource:"))) { - // somehow get the source - // XXX ? rv = mDataSource->ArcLabelsOut(realsource, &enumerator); - rv = mDataSource->ArcLabelsOut(aSource, &enumerator); - } else { - rv = mDataSource->ArcLabelsOut(aSource, &enumerator); - } - // enumerate all the children and create the composite resources - bool hasMoreArcs=false; - - rv = enumerator->HasMoreElements(&hasMoreArcs); - while (NS_SUCCEEDED(rv) && hasMoreArcs) { - - // get the next arc - nsCOMPtr arcSupports; - rv = enumerator->GetNext(getter_AddRefs(arcSupports)); - nsCOMPtr arc = do_QueryInterface(arcSupports, &rv); - - // get all the resources on the ends of the arc arcs - nsCOMPtr targetEnumerator; - rv = mDataSource->GetTargets(aSource, arc, true, - getter_AddRefs(targetEnumerator)); - - bool hasMoreTargets; - rv = targetEnumerator->HasMoreElements(&hasMoreTargets); - while (NS_SUCCEEDED(rv) && hasMoreTargets) { - // get the next target - nsCOMPtr targetSupports; - rv = enumerator->GetNext(getter_AddRefs(targetSupports)); - nsCOMPtr target=do_QueryInterface(targetSupports, &rv); - - // now we have an (arc, target) tuple that will be our node - // arc will become #Name - // target will become #Value -#ifdef DEBUG_alecf - nsXPIDLString arcValue; - nsXPIDLString targetValue; - - arc->GetValue(getter_Copies(arcValue)); - target->GetValue(getter_Copies(targetValue)); - printf("#child of %s:\n\t%s = %s\n", - (const char*)sourceval -#endif - - } - - rv = enumerator->HasMoreElements(&hasMoreArcs); - } - - } else if (NS_SUCCEEDED(aProperty->EqualsNode(kNC_Name, &isProp)) && - isProp) { - if (StringBeginsWith(sourceval, NS_LITERAL_CSTRING("dsresource:"))) { - // extract out the name - - } - - } else if (NS_SUCCEEDED(aProperty->EqualsNode(kNC_Value, &isProp)) && - isProp) { - - - } else { - rv = NS_NewISupportsArray(getter_AddRefs(arcs)); - if (NS_FAILED(rv)) return rv; - - nsArrayEnumerator* cursor = - new nsArrayEnumerator(arcs); - - if (!cursor) return NS_ERROR_OUT_OF_MEMORY; - - *_retval = cursor; - NS_ADDREF(*_retval); - } - - return NS_OK; -} - -/* void Assert (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::Assert(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue) -{ - return NS_RDF_NO_VALUE; -} - -/* void Unassert (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::Unassert(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget) -{ - return NS_RDF_NO_VALUE; -} - -/* boolean HasAssertion (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::HasAssertion(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue, bool *_retval) -{ - return NS_RDF_NO_VALUE; -} - -/* void AddObserver (in nsIRDFObserver aObserver); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::AddObserver(nsIRDFObserver *aObserver) -{ - return NS_RDF_NO_VALUE; -} - -/* void RemoveObserver (in nsIRDFObserver aObserver); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::RemoveObserver(nsIRDFObserver *aObserver) -{ - return NS_RDF_NO_VALUE; -} - -/* nsISimpleEnumerator ArcLabelsIn (in nsIRDFNode aNode); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::ArcLabelsIn(nsIRDFNode *aNode, nsISimpleEnumerator **_retval) -{ - return NS_RDF_NO_VALUE; -} - -/* nsISimpleEnumerator ArcLabelsOut (in nsIRDFResource aSource); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::ArcLabelsOut(nsIRDFResource *aSource, - nsISimpleEnumerator **_retval) -{ - nsresult rv=NS_OK; - - nsCOMPtr arcs; - rv = NS_NewISupportsArray(getter_AddRefs(arcs)); - - if (NS_FAILED(rv)) return rv; - nsXPIDLCString sourceval; - aSource->GetValue(getter_Copies(sourceval)); - -#ifdef DEBUG_alecf - printf("ArcLabelsOut(%s)\n", (const char*)sourceval); -#endif - - arcs->AppendElement(kNC_Name); - arcs->AppendElement(kNC_Value); - arcs->AppendElement(kNC_Child); - - nsArrayEnumerator* cursor = - new nsArrayEnumerator(arcs); - - if (!cursor) return NS_ERROR_OUT_OF_MEMORY; - - NS_ADDREF(cursor); - *_retval = cursor; - - return NS_OK; -} - -/* nsISimpleEnumerator GetAllResources (); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::GetAllResources(nsISimpleEnumerator **_retval) -{ - return NS_RDF_NO_VALUE; -} - -/* boolean IsCommandEnabled (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::IsCommandEnabled(nsISupportsArray * aSources, nsIRDFResource *aCommand, nsISupportsArray * aArguments, bool *_retval) -{ - return NS_RDF_NO_VALUE; -} - -/* void DoCommand (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::DoCommand(nsISupportsArray * aSources, nsIRDFResource *aCommand, nsISupportsArray * aArguments) -{ - return NS_RDF_NO_VALUE; -} - -/* void beginUpdateBatch (); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::BeginUpdateBatch() -{ - return NS_OK; -} - -/* void endUpdateBatch (); */ -NS_IMETHODIMP -nsRDFDataSourceDataSource::EndUpdateBatch() -{ - return NS_OK; -} - -nsresult -NS_NewRDFDataSourceDataSource(nsISupports *, const nsIID& iid, - void ** result) - -{ - nsRDFDataSourceDataSource * dsds = new nsRDFDataSourceDataSource(); - if (!dsds) return NS_ERROR_NOT_INITIALIZED; - return dsds->QueryInterface(iid, result); - -} diff --git a/rdf/tests/dsds/nsRDFDataSourceDS.h b/rdf/tests/dsds/nsRDFDataSourceDS.h deleted file mode 100644 index 8e3380ed729..00000000000 --- a/rdf/tests/dsds/nsRDFDataSourceDS.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* 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 __nsRDFDataSourceDS_h -#define __nsRDFDataSourceDS_h - - -/* {aa1b3f18-1aad-11d3-84bf-006008948010} */ -#define NS_RDFDATASOURCEDATASOURCE_CID \ - {0xaa1b3f18, 0x1aad, 0x11d3, \ - {0x84, 0xbf, 0x00, 0x60, 0x08, 0x94, 0x80, 0x10}} - -nsresult -NS_NewRDFDataSourceDataSource(nsISupports* aOuter, - const nsIID& iid, void **result); - -#endif diff --git a/rdf/tests/dsds/nsRDFDataSourceFactory.cpp b/rdf/tests/dsds/nsRDFDataSourceFactory.cpp deleted file mode 100644 index af0706aa0b1..00000000000 --- a/rdf/tests/dsds/nsRDFDataSourceFactory.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* 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/. */ - -#include "nsIGenericFactory.h" -#include "nsRDFDataSourceDS.h" -#include "nsIComponentManager.h" -#include "nsIServiceManager.h" -#include "rdf.h" - -#ifdef DEBUG -#include -#endif - -static NS_DEFINE_CID(kRDFDataSourceCID, NS_RDFDATASOURCEDATASOURCE_CID); -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); - -nsresult -NSGetFactory(nsISupports* aServMgr, - const nsCID &aClass, - const char* aClassName, - const char* aContractID, - nsIFactory **aFactory) -{ - nsresult rv=NS_OK; - nsIGenericFactory* fact; - if (aClass.Equals(kRDFDataSourceCID)) - rv = NS_NewGenericFactory(&fact, NS_NewRDFDataSourceDataSource); - else - rv = NS_ERROR_FAILURE; - - if (NS_SUCCEEDED(rv)) - *aFactory = fact; - -#ifdef DEBUG_alecf - printf("nsRDFDataSource's NSGetFactory!\n"); -#endif - return rv; -} - -nsresult -NSRegisterSelf(nsISupports* aServMgr, const char* aPath) -{ - nsresult rv; - nsCOMPtr compMgr = - do_GetService(kComponentManagerCID, aServMgr, &rv); - if (NS_FAILED(rv)) return rv; - - rv = compMgr->RegisterComponent(kRDFDataSourceCID, - "Generic DataSource DataSource", - NS_RDF_DATASOURCE_CONTRACTID_PREFIX "datasource", - aPath, true, true); - - return rv; - -} - -nsresult -NSUnregisterSelf(nsISupports* aServMgr, const char* aPath) -{ - nsresult rv; - nsCOMPtr compMgr = - do_GetService(kComponentManagerCID, aServMgr, &rv); - if (NS_FAILED(rv)) return rv; - - rv = compMgr->UnregisterComponent(kRDFDataSourceCID, aPath); - - return rv; -} diff --git a/rdf/util/src/internal/Makefile.in b/rdf/util/src/internal/Makefile.in deleted file mode 100644 index a00f280b9df..00000000000 --- a/rdf/util/src/internal/Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -# -# 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/. - -# This makefile builds the version of unicharutils_s static library which uses -# internal linkage. Components that use frozen (external) linkage should use -# rdfutil_external_s. - -MOZILLA_INTERNAL_API = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in deleted file mode 100644 index 54e9874bc26..00000000000 --- a/services/crypto/component/Makefile.in +++ /dev/null @@ -1,5 +0,0 @@ -# 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/. - -MOZILLA_INTERNAL_API := 1 diff --git a/testing/marionette/client/marionette/marionette_test.py b/testing/marionette/client/marionette/marionette_test.py index 3f1459fa6ab..03039a9fc8b 100644 --- a/testing/marionette/client/marionette/marionette_test.py +++ b/testing/marionette/client/marionette/marionette_test.py @@ -419,7 +419,14 @@ class MarionetteJSTestCase(CommonTestCase): if self.oop: print 'running oop' - result = self.marionette.execute_async_script(""" + frame = None + try: + frame = self.marionette.find_element( + 'css selector', + 'iframe[src*="app://test-container.gaiamobile.org/index.html"]' + ) + except NoSuchElementException: + result = self.marionette.execute_async_script(""" let setReq = navigator.mozSettings.createLock().set({'lockscreen.enabled': false}); setReq.onsuccess = function() { let appsReq = navigator.mozApps.mgmt.getAll(); @@ -445,14 +452,14 @@ setReq.onsuccess = function() { setReq.onerror = function() { marionetteScriptFinished(false); }""", script_timeout=60000) - self.assertTrue(result) + self.assertTrue(result) - self.marionette.switch_to_frame( - self.marionette.find_element( + frame = self.marionette.find_element( 'css selector', 'iframe[src*="app://test-container.gaiamobile.org/index.html"]' - )) + ) + self.marionette.switch_to_frame(frame) main_process = self.marionette.execute_script(""" return SpecialPowers.isMainProcess(); """) @@ -509,5 +516,8 @@ setReq.onerror = function() { self.loglines = self.marionette.get_logs() raise + if self.oop: + self.marionette.switch_to_frame() + self.marionette.execute_script("log('TEST-END: %s');" % self.jsFile.replace('\\', '\\\\')) self.marionette.test_name = None diff --git a/testing/marionette/client/marionette/runner/base.py b/testing/marionette/client/marionette/runner/base.py index 501d70fd402..892f893ad37 100644 --- a/testing/marionette/client/marionette/runner/base.py +++ b/testing/marionette/client/marionette/runner/base.py @@ -569,6 +569,7 @@ class BaseMarionetteTestRunner(object): self.sdcard = sdcard self.mixin_run_tests = [] self.manifest_skipped_tests = [] + self.tests = [] if testvars: if not os.path.exists(testvars): @@ -750,15 +751,31 @@ class BaseMarionetteTestRunner(object): def run_tests(self, tests): self.reset_test_stats() starttime = datetime.utcnow() + + if not self.httpd: + print "starting httpd" + self.start_httpd() + + if not self.marionette: + self.start_marionette() + if self.emulator: + self.marionette.emulator.wait_for_homescreen(self.marionette) + # Retrieve capabilities for later use + if not self._capabilities: + self.capabilities + + if self.capabilities['device'] != 'desktop': + self.textrunnerclass = B2GMarionetteTextTestRunner + + for test in tests: + self.add_test(test) + counter = self.repeat while counter >=0: round = self.repeat - counter if round > 0: self.logger.info('\nREPEAT %d\n-------' % round) - if self.shuffle: - random.shuffle(tests) - for test in tests: - self.run_test(test) + self.run_test_sets() counter -= 1 self.logger.info('\nSUMMARY\n-------') self.logger.info('passed: %d' % self.passed) @@ -795,21 +812,17 @@ class BaseMarionetteTestRunner(object): for run_tests in self.mixin_run_tests: run_tests(tests) - def run_test(self, test, expected='pass'): - if not self.httpd: - print "starting httpd" - self.start_httpd() + def add_test(self, test, expected='pass', oop=None): + filepath = os.path.abspath(test) - if not self.marionette: - self.start_marionette() - if self.emulator: - self.marionette.emulator.wait_for_homescreen(self.marionette) - # Retrieve capabilities for later use - if not self._capabilities: - self.capabilities - - if self.capabilities['device'] != 'desktop': - self.textrunnerclass = B2GMarionetteTextTestRunner + if os.path.isdir(filepath): + for root, dirs, files in os.walk(filepath): + for filename in files: + if ((filename.startswith('test_') or filename.startswith('browser_')) and + (filename.endswith('.py') or filename.endswith('.js'))): + filepath = os.path.join(root, filename) + self.add_test(filepath) + return testargs = {} if self.type is not None: @@ -821,29 +834,11 @@ class BaseMarionetteTestRunner(object): testargs.update({ atype[1:]: 'false' }) else: testargs.update({ atype: 'true' }) - oop = testargs.get('oop', False) - if isinstance(oop, basestring): - oop = False if oop == 'false' else 'true' - filepath = os.path.abspath(test) + # testarg_oop = either None, 'true' or 'false'. + testarg_oop = testargs.get('oop') - if os.path.isdir(filepath): - for root, dirs, files in os.walk(filepath): - if self.shuffle: - random.shuffle(files) - for filename in files: - if ((filename.startswith('test_') or filename.startswith('browser_')) and - (filename.endswith('.py') or filename.endswith('.js'))): - filepath = os.path.join(root, filename) - self.run_test(filepath) - if self.marionette.check_for_crash(): - return - return - - mod_name,file_ext = os.path.splitext(os.path.split(filepath)[-1]) - - testloader = unittest.TestLoader() - suite = unittest.TestSuite() + file_ext = os.path.splitext(os.path.split(filepath)[-1])[1] if file_ext == '.ini': manifest = TestManifest() @@ -861,6 +856,11 @@ class BaseMarionetteTestRunner(object): else: unfiltered_tests.append(test) + # Don't filter tests with "oop" flag because manifest parser can't + # handle it well. + if testarg_oop is not None: + del testargs['oop'] + target_tests = manifest.get(tests=unfiltered_tests, **testargs) for test in unfiltered_tests: if test['path'] not in [x['path'] for x in target_tests]: @@ -873,22 +873,62 @@ class BaseMarionetteTestRunner(object): test['disabled'])) self.todo += 1 - if self.shuffle: - random.shuffle(target_tests) for i in target_tests: if not os.path.exists(i["path"]): raise IOError("test file: %s does not exist" % i["path"]) - self.run_test(i["path"], i["expected"]) - if self.marionette.check_for_crash(): - return + + # manifest_oop is either 'false', 'true' or 'both'. Anything + # else implies 'false'. + manifest_oop = i.get('oop', 'false') + + # We only add an oop test when following conditions are met: + # 1) It's written by javascript because we have only + # MarionetteJSTestCase that supports oop mode. + # 2) we're running with "--type=+oop" or no "--type=-oop", which + # follows testarg_oop is either None or 'true' and must not + # be 'false'. + # 3) When no "--type=[+-]oop" is applied, all active tests are + # included in target_tests, so we must filter out those + # really capable of running in oop mode. Besides, oop tests + # must be explicitly specified for backward compatibility. So + # test manifest_oop equals to either 'both' or 'true'. + file_ext = os.path.splitext(os.path.split(i['path'])[-1])[-1] + if (file_ext == '.js' and + testarg_oop != 'false' and + (manifest_oop == 'both' or manifest_oop == 'true')): + self.add_test(i["path"], i["expected"], True) + + # We only add an in-process test when following conditions are + # met: + # 1) we're running with "--type=-oop" or no "--type=+oop", which + # follows testarg_oop is either None or 'false' and must not + # be 'true'. + # 2) When no "--type=[+-]oop" is applied, all active tests are + # included in target_tests, so we must filter out those + # really capable of running in in-process mode. + if (testarg_oop != 'true' and + (manifest_oop == 'both' or manifest_oop != 'true')): + self.add_test(i["path"], i["expected"], False) return - self.logger.info('TEST-START %s' % os.path.basename(test)) + if oop is None: + # This test is added by directory enumeration or directly specified + # in argument list. We have no manifest information here so we just + # respect the "--type=[+-]oop" argument here. + oop = file_ext == '.js' and testarg_oop == 'true' + self.tests.append({'filepath': filepath, 'expected': expected, 'oop': oop}) + + def run_test(self, filepath, expected, oop): + self.logger.info('TEST-START %s' % os.path.basename(filepath)) + + testloader = unittest.TestLoader() + suite = unittest.TestSuite() self.test_kwargs['expected'] = expected self.test_kwargs['oop'] = oop + mod_name = os.path.splitext(os.path.split(filepath)[-1])[0] for handler in self.test_handlers: - if handler.match(os.path.basename(test)): + if handler.match(os.path.basename(filepath)): handler.add_tests_to_suite(mod_name, filepath, suite, @@ -918,6 +958,22 @@ class BaseMarionetteTestRunner(object): if hasattr(results, 'expectedFailures'): self.passed += len(results.expectedFailures) + def run_test_set(self, tests): + if self.shuffle: + random.shuffle(tests) + + for test in tests: + self.run_test(test['filepath'], test['expected'], test['oop']) + if self.marionette.check_for_crash(): + break + + def run_test_sets(self): + oop_tests = [x for x in self.tests if x.get('oop')] + self.run_test_set(oop_tests) + + in_process_tests = [x for x in self.tests if not x.get('oop')] + self.run_test_set(in_process_tests) + def cleanup(self): if self.httpd: self.httpd.stop() diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-both.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-both.ini new file mode 100644 index 00000000000..a91348360e3 --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-both.ini @@ -0,0 +1,16 @@ +[DEFAULT] +qemu = false +browser = false +b2g = true +skip = false + +oop = both + +[test_success_both2.js] +; oop unspecified +[test_success_in_non_oop.js] +oop = false +[test_success_in_oop.js] +oop = true +[test_success_both.js] +oop = both diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-false.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-false.ini new file mode 100644 index 00000000000..1e9a1c0f014 --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-false.ini @@ -0,0 +1,16 @@ +[DEFAULT] +qemu = false +browser = false +b2g = true +skip = false + +oop = false + +[test_success_in_non_oop2.js] +; oop unspecified +[test_success_in_non_oop.js] +oop = false +[test_success_in_oop.js] +oop = true +[test_success_both.js] +oop = both diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-true.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-true.ini new file mode 100644 index 00000000000..498289cb0df --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-true.ini @@ -0,0 +1,16 @@ +[DEFAULT] +qemu = false +browser = false +b2g = true +skip = false + +oop = true + +[test_success_in_oop2.js] +; oop unspecified +[test_success_in_non_oop.js] +oop = false +[test_success_in_oop.js] +oop = true +[test_success_both.js] +oop = both diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-unspecified.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-unspecified.ini new file mode 100644 index 00000000000..642c9c7d366 --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-unspecified.ini @@ -0,0 +1,14 @@ +[DEFAULT] +qemu = false +browser = false +b2g = true +skip = false + +[test_success_in_non_oop2.js] +; oop unspecified +[test_success_in_non_oop.js] +oop = false +[test_success_in_oop.js] +oop = true +[test_success_both.js] +oop = both diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest.ini new file mode 100644 index 00000000000..4bc5b6d6bf2 --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/manifest.ini @@ -0,0 +1,10 @@ +[DEFAULT] +qemu = false +browser = false +b2g = true +skip = false + +[include:manifest-oop-unspecified.ini] +[include:manifest-oop-both.ini] +[include:manifest-oop-true.ini] +[include:manifest-oop-false.ini] diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_both.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_both.js new file mode 100644 index 00000000000..697cc70fefc --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_both.js @@ -0,0 +1,3 @@ +MARIONETTE_TIMEOUT = 60000; +ok(true, "Always success"); +finish(); diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_both2.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_both2.js new file mode 100644 index 00000000000..697cc70fefc --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_both2.js @@ -0,0 +1,3 @@ +MARIONETTE_TIMEOUT = 60000; +ok(true, "Always success"); +finish(); diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop.js new file mode 100644 index 00000000000..9131cc07735 --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop.js @@ -0,0 +1,3 @@ +MARIONETTE_TIMEOUT = 60000; +ok(SpecialPowers.isMainProcess(), "SpecialPowers.isMainProcess()"); +finish(); diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop2.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop2.js new file mode 100644 index 00000000000..9131cc07735 --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop2.js @@ -0,0 +1,3 @@ +MARIONETTE_TIMEOUT = 60000; +ok(SpecialPowers.isMainProcess(), "SpecialPowers.isMainProcess()"); +finish(); diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop.js new file mode 100644 index 00000000000..e14306a9b3c --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop.js @@ -0,0 +1,3 @@ +MARIONETTE_TIMEOUT = 60000; +ok(!SpecialPowers.isMainProcess(), "SpecialPowers.isMainProcess()"); +finish(); diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop2.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop2.js new file mode 100644 index 00000000000..e14306a9b3c --- /dev/null +++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop2.js @@ -0,0 +1,3 @@ +MARIONETTE_TIMEOUT = 60000; +ok(!SpecialPowers.isMainProcess(), "SpecialPowers.isMainProcess()"); +finish(); diff --git a/testing/marionette/client/marionette/tests/unit/unit-tests.ini b/testing/marionette/client/marionette/tests/unit/unit-tests.ini index 9f43328a610..cc360bae3a8 100644 --- a/testing/marionette/client/marionette/tests/unit/unit-tests.ini +++ b/testing/marionette/client/marionette/tests/unit/unit-tests.ini @@ -104,3 +104,5 @@ disabled = "Bug 925688" [test_screen_orientation.py] browser = false [test_errors.py] + +[include:oop/manifest.ini] diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json index 8532c9ebff9..9a7fd0dd903 100644 --- a/testing/mochitest/b2g.json +++ b/testing/mochitest/b2g.json @@ -395,8 +395,6 @@ "layout/generic/test/test_selection_expanding.html":"mouse selection not working", "layout/style/test/test_transitions_per_property.html":"times out, needs more time + various failures", - "layout/style/test/test_initial_storage.html":"bug 965655", - "layout/style/test/test_value_storage.html":"bug 965655", "content/html/content/test/test_bug209275.xhtml":"timed out, 47 tests, bug 870262, :visited support", "content/html/content/test/test_bug481335.xhtml":"timed out, bug 870262, :visited support", diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in index b1fc3241387..f6ac6fd07e3 100644 --- a/toolkit/components/feeds/Makefile.in +++ b/toolkit/components/feeds/Makefile.in @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk ABS_SRCDIR := $(abspath $(srcdir)) diff --git a/toolkit/components/url-classifier/tests/Makefile.in b/toolkit/components/url-classifier/tests/Makefile.in deleted file mode 100644 index 905791dc053..00000000000 --- a/toolkit/components/url-classifier/tests/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -# -# 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/. - - -MOZILLA_INTERNAL_API = 1 - -# XXX Get this to work in libxul builds. -## simple c++ tests (no xpcom) -#CPP_UNIT_TESTS = \ -# TestUrlClassifierUtils.cpp \ -# $(NULL) diff --git a/toolkit/components/url-classifier/tests/moz.build b/toolkit/components/url-classifier/tests/moz.build index 045fef0f517..1214da732b4 100644 --- a/toolkit/components/url-classifier/tests/moz.build +++ b/toolkit/components/url-classifier/tests/moz.build @@ -9,3 +9,11 @@ MOCHITEST_CHROME_MANIFESTS += ['mochitest/chrome.ini'] XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] JAR_MANIFESTS += ['jar.mn'] + +#DEFINES['MOZILLA_INTERNAL_API'] = True + +# XXX Get this to work in libxul builds. +## simple c++ tests (no xpcom) +#CPP_UNIT_TESTS += [ \ +# 'TestUrlClassifierUtils.cpp', \ +#] diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 63efcf4cd6a..007f2727e4d 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -2,8 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 - ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) # This is going to be a framework named "XUL", not an ordinary library named # "libxul.dylib" diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py index 54e2b86c08c..46e27914bfb 100644 --- a/toolkit/library/dependentlibs.py +++ b/toolkit/library/dependentlibs.py @@ -103,7 +103,11 @@ def dependentlibs(lib, libpaths, func): deppath = os.path.join(dir, dep) if os.path.exists(deppath): deps.extend([d for d in dependentlibs(deppath, libpaths, func) if not d in deps]) - deps.append(dep) + # Black list the ICU data DLL because preloading it at startup + # leads to startup performance problems because of its excessive + # size (around 10MB). + if not dep.startswith("icudt"): + deps.append(dep) break return deps diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index e521453e986..0618845827d 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -20,6 +20,8 @@ if CONFIG['OS_ARCH'] == 'WINNT': '/xpcom/base', ] +DEFINES['MOZILLA_INTERNAL_API'] = True + # component libraries additional_defines = ( 'MOZ_AUTH_EXTENSION', diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in deleted file mode 100644 index a3ef4233cc2..00000000000 --- a/toolkit/mozapps/extensions/Makefile.in +++ /dev/null @@ -1,9 +0,0 @@ -# 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/. - -# Additional debugging info is exposed by setting the MOZ_EM_DEBUG -# environment variable when building. -ifneq (,$(MOZ_EM_DEBUG)) -DEFINES += -DMOZ_EM_DEBUG=1 -endif diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build index e4ef9d7105d..e3a8139f8d2 100644 --- a/toolkit/mozapps/extensions/moz.build +++ b/toolkit/mozapps/extensions/moz.build @@ -53,7 +53,7 @@ if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'beta', 'release', 'esr'): DEFINES['MOZ_EXTENSIONS_DB_SCHEMA'] = 16 # Additional debugging info is exposed in debug builds -if CONFIG['MOZ_DEBUG']: +if CONFIG['MOZ_EM_DEBUG']: DEFINES['MOZ_EM_DEBUG'] = 1 -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file +JAR_MANIFESTS += ['jar.mn'] diff --git a/tools/rb/fix-linux-stack.pl b/tools/rb/fix-linux-stack.pl index d085ca7e7a4..de8e49c16a9 100755 --- a/tools/rb/fix-linux-stack.pl +++ b/tools/rb/fix-linux-stack.pl @@ -223,7 +223,7 @@ $SIG{PIPE} = 'IGNORE'; select STDOUT; $| = 1; # make STDOUT unbuffered while (<>) { my $line = $_; - if ($line =~ /^([ \|0-9-]*)(.*) ?\[([^ ]*) \+(0x[0-9A-F]{1,8})\](.*)$/) { + if ($line =~ /^([ \|0-9-]*)(.*) ?\[([^ ]*) \+(0x[0-9A-Fa-f]{1,8})\](.*)$/) { my $before = $1; # allow preservation of balance trees my $badsymbol = $2; my $file = $3; diff --git a/webapprt/gtk2/Makefile.in b/webapprt/gtk2/Makefile.in index bfc4fbc7499..4b0f9e035af 100644 --- a/webapprt/gtk2/Makefile.in +++ b/webapprt/gtk2/Makefile.in @@ -2,13 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -LOCAL_INCLUDES += \ - -I$(topsrcdir)/toolkit/xre \ - -I$(topsrcdir)/xpcom/base \ - -I$(topsrcdir)/xpcom/build \ - -I$(DEPTH)/build \ - $(NULL) - STL_FLAGS= LIBS = \ diff --git a/webapprt/gtk2/moz.build b/webapprt/gtk2/moz.build index f4a499810b1..56a033386b0 100644 --- a/webapprt/gtk2/moz.build +++ b/webapprt/gtk2/moz.build @@ -13,3 +13,10 @@ SOURCES += [ FAIL_ON_WARNINGS = True DEFINES['XPCOM_GLUE'] = True + +GENERATED_INCLUDES += ['/build'] +LOCAL_INCLUDES += [ + '/toolkit/xre', + '/xpcom/base', + '/xpcom/build', +] diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in index 34f9e31144e..dfcf4bebd95 100644 --- a/webapprt/mac/Makefile.in +++ b/webapprt/mac/Makefile.in @@ -11,11 +11,6 @@ NSDISTMODE = copy MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = -LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre -LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base -LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build -LOCAL_INCLUDES += -I$(DEPTH)/build - STL_FLAGS= LIBS = \ diff --git a/webapprt/mac/moz.build b/webapprt/mac/moz.build index d49a48d2b04..6e3e0d70588 100644 --- a/webapprt/mac/moz.build +++ b/webapprt/mac/moz.build @@ -11,3 +11,10 @@ SOURCES += [ ] DEFINES['XPCOM_GLUE'] = True + +GENERATED_INCLUDES += ['/build'] +LOCAL_INCLUDES += [ + '/toolkit/xre', + '/xpcom/base', + '/xpcom/build', +] diff --git a/webapprt/win/Makefile.in b/webapprt/win/Makefile.in index 241f0ba0097..de023f395f1 100644 --- a/webapprt/win/Makefile.in +++ b/webapprt/win/Makefile.in @@ -6,11 +6,6 @@ # to dynamically link into our executable, as we copy it to arbitrary locations. MOZ_GLUE_LDFLAGS = -LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre -LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base -LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build -LOCAL_INCLUDES += -I$(DEPTH)/build - STL_FLAGS= LIBS = \ diff --git a/webapprt/win/moz.build b/webapprt/win/moz.build index 2c290c38d53..f8654f993ad 100644 --- a/webapprt/win/moz.build +++ b/webapprt/win/moz.build @@ -14,3 +14,10 @@ DEFINES['XPCOM_GLUE'] = True # Statically link against the CRT USE_STATIC_LIBS = True + +GENERATED_INCLUDES += ['/build'] +LOCAL_INCLUDES += [ + '/toolkit/xre', + '/xpcom/base', + '/xpcom/build', +] diff --git a/xpcom/analysis/Makefile.in b/xpcom/analysis/Makefile.in index 99926fc5958..c784c56ad8d 100644 --- a/xpcom/analysis/Makefile.in +++ b/xpcom/analysis/Makefile.in @@ -2,8 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 - include $(topsrcdir)/config/rules.mk DUMP_CLASSES = \ diff --git a/xpcom/analysis/moz.build b/xpcom/analysis/moz.build index 895d11993cf..edffa058659 100644 --- a/xpcom/analysis/moz.build +++ b/xpcom/analysis/moz.build @@ -4,3 +4,4 @@ # 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/. +DEFINES['MOZILLA_INTERNAL_API'] = True diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index 3b1e3118c10..5114b668012 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -3,8 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API =1 - INSTALL_TARGETS += errorlist errorlist_FILES := \ ErrorListCDefines.h \ diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index 24b5d7e53f4..3cf6e11b234 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -158,6 +158,5 @@ LOCAL_INCLUDES += [ '/xpcom/ds', ] - if CONFIG['MOZ_OPTIMIZE']: DEFINES['MOZ_OPTIMIZE'] = True diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 0f712e92af4..7c57bd01fdc 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -5,8 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 - LOCAL_INCLUDES = \ -I$(srcdir) \ -I.. \ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index 9b48ca2adc5..10d718f9e85 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -3,8 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../reflect/xptinfo/src \ -I$(srcdir)/../base \ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 2969134195f..bcbf9f3c30d 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -2,7 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I.. diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index 4b80a6142a1..b66b23a6598 100644 --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -3,8 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 - ###################################################################### # ARM ###################################################################### diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in deleted file mode 100644 index e2587554bae..00000000000 --- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -# -# 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/. - -MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in index b9dcf584f6d..38ffcca515d 100644 --- a/xpcom/string/src/Makefile.in +++ b/xpcom/string/src/Makefile.in @@ -4,8 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZILLA_INTERNAL_API = 1 - include $(topsrcdir)/config/rules.mk ifneq (,$(INTEL_ARCHITECTURE)) diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build index 8f8f3cf1633..e0caf47ee85 100644 --- a/xpcom/tests/moz.build +++ b/xpcom/tests/moz.build @@ -70,6 +70,7 @@ CPP_UNIT_TESTS += [ 'TestPipe.cpp', 'TestPLDHash.cpp', 'TestRefPtr.cpp', + 'TestStringAPI.cpp', 'TestTArray.cpp', 'TestTextFormatter.cpp', 'TestThreadUtils.cpp' @@ -113,11 +114,6 @@ if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT', 'Darwin'): 'TestDeadlockDetectorScalability.cpp', ] -if not CONFIG['MOZILLA_INTERNAL_API']: - CPP_UNIT_TESTS += [ - 'TestStringAPI.cpp', - ] - LOCAL_INCLUDES += [ '../ds', ]