wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge mozilla-central to fx-team

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-02-18 14:07:37 +01:00
commit dc25826d56
348 changed files with 1683 additions and 1974 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/emulator-ics/sources.xml
View File

@ -12,7 +12,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eda08beb3ba9a159843c70ffde0f9660ec351eb9"/>

2
b2g/config/emulator-jb/sources.xml
View File

@ -11,7 +11,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="3d5c964015967ca8c86abe6dbbebee3cb82b1609"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="a314508e397c8f1814228d36259ea8708034444e"/>

2
b2g/config/emulator/sources.xml
View File

@ -12,7 +12,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eda08beb3ba9a159843c70ffde0f9660ec351eb9"/>

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "1adfbae4582a2cebf4b35c822044299aa8dd1026",
"revision": "8d15cd3ac0d07cde9ff36ce611ae47e6ef30d9b0",
"repo_path": "/integration/gaia-central"
}

2
b2g/config/hamachi/sources.xml
View File

@ -11,7 +11,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>

2
b2g/config/helix/sources.xml
View File

@ -10,7 +10,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>

2
b2g/config/inari/sources.xml
View File

@ -12,7 +12,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>

2
b2g/config/leo/sources.xml
View File

@ -11,7 +11,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>

2
b2g/config/mako/sources.xml
View File

@ -11,7 +11,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="3d5c964015967ca8c86abe6dbbebee3cb82b1609"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="a314508e397c8f1814228d36259ea8708034444e"/>

2
b2g/config/wasabi/sources.xml
View File

@ -11,7 +11,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="ae90f9b322509ee09fbd3963bd23e142845613ab"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="258ae6472bd0e87ae074a6b9b464273dc9cfc8d6"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="78b908b493bfe0b477e3d4f6edec8c46a2c0d096"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>

3
config/config.mk
View File

@ -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

5
configure.in
View File

@ -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

15
content/media/webaudio/test/test_oscillatorNodeStart.html
View File

@ -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");
</script>
</pre>
</body>

7
dom/apps/src/Makefile.in
View File

@ -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

2
dom/apps/src/Webapps.jsm
View File

@ -55,7 +55,7 @@ XPCOMUtils.defineLazyGetter(this, "libcutils", function() {
#endif
function debug(aMsg) {
#ifdef MOZ_DEBUG
#ifdef DEBUG
dump("-*- Webapps.jsm : " + aMsg + "\n");
#endif
}

22
gfx/cairo/libpixman/src/Makefile.in
View File

@ -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

21
gfx/cairo/libpixman/src/moz.build
View File

@ -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']

1
intl/unicharutil/util/internal/Makefile.in
View File

@ -12,4 +12,3 @@ LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
endif
DIST_INSTALL = 1
MOZILLA_INTERNAL_API = 1

1
intl/unicharutil/util/internal/moz.build
View File

@ -14,4 +14,3 @@ LOCAL_INCLUDES += [
'..',
'../../src',
]

41
ipc/chromium/Makefile.in
View File

@ -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 <event.h>' > $(DIST)/third_party/libevent/event.h
echo '#include <event.h>' > $(CURDIR)/third_party/libevent/event.h
endif # }

10
ipc/chromium/moz.build
View File

@ -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 += [

3
ipc/ipdl/Makefile.in
View File

@ -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

2
ipc/ipdl/moz.build
View File

@ -12,3 +12,5 @@ FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
GENERATED_INCLUDES += ['/ipc/ipdl/_ipdlheaders']

24
js/src/Makefile.in
View File

@ -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)

2
js/src/gdb/Makefile.in
View File

@ -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

3
js/src/gdb/moz.build
View File

@ -21,3 +21,6 @@ UNIFIED_SOURCES += [
# on its behalf.
for var in ('EXPORT_JS_API', 'IMPL_MFBT'):
DEFINES[var] = True
LOCAL_INCLUDES += ['..']
GENERATED_INCLUDES += ['..']

2
js/src/jsapi-tests/Makefile.in
View File

@ -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

3
js/src/jsapi-tests/moz.build
View File

@ -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 += ['..']

15
js/src/moz.build
View File

@ -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

2
js/src/shell/Makefile.in
View File

@ -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

3
js/src/shell/moz.build
View File

@ -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 += ['..']

19
layout/base/FrameLayerBuilder.cpp
View File

@ -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);

9
layout/base/nsCSSRendering.cpp
View File

@ -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

49
layout/base/nsDisplayList.cpp
View File

@ -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,

11
layout/base/nsDisplayList.h
View File

@ -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() {}

21
layout/base/nsLayoutUtils.cpp
View File

@ -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<nsDisplayScrollLayer*>(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

24
layout/base/nsLayoutUtils.h
View File

@ -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
*/

4
layout/forms/nsColorControlFrame.cpp
View File

@ -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)

4
layout/forms/nsColorControlFrame.h
View File

@ -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; }

12
layout/forms/nsComboboxControlFrame.cpp
View File

@ -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<ChildList>* aLists) const
mPopupFrames.AppendIfNonempty(aLists, kSelectPopupList);
}
NS_IMETHODIMP
nsresult
nsComboboxControlFrame::SetInitialChildList(ChildListID aListID,
nsFrameList& aChildList)
{

8
layout/forms/nsComboboxControlFrame.h
View File

@ -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<ChildList>* aLists) const MOZ_OVERRIDE;

10
layout/forms/nsFieldSetFrame.cpp
View File

@ -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)
{

12
layout/forms/nsFieldSetFrame.h
View File

@ -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

4
layout/forms/nsFileControlFrame.cpp
View File

@ -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);

4
layout/forms/nsFileControlFrame.h
View File

@ -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);

4
layout/forms/nsFormControlFrame.cpp
View File

@ -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)

4
layout/forms/nsFormControlFrame.h
View File

@ -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;

6
layout/forms/nsGfxButtonControlFrame.cpp
View File

@ -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)

6
layout/forms/nsGfxButtonControlFrame.h
View File

@ -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;

2
layout/forms/nsGfxCheckboxControlFrame.h
View File

@ -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

10
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@ -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)
{

12
layout/forms/nsHTMLButtonControlFrame.h
View File

@ -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

14
layout/forms/nsImageControlFrame.cpp
View File

@ -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)
{

4
layout/forms/nsLegendFrame.cpp
View File

@ -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);

4
layout/forms/nsLegendFrame.h
View File

@ -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();

10
layout/forms/nsListControlFrame.cpp
View File

@ -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);

10
layout/forms/nsListControlFrame.h
View File

@ -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

4
layout/forms/nsMeterFrame.cpp
View File

@ -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)

6
layout/forms/nsMeterFrame.h
View File

@ -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;

4
layout/forms/nsNumberControlFrame.cpp
View File

@ -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)

6
layout/forms/nsNumberControlFrame.h
View File

@ -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

4
layout/forms/nsProgressFrame.cpp
View File

@ -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)

6
layout/forms/nsProgressFrame.h
View File

@ -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;

4
layout/forms/nsRangeFrame.cpp
View File

@ -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)

6
layout/forms/nsRangeFrame.h
View File

@ -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;

2
layout/forms/nsSelectsAreaFrame.cpp
View File

@ -151,7 +151,7 @@ nsSelectsAreaFrame::BuildDisplayListInternal(nsDisplayListBuilder* aBuilder,
}
}
NS_IMETHODIMP
nsresult
nsSelectsAreaFrame::Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,

2
layout/forms/nsSelectsAreaFrame.h
View File

@ -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;

8
layout/forms/nsTextControlFrame.cpp
View File

@ -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;

10
layout/forms/nsTextControlFrame.h
View File

@ -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

4
layout/generic/nsBRFrame.cpp
View File

@ -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,

16
layout/generic/nsBlockFrame.cpp
View File

@ -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)
{

16
layout/generic/nsBlockFrame.h
View File

@ -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<ChildList>* 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;

4
layout/generic/nsBulletFrame.cpp
View File

@ -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,

4
layout/generic/nsBulletFrame.h
View File

@ -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;

14
layout/generic/nsCanvasFrame.cpp
View File

@ -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);

14
layout/generic/nsCanvasFrame.h
View File

@ -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;

10
layout/generic/nsColumnSetFrame.cpp
View File

@ -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)
{

12
layout/generic/nsColumnSetFrame.h
View File

@ -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

8
layout/generic/nsContainerFrame.cpp
View File

@ -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)
{

8
layout/generic/nsContainerFrame.h
View File

@ -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;

8
layout/generic/nsFirstLetterFrame.cpp
View File

@ -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,

8
layout/generic/nsFirstLetterFrame.h
View File

@ -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;

4
layout/generic/nsFlexContainerFrame.cpp
View File

@ -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,

4
layout/generic/nsFlexContainerFrame.h
View File

@ -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();

44
layout/generic/nsFrame.cpp
View File

@ -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;

42
layout/generic/nsFrame.h
View File

@ -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<ChildList>* 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;
/**

32
layout/generic/nsFrameSetFrame.cpp
View File

@ -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,

10
layout/generic/nsFrameSetFrame.h
View File

@ -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;

26
layout/generic/nsGfxScrollFrame.cpp
View File

@ -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);

26
layout/generic/nsGfxScrollFrame.h
View File

@ -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:

4
layout/generic/nsHTMLCanvasFrame.cpp
View File

@ -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);

4
layout/generic/nsHTMLCanvasFrame.h
View File

@ -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

60
layout/generic/nsIFrame.h
View File

@ -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
};

12
layout/generic/nsImageFrame.cpp
View File

@ -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);

12
layout/generic/nsImageFrame.h
View File

@ -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

8
layout/generic/nsInlineFrame.cpp
View File

@ -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,

8
layout/generic/nsInlineFrame.h
View File

@ -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;

4
layout/generic/nsLeafFrame.cpp
View File

@ -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,

4
layout/generic/nsLeafFrame.h
View File

@ -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);

77
layout/generic/nsLineLayout.cpp
View File

@ -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++;
}
}

Some files were not shown because too many files have changed in this diff Show More