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 mozilla-inbound

Browse Source
This commit is contained in:
Ed Morley 2012-01-31 21:20:50 +00:00
commit fe4fa2137e
16 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.hgtags
View File

@ -73,3 +73,6 @@ c0983049bcaa9551e5f276d5a77ce154c151e0b0 AURORA_BASE_20110927
54bfd8bf682e295ffd7f22fa921ca343957b6c1c AURORA_BASE_20111108
a8506ab2c65480cf2f85f54e203ea746522c62bb AURORA_BASE_20111220
462c726144bc1fb45b61e774f64ac5d61b4e047c UPDATE_PACKAGING_R16
bbc7014db2de49e2301680d2a86be8a53108a88a AURORA_BASE_20120131
bbc7014db2de49e2301680d2a86be8a53108a88a AURORA_BASE_20120131
0000000000000000000000000000000000000000 AURORA_BASE_20120131

3
browser/config/mozconfigs/linux32/release
View File

@ -18,3 +18,6 @@ export MOZ_TELEMETRY_REPORTING=1
# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
ac_add_options --enable-warnings-as-errors
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j4"

3
browser/config/mozconfigs/linux64/release
View File

@ -18,3 +18,6 @@ export MOZ_TELEMETRY_REPORTING=1
# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
ac_add_options --enable-warnings-as-errors
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j4"

3
browser/config/mozconfigs/macosx-universal/release
View File

@ -14,3 +14,6 @@ export MOZ_TELEMETRY_REPORTING=1
# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
ac_add_options --enable-warnings-as-errors
# Enable parallel compiling
mk_add_options MOZ_MAKE_FLAGS="-j4"

2
browser/config/mozconfigs/win32/debug
View File

@ -5,3 +5,5 @@ ac_add_options --enable-trace-malloc
export MOZILLA_OFFICIAL=1
mk_add_options MOZ_MAKE_FLAGS=-j1
. $topsrcdir/browser/config/mozconfigs/win32/vs2010-mozconfig

2
browser/config/mozconfigs/win32/l10n-mozconfig
View File

@ -2,3 +2,5 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-official-branding
ac_add_options --with-l10n-base=../../l10n-central
. $topsrcdir/browser/config/mozconfigs/win32/vs2010-mozconfig

2
browser/config/mozconfigs/win32/nightly
View File

@ -14,3 +14,5 @@ export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
mk_add_options MOZ_MAKE_FLAGS=-j1
. $topsrcdir/browser/config/mozconfigs/win32/vs2010-mozconfig

2
browser/config/mozconfigs/win32/release
View File

@ -11,3 +11,5 @@ ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
. $topsrcdir/browser/config/mozconfigs/win32/vs2010-mozconfig

2
browser/config/version.txt
View File

@ -1 +1 @@
12.0a1
13.0a1

2
config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
12.0a1
13.0a1

2
js/src/config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
12.0a1
13.0a1

5
layout/generic/nsGfxScrollFrame.cpp
View File

@ -3233,7 +3233,8 @@ nsGfxScrollFrameInner::ReflowFinished()
nsPoint scrollPos = GetScrollPosition();
// XXX shouldn't we use GetPageScrollAmount/GetLineScrollAmount here?
if (vScroll) {
nscoord fontHeight = GetLineScrollAmount().height;
const double kScrollMultiplier = 3;
nscoord fontHeight = GetLineScrollAmount().height * kScrollMultiplier;
// We normally use (scrollArea.height - fontHeight) for height
// of page scrolling. However, it is too small when
// fontHeight is very large. (If fontHeight is larger than
@ -3243,7 +3244,7 @@ nsGfxScrollFrameInner::ReflowFinished()
nscoord pageincrement = nscoord(mScrollPort.height - fontHeight);
nscoord pageincrementMin = nscoord(float(mScrollPort.height) * 0.8);
FinishReflowForScrollbar(vScroll, minY, maxY, scrollPos.y,
NS_MAX(pageincrement,pageincrementMin),
NS_MAX(pageincrement, pageincrementMin),
fontHeight);
}
if (hScroll) {

10
mobile/android/base/GeckoInputConnection.java
View File

@ -206,8 +206,16 @@ public class GeckoInputConnection
extract.selectionEnd = b;
extract.startOffset = 0;
extract.text = content.toString();
try {
extract.text = content.toString();
} catch (IndexOutOfBoundsException iob) {
Log.d(LOGTAG,
"IndexOutOfBoundsException thrown from getExtractedText(). start: " +
Selection.getSelectionStart(content) +
" end: " + Selection.getSelectionEnd(content));
return null;
}
return extract;
}

2
mobile/android/confvars.sh
View File

@ -38,7 +38,7 @@
MOZ_APP_BASENAME=Fennec
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=12.0a1
MOZ_APP_VERSION=13.0a1
MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official

2
mobile/xul/confvars.sh
View File

@ -38,7 +38,7 @@
MOZ_APP_BASENAME=Fennec
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=12.0a1
MOZ_APP_VERSION=13.0a1
MOZ_BRANDING_DIRECTORY=mobile/xul/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/xul/branding/official

2
xpcom/components/Module.h
View File

@ -53,7 +53,7 @@ namespace mozilla {
*/
struct Module
{
static const unsigned int kVersion = 12;
static const unsigned int kVersion = 13;
struct CIDEntry;