- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 1019003 - ESR24 backport of a visibility warning-fix. r=trivial, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 9f3393850cc61bb2118ec3c3eedb0f74abb1d473 Author: Jeff Walden <jwalden(a)mit.edu> Date: Mon Jun 9 12:57:47 2014 -0700 Bug 1019003 - ESR24 backport of a visibility warning-fix. r=trivial, a=sledru --- js/src/jstypedarray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp index a78edd4..735c608 100644 --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -3480,7 +3480,7 @@ const JSFunctionSpec _typedArray::jsfuncs[] = { \ return obj; \ return NULL; \ } \ - JS_FRIEND_DATA(const js::Class* const) js::detail::Name ## ArrayClassPtr = \ + const js::Class* const js::detail::Name ## ArrayClassPtr = \ &js::TypedArray::classes[TypedArrayTemplate<NativeType>::ArrayTypeID()]; IMPL_TYPED_ARRAY_JSAPI_CONSTRUCTORS(Int8, int8_t)

1 0

[tor-browser/esr24] Automated checkin: version bump for thunderbird 24.6.0 release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b430d8339816354d5f08b4c5bf83c66d5cf21931 Author: tbirdbld <none@none> Date: Tue Jun 10 02:55:05 2014 -0400 Automated checkin: version bump for thunderbird 24.6.0 release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index c9dc647..71e3ef9 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0esrpre +24.6.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c9dc647..71e3ef9 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0esrpre +24.6.0

1 0

[tor-browser/esr24] Bug 1022785 - Disable android snippets for reftests/crashtests/jsreftests. r=jmaher, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 91405b0182327da5f5cb302fab885f09481431c3 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Mon Jun 9 13:37:21 2014 -0400 Bug 1022785 - Disable android snippets for reftests/crashtests/jsreftests. r=jmaher, a=test-only --- js/src/tests/user.js | 2 ++ layout/tools/reftest/runreftest.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/js/src/tests/user.js b/js/src/tests/user.js index 694d4d0..d106db4 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -29,3 +29,5 @@ user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_com user_pref("toolkit.telemetry.enabled", false); user_pref("browser.safebrowsing.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); +user_pref("browser.snippets.enabled", false); +user_pref("browser.snippets.syncPromo.enabled", false); diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 2bb3d11..c16955a 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -77,6 +77,9 @@ class RefTest(object): # Likewise for safebrowsing. prefsFile.write('user_pref("browser.safebrowsing.enabled", false);\n') prefsFile.write('user_pref("browser.safebrowsing.malware.enabled", false);\n') + # And for snippets. + prefsFile.write('user_pref("browser.snippets.enabled", false);\n') + prefsFile.write('user_pref("browser.snippets.syncPromo.enabled", false);\n') for v in options.extraPrefs: thispref = v.split("=")

1 0

[tor-browser/esr24] Bug 1018414 - Skip test_error_codes.js on OS X. r=smaug, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 18a6858f8fe3af20919acdbfe97e40412d4d88e3 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Mon Jun 2 15:27:16 2014 -0400 Bug 1018414 - Skip test_error_codes.js on OS X. r=smaug, a=test-only --- content/base/test/unit/xpcshell.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/base/test/unit/xpcshell.ini b/content/base/test/unit/xpcshell.ini index 9d7c35d..f1ef2e6 100644 --- a/content/base/test/unit/xpcshell.ini +++ b/content/base/test/unit/xpcshell.ini @@ -8,6 +8,8 @@ tail = [test_csputils.js] [test_cspreports.js] [test_error_codes.js] +# Bug 1018414: hardcoded localhost doesn't work properly on some OS X installs +skip-if = os == 'mac' [test_thirdpartyutil.js] [test_xhr_standalone.js] [test_xmlserializer.js]

1 0

[tor-browser/esr24] Automated checkin: version bump for firefox 24.6.0esr release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit ebca3c103e7fe9416845f724879684bbcbd962c4 Author: ffxbld <none@none> Date: Mon Jun 9 21:01:00 2014 -0400 Automated checkin: version bump for firefox 24.6.0esr release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index 71e3ef9..c9dc647 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0 +24.6.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 71e3ef9..c9dc647 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0 +24.6.0esrpre

1 0

[tor-browser/esr24] Bug 1018400 - Disable safebrowsing during reftests. r=ted, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1891f376f6ae966d86818b891ef8b6bc250600f5 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Fri May 30 16:21:47 2014 -0400 Bug 1018400 - Disable safebrowsing during reftests. r=ted, a=test-only --- js/src/tests/user.js | 2 ++ layout/tools/reftest/runreftest.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/js/src/tests/user.js b/js/src/tests/user.js index 8849221..694d4d0 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -27,3 +27,5 @@ user_pref("javascript.options.werror", false); user_pref("toolkit.startup.max_resumed_crashes", -1); user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true); user_pref("toolkit.telemetry.enabled", false); +user_pref("browser.safebrowsing.enabled", false); +user_pref("browser.safebrowsing.malware.enabled", false); diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 683b0a1..2bb3d11 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -74,6 +74,9 @@ class RefTest(object): # Ensure that telemetry is disabled, so we don't connect to the telemetry # server in the middle of the tests. prefsFile.write('user_pref("toolkit.telemetry.enabled", false);\n') + # Likewise for safebrowsing. + prefsFile.write('user_pref("browser.safebrowsing.enabled", false);\n') + prefsFile.write('user_pref("browser.safebrowsing.malware.enabled", false);\n') for v in options.extraPrefs: thispref = v.split("=")

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-050 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 44c7993368742ecc5b3c33c157f5fbc2490dda86 Author: ffxbld <none@none> Date: Sat Jun 14 03:08:31 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-050 - a=blocklist-update --- browser/app/blocklist.xml | 76 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 5 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 2039450..91763d3 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1400782040000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1402612020000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -274,6 +274,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i596" id="{b99c8534-7800-48fa-bd71-519a46cdc7e1}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i140" id="mozillahmpg(a)mozilla.org"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -413,6 +419,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> + <versionRange minVersion="0" maxVersion="*"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i111" os="WINNT" id="{C3949AC2-4B17-43ee-B4F1-D26B9D42404D}"> <versionRange minVersion="0" maxVersion="15.0.5" severity="1"> </versionRange> @@ -579,8 +591,26 @@ <prefs> </prefs> </emItem> - <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i618" id="toolbar(a)ask.com"> + <versionRange minVersion="3.15.5" maxVersion="3.15.5.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.8" maxVersion="3.15.8.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.10" maxVersion="3.15.11.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.13" maxVersion="3.15.13.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.18" maxVersion="3.15.20.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.22" maxVersion="3.15.22.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.24" maxVersion="3.15.24.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.26" maxVersion="3.15.26.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.28" maxVersion="3.15.28.*" severity="1"> + </versionRange> + <versionRange minVersion="3.15.31" maxVersion="3.15.31.*" severity="1"> </versionRange> <prefs> </prefs> @@ -666,6 +696,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i620" id="{21EAF666-26B3-4A3C-ABD0-CA2F5A326744}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i552" id="jid0-O6MIff3eO5dIGf5Tcv8RsJDKxrs@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -872,6 +908,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i588" id="quick_start(a)gmail.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i340" id="chiang(a)programmer.net"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -926,6 +968,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i598" id="{29b136c9-938d-4d3d-8df8-d649d9b74d02}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i286" id="{58bd07eb-0ee0-4df0-8121-dc9b693373df}"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -1278,8 +1326,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}"> - <versionRange minVersion="1.1b1" maxVersion="1.1b1"> + <emItem blockID="i586" id="jid1-0xtMKhXFEs4jIg@jetpack"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> <prefs> </prefs> @@ -1290,6 +1338,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i19" id="{46551EC9-40F0-4e47-8E18-8E5CF550CFB8}"> + <versionRange minVersion="1.1b1" maxVersion="1.1b1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i531" id="/^(4cb61367-efbf-4aa1-8e3a-7f776c9d5763@cdece6e9-b2ef-40a9-b178-291da9870c59\.com|0efc9c38-1ec7-49ed-8915-53a48b6b7600@e7f17679-2a42-4659-83c5-7ba961fdf75a\.com|6be3335b-ef79-4b0b-a0ba-b87afbc6f4ad@6bbb4d2e-e33e-4fa5-9b37-934f4fb50182\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1410,6 +1464,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i590" id="{94cd2cc3-083f-49ba-a218-4cda4b4829fd}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i544" id="/^(93abedcf-8e3a-4d02-b761-d1441e437c09@243f129d-aee2-42c2-bcd1-48858e1c22fd\.com|9acfc440-ac2d-417a-a64c-f6f14653b712@09f9a966-9258-4b12-af32-da29bdcc28c5\.com|58ad0086-1cfb-48bb-8ad2-33a8905572bc@5715d2be-69b9-4930-8f7e-64bdeb961cfd\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -2111,6 +2171,12 @@ <pluginItem blockID="p574"> <match name="filename" exp="NPDjVu\.plugin" /> <versionRange minVersion="0" maxVersion="6.1.1" severity="0" vulnerabilitystatus="1"></versionRange> </pluginItem> + <pluginItem blockID="p592"> + <match name="filename" exp="CiscoWebCommunicator\.plugin" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> + <pluginItem blockID="p594"> + <match name="filename" exp="npCiscoWebCommunicator\.dll" /> <versionRange minVersion="0" maxVersion="3.0.5.99999999999999" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> </pluginItems> <gfxItems>

1 0

[tor-browser/esr24] Bug 967354 - Fix incorrect usage of UpdateWebGLErrorAndClearGLError(); r=jgilbert, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 82ea333beb3423b8aaaca2998b111a6308ed197a Author: Dan Glastonbury <dglastonbury(a)mozilla.com> Date: Thu May 29 08:42:40 2014 +1000 Bug 967354 - Fix incorrect usage of UpdateWebGLErrorAndClearGLError(); r=jgilbert, a=lmandel --HG-- extra : histedit_source : ef735c5d9e83cddd2312f58fa41baf330a162f0f --- content/canvas/src/WebGLContext.cpp | 12 +++++---- content/canvas/src/WebGLContext.h | 4 +-- content/canvas/src/WebGLContextGL.cpp | 48 ++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 23 deletions(-) diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp index 323e2b4..91d8d99 100644 --- a/content/canvas/src/WebGLContext.cpp +++ b/content/canvas/src/WebGLContext.cpp @@ -1367,14 +1367,16 @@ WebGLContext::PresentScreenBuffer() return true; } -void +bool WebGLContext::DummyFramebufferOperation(const char *info) { WebGLenum status = CheckFramebufferStatus(LOCAL_GL_FRAMEBUFFER); - if (status == LOCAL_GL_FRAMEBUFFER_COMPLETE) - return; - else - return ErrorInvalidFramebufferOperation("%s: incomplete framebuffer", info); + if (status == LOCAL_GL_FRAMEBUFFER_COMPLETE) { + return true; + } else { + ErrorInvalidFramebufferOperation("%s: incomplete framebuffer", info); + return false; + } } // We use this timer for many things. Here are the things that it is activated for: diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h index 3c7054e..e8e55db 100644 --- a/content/canvas/src/WebGLContext.h +++ b/content/canvas/src/WebGLContext.h @@ -200,7 +200,7 @@ public: const char *ErrorName(GLenum error); bool IsTextureFormatCompressed(GLenum format); - void DummyFramebufferOperation(const char *info); + bool DummyFramebufferOperation(const char *info); WebGLTexture *activeBoundTextureForTarget(WebGLenum target) { return target == LOCAL_GL_TEXTURE_2D ? mBound2DTextures[mActiveTexture] @@ -970,7 +970,7 @@ protected: gfxImageSurface **imageOut, WebGLTexelFormat *format); - void CopyTexSubImage2D_base(WebGLenum target, + bool CopyTexSubImage2D_base(WebGLenum target, WebGLint level, WebGLenum internalformat, WebGLint xoffset, diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp index ec37391..6b4c77b 100644 --- a/content/canvas/src/WebGLContextGL.cpp +++ b/content/canvas/src/WebGLContextGL.cpp @@ -722,7 +722,7 @@ WebGLContext::ColorMask(WebGLboolean r, WebGLboolean g, WebGLboolean b, WebGLboo gl->fColorMask(r, g, b, a); } -void +bool WebGLContext::CopyTexSubImage2D_base(WebGLenum target, WebGLint level, WebGLenum internalformat, @@ -741,15 +741,17 @@ WebGLContext::CopyTexSubImage2D_base(WebGLenum target, const char *info = sub ? "copyTexSubImage2D" : "copyTexImage2D"; if (!ValidateLevelWidthHeightForTarget(target, level, width, height, info)) { - return; + return false; } MakeContextCurrent(); WebGLTexture *tex = activeBoundTextureForTarget(target); - if (!tex) - return ErrorInvalidOperation("%s: no texture is bound to this target"); + if (!tex) { + ErrorInvalidOperation("%s: no texture is bound to this target"); + return false; + } if (CanvasUtils::CheckSaneSubrectSize(x, y, width, height, framebufferWidth, framebufferHeight)) { if (sub) @@ -766,13 +768,15 @@ WebGLContext::CopyTexSubImage2D_base(WebGLenum target, uint32_t texelSize = 0; if (!ValidateTexFormatAndType(internalformat, LOCAL_GL_UNSIGNED_BYTE, -1, &texelSize, info)) - return; + return false; CheckedUint32 checked_neededByteLength = GetImageSize(height, width, texelSize, mPixelStoreUnpackAlignment); - if (!checked_neededByteLength.isValid()) - return ErrorInvalidOperation("%s: integer overflow computing the needed buffer size", info); + if (!checked_neededByteLength.isValid()) { + ErrorInvalidOperation("%s: integer overflow computing the needed buffer size", info); + return false; + } uint32_t bytesNeeded = checked_neededByteLength.value(); @@ -782,8 +786,10 @@ WebGLContext::CopyTexSubImage2D_base(WebGLenum target, // contents of a texture allocated with nullptr data. // Hopefully calloc will just mmap zero pages here. void *tempZeroData = calloc(1, bytesNeeded); - if (!tempZeroData) - return ErrorOutOfMemory("%s: could not allocate %d bytes (for zero fill)", info, bytesNeeded); + if (!tempZeroData) { + ErrorOutOfMemory("%s: could not allocate %d bytes (for zero fill)", info, bytesNeeded); + return false; + } // now initialize the texture as black @@ -820,6 +826,8 @@ WebGLContext::CopyTexSubImage2D_base(WebGLenum target, if (!sub) ReattachTextureToAnyFramebufferToWorkAroundBugs(tex, level); + + return true; } void @@ -917,15 +925,19 @@ WebGLContext::CopyTexImage2D(WebGLenum target, if (sizeMayChange) { UpdateWebGLErrorAndClearGLError(); - CopyTexSubImage2D_base(target, level, internalformat, 0, 0, x, y, width, height, false); + } + + bool ok = CopyTexSubImage2D_base(target, level, internalformat, 0, 0, x, y, width, height, false); + if (!ok) + return; + + if (sizeMayChange) { GLenum error = LOCAL_GL_NO_ERROR; UpdateWebGLErrorAndClearGLError(&error); if (error) { GenerateWarning("copyTexImage2D generated error %s", ErrorName(error)); return; } - } else { - CopyTexSubImage2D_base(target, level, internalformat, 0, 0, x, y, width, height, false); } tex->SetImageInfo(target, level, width, height, internalformat, type); @@ -1007,7 +1019,7 @@ WebGLContext::CopyTexSubImage2D(WebGLenum target, if (!mBoundFramebuffer->CheckAndInitializeRenderbuffers()) return ErrorInvalidFramebufferOperation("copyTexSubImage2D: incomplete framebuffer"); - return CopyTexSubImage2D_base(target, level, format, xoffset, yoffset, x, y, width, height, true); + CopyTexSubImage2D_base(target, level, format, xoffset, yoffset, x, y, width, height, true); } @@ -3405,8 +3417,10 @@ WebGLContext::ReadPixels(WebGLint x, WebGLint y, WebGLsizei width, // Now that the errors are out of the way, on to actually reading // If we won't be reading any pixels anyways, just skip the actual reading - if (width == 0 || height == 0) - return DummyFramebufferOperation("readPixels"); + if (width == 0 || height == 0) { + DummyFramebufferOperation("readPixels"); + return; + } if (CanvasUtils::CheckSaneSubrectSize(x, y, width, height, framebufferWidth, framebufferHeight)) { // the easy case: we're not reading out-of-range pixels @@ -3428,7 +3442,8 @@ WebGLContext::ReadPixels(WebGLint x, WebGLint y, WebGLsizei width, || y+height <= 0) { // we are completely outside of range, can exit now with buffer filled with zeros - return DummyFramebufferOperation("readPixels"); + DummyFramebufferOperation("readPixels"); + return; } // compute the parameters of the subrect we're actually going to call glReadPixels on @@ -4574,6 +4589,7 @@ WebGLContext::CompressedTexImage2D(WebGLenum target, WebGLint level, WebGLenum i return; } + MakeContextCurrent(); gl->fCompressedTexImage2D(target, level, internalformat, width, height, border, byteLength, view.Data()); tex->SetImageInfo(target, level, width, height, internalformat, LOCAL_GL_UNSIGNED_BYTE);

1 0

[tor-browser/esr24] Bug 996715 - Remove the code that bails when determining if the second instruction in a chunk is a branch. r=dougc, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 8612874aed5c628ab7dbd8f2c381f829a11c7bef Author: Marty Rosenberg <mrosenberg(a)mozilla.com> Date: Tue May 27 09:40:35 2014 -0400 Bug 996715 - Remove the code that bails when determining if the second instruction in a chunk is a branch. r=dougc, a=lmandel --- js/src/jit/shared/IonAssemblerBufferWithConstantPools.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/src/jit/shared/IonAssemblerBufferWithConstantPools.h b/js/src/jit/shared/IonAssemblerBufferWithConstantPools.h index ec0886c..eed3ffd 100644 --- a/js/src/jit/shared/IonAssemblerBufferWithConstantPools.h +++ b/js/src/jit/shared/IonAssemblerBufferWithConstantPools.h @@ -216,8 +216,6 @@ struct BufferSliceTail : public BufferSlice<SliceSize> { isBranch[idx >> 3] |= 1 << (idx & 0x7); } bool isNextBranch() { - if (this->nodeSize == InstBaseSize) - return false; int idx = this->nodeSize / InstBaseSize; return (isBranch[idx >> 3] >> (idx & 0x7)) & 1; }

1 0

[tor-browser/esr24] Bug 1007940 - Improve the performance of editor initialization. r=bzbarsky, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1bef29ba36ea5c8359617b3df4e68b76b4b50b98 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri May 9 17:02:29 2014 -0400 Bug 1007940 - Improve the performance of editor initialization. r=bzbarsky, a=lmandel --- editor/libeditor/html/nsHTMLEditRules.cpp | 32 +++++++++++++++++--------- editor/libeditor/html/nsHTMLEditRules.h | 2 ++ editor/libeditor/html/nsHTMLEditor.cpp | 7 +++--- editor/libeditor/text/nsPlaintextEditor.cpp | 8 +++---- editor/libeditor/text/nsTextEditRules.cpp | 33 +++++++++++++++++++-------- editor/libeditor/text/nsTextEditRules.h | 2 ++ 6 files changed, 56 insertions(+), 28 deletions(-) diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp index 04e94ea..599682e 100644 --- a/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/editor/libeditor/html/nsHTMLEditRules.cpp @@ -169,16 +169,25 @@ class nsEditableTextFunctor : public nsBoolDomIterFunctor * Constructor/Destructor ********************************************************/ -nsHTMLEditRules::nsHTMLEditRules() : -mDocChangeRange(nullptr) -,mListenerEnabled(true) -,mReturnInEmptyLIKillsList(true) -,mDidDeleteSelection(false) -,mDidRangedDelete(false) -,mRestoreContentEditableCount(false) -,mUtilRange(nullptr) -,mJoinOffset(0) +nsHTMLEditRules::nsHTMLEditRules() { + InitFields(); +} + +void +nsHTMLEditRules::InitFields() +{ + mHTMLEditor = nullptr; + mDocChangeRange = nullptr; + mListenerEnabled = true; + mReturnInEmptyLIKillsList = true; + mDidDeleteSelection = false; + mDidRangedDelete = false; + mRestoreContentEditableCount = false; + mUtilRange = nullptr; + mJoinOffset = 0; + mNewBlock = nullptr; + mRangeItem = new nsRangeStore(); // populate mCachedStyles mCachedStyles[0] = StyleCache(nsEditProperty::b, EmptyString(), EmptyString()); mCachedStyles[1] = StyleCache(nsEditProperty::i, EmptyString(), EmptyString()); @@ -199,7 +208,6 @@ mDocChangeRange(nullptr) mCachedStyles[16] = StyleCache(nsEditProperty::cssBackgroundColor, EmptyString(), EmptyString()); mCachedStyles[17] = StyleCache(nsEditProperty::sub, EmptyString(), EmptyString()); mCachedStyles[18] = StyleCache(nsEditProperty::sup, EmptyString(), EmptyString()); - mRangeItem = new nsRangeStore(); } nsHTMLEditRules::~nsHTMLEditRules() @@ -229,9 +237,11 @@ NS_IMPL_QUERY_INTERFACE_INHERITED1(nsHTMLEditRules, nsTextEditRules, nsIEditActi NS_IMETHODIMP nsHTMLEditRules::Init(nsPlaintextEditor *aEditor) { + InitFields(); + mHTMLEditor = static_cast<nsHTMLEditor*>(aEditor); nsresult res; - + // call through to base class Init res = nsTextEditRules::Init(aEditor); NS_ENSURE_SUCCESS(res, res); diff --git a/editor/libeditor/html/nsHTMLEditRules.h b/editor/libeditor/html/nsHTMLEditRules.h index 28bf20c..5d12c4d 100644 --- a/editor/libeditor/html/nsHTMLEditRules.h +++ b/editor/libeditor/html/nsHTMLEditRules.h @@ -125,6 +125,8 @@ protected: kBlockEnd }; + void InitFields(); + // nsHTMLEditRules implementation methods nsresult WillInsert(nsISelection *aSelection, bool *aCancel); nsresult WillInsertText( EditAction aAction, diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp index 2bc2ce6..9ed79d5 100644 --- a/editor/libeditor/html/nsHTMLEditor.cpp +++ b/editor/libeditor/html/nsHTMLEditor.cpp @@ -485,9 +485,10 @@ nsHTMLEditor::SetFlags(uint32_t aFlags) NS_IMETHODIMP nsHTMLEditor::InitRules() { - MOZ_ASSERT(!mRules); - // instantiate the rules for the html editor - mRules = new nsHTMLEditRules(); + if (!mRules) { + // instantiate the rules for the html editor + mRules = new nsHTMLEditRules(); + } return mRules->Init(static_cast<nsPlaintextEditor*>(this)); } diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp index 39db37c..f5e7053 100644 --- a/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/editor/libeditor/text/nsPlaintextEditor.cpp @@ -121,7 +121,6 @@ NS_IMETHODIMP nsPlaintextEditor::Init(nsIDOMDocument *aDoc, nsresult res = NS_OK, rulesRes = NS_OK; if (mRules) { mRules->DetachEditor(); - mRules = nullptr; } if (1) @@ -315,9 +314,10 @@ nsPlaintextEditor::UpdateMetaCharset(nsIDOMDocument* aDocument, NS_IMETHODIMP nsPlaintextEditor::InitRules() { - MOZ_ASSERT(!mRules); - // instantiate the rules for this text editor - mRules = new nsTextEditRules(); + if (!mRules) { + // instantiate the rules for this text editor + mRules = new nsTextEditRules(); + } return mRules->Init(this); } diff --git a/editor/libeditor/text/nsTextEditRules.cpp b/editor/libeditor/text/nsTextEditRules.cpp index aaba83d..d3852b7 100644 --- a/editor/libeditor/text/nsTextEditRules.cpp +++ b/editor/libeditor/text/nsTextEditRules.cpp @@ -56,17 +56,28 @@ using namespace mozilla; ********************************************************/ nsTextEditRules::nsTextEditRules() -: mEditor(nullptr) -, mPasswordText() -, mPasswordIMEText() -, mPasswordIMEIndex(0) -, mActionNesting(0) -, mLockRulesSniffing(false) -, mDidExplicitlySetInterline(false) -, mTheAction(EditAction::none) -, mLastStart(0) -, mLastLength(0) { + InitFields(); +} + +void +nsTextEditRules::InitFields() +{ + mEditor = nullptr; + mPasswordText.Truncate(); + mPasswordIMEText.Truncate(); + mPasswordIMEIndex = 0; + mBogusNode = nullptr; + mCachedSelectionNode = nullptr; + mCachedSelectionOffset = 0; + mActionNesting = 0; + mLockRulesSniffing = false; + mDidExplicitlySetInterline = false; + mDeleteBidiImmediately = false; + mTheAction = EditAction::none; + mTimer = nullptr; + mLastStart = 0; + mLastLength = 0; } nsTextEditRules::~nsTextEditRules() @@ -101,6 +112,8 @@ nsTextEditRules::Init(nsPlaintextEditor *aEditor) { if (!aEditor) { return NS_ERROR_NULL_POINTER; } + InitFields(); + mEditor = aEditor; // we hold a non-refcounted reference back to our editor nsCOMPtr<nsISelection> selection; mEditor->GetSelection(getter_AddRefs(selection)); diff --git a/editor/libeditor/text/nsTextEditRules.h b/editor/libeditor/text/nsTextEditRules.h index 4dfed8a..3db6463 100644 --- a/editor/libeditor/text/nsTextEditRules.h +++ b/editor/libeditor/text/nsTextEditRules.h @@ -99,6 +99,8 @@ public: protected: + void InitFields(); + // nsTextEditRules implementation methods nsresult WillInsertText( EditAction aAction, mozilla::Selection* aSelection,

1 0

[tor-browser/esr24] Bug 983709 - Simple branch patch for uplift. r=hv1989, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit daf403c994ad846e5aebccf874c5df32e1de5c17 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Fri Apr 4 09:03:06 2014 -0400 Bug 983709 - Simple branch patch for uplift. r=hv1989, a=lmandel --- js/src/jit/MIR.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index e9bc029..96ba2d4 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -2156,6 +2156,9 @@ class MCreateThisWithProto AliasSet getAliasSet() const { return AliasSet::None(); } + bool congruentTo(MDefinition *ins) const { + return false; + } TypePolicy *typePolicy() { return this; }

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-ix-032 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 35490cd7e0133b1466fa80616d011b559ce6862a Author: ffxbld <none@none> Date: Sat May 24 03:13:49 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-ix-032 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 8 ++++++++ security/manager/boot/src/nsSTSPreloadList.inc | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index c1694bd..831c969 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,11 +1,14 @@ admin.google.com: did not receive HSTS header +adsfund.org: could not connect to host airbnb.com: did not receive HSTS header alpha.irccloud.com: could not connect to host anycoin.me: did not receive HSTS header +api.lookout.com: could not connect to host api.mega.co.nz: could not connect to host api.recurly.com: did not receive HSTS header api.simple.com: did not receive HSTS header apis.google.com: did not receive HSTS header +app.lookout.com: could not connect to host appengine.google.com: did not receive HSTS header bassh.net: did not receive HSTS header bcrook.com: max-age too low: 86400 @@ -28,6 +31,7 @@ crate.io: did not receive HSTS header crowdcurity.com: did not receive HSTS header crypto.is: did not receive HSTS header csawctf.poly.edu: did not receive HSTS header +discovery.lookout.com: did not receive HSTS header dl.google.com: did not receive HSTS header docs.google.com: did not receive HSTS header donmez.ws: could not connect to host @@ -58,6 +62,7 @@ iop.intuit.com: max-age too low: 86400 irccloud.com: did not receive HSTS header jitsi.org: did not receive HSTS header jottit.com: did not receive HSTS header +keymaster.lookout.com: did not receive HSTS header kiwiirc.com: max-age too low: 5256000 ledgerscope.net: did not receive HSTS header liberty.lavabit.com: could not connect to host @@ -65,6 +70,8 @@ lifeguard.aecom.com: did not receive HSTS header lists.mayfirst.org: did not receive HSTS header mail.google.com: did not receive HSTS header market.android.com: did not receive HSTS header +mobilethreat.net: could not connect to host +mobilethreatnetwork.net: could not connect to host my.alfresco.com: did not receive HSTS header mydigipass.com: did not receive HSTS header mykolab.com: did not receive HSTS header @@ -86,6 +93,7 @@ sah3.net: could not connect to host saturngames.co.uk: did not receive HSTS header script.google.com: did not receive HSTS header security.google.com: did not receive HSTS header +semenkovich.com: did not receive HSTS header serverdensity.io: did not receive HSTS header shops.neonisi.com: could not connect to host silentcircle.org: could not connect to host diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index bde7a03..8266427 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1411207520608000); +const PRTime gPreloadListExpirationTime = INT64_C(1411812354538000); class nsSTSPreload { @@ -60,6 +60,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "cyphertite.com", true }, { "data.qld.gov.au", false }, { "davidlyness.com", true }, + { "detectify.com", false }, { "developer.mydigipass.com", false }, { "dillonkorman.com", true }, { "dist.torproject.org", false }, @@ -172,7 +173,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, { "seifried.org", true }, - { "semenkovich.com", true }, { "shodan.io", true }, { "silentcircle.com", false }, { "simbolo.co.uk", false }, @@ -191,8 +191,22 @@ static const nsSTSPreload kSTSPreloadList[] = { { "twitter.com", false }, { "ubertt.org", true }, { "vmoagents.com", false }, + { "w-spotlight.appspot.com", true }, + { "webfilings-eu-mirror.appspot.com", true }, + { "webfilings-eu.appspot.com", true }, + { "webfilings-mirror-hrd.appspot.com", true }, + { "webfilings.appspot.com", true }, { "webmail.gigahost.dk", false }, { "webmail.onlime.ch", false }, + { "wf-bigsky-master.appspot.com", true }, + { "wf-demo-eu.appspot.com", true }, + { "wf-demo-hrd.appspot.com", true }, + { "wf-dogfood-hrd.appspot.com", true }, + { "wf-pentest.appspot.com", true }, + { "wf-staging-hr.appspot.com", true }, + { "wf-training-hrd.appspot.com", true }, + { "wf-training-master.appspot.com", true }, + { "wf-trial-hrd.appspot.com", true }, { "wiki.python.org", true }, { "wiz.biz", true }, { "writeapp.me", false }, @@ -228,5 +242,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.twitter.com", false }, { "www.usaa.com", false }, { "www.zenpayroll.com", false }, + { "xbrlsuccess.appspot.com", true }, { "zenpayroll.com", false }, };

1 0

[tor-browser/esr24] Bug 978811 - Fix isFakeExitFrame to return true for entry frames. r=nbp, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit e1710d77a0d80c5f2bd2e3bf3b09dad4a20478e8 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Tue May 20 08:34:25 2014 -0400 Bug 978811 - Fix isFakeExitFrame to return true for entry frames. r=nbp, a=lmandel --- js/src/jit/IonFrames-inl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/src/jit/IonFrames-inl.h b/js/src/jit/IonFrames-inl.h index c3893469..cd0c716 100644 --- a/js/src/jit/IonFrames-inl.h +++ b/js/src/jit/IonFrames-inl.h @@ -82,7 +82,8 @@ IonFrameIterator::isFakeExitFrame() const { bool res = (prevType() == IonFrame_Unwound_Rectifier || prevType() == IonFrame_Unwound_OptimizedJS || - prevType() == IonFrame_Unwound_BaselineStub); + prevType() == IonFrame_Unwound_BaselineStub || + (prevType() == IonFrame_Entry && type() == IonFrame_Exit)); JS_ASSERT_IF(res, type() == IonFrame_Exit || type() == IonFrame_BaselineJS); return res; }

1 0

[tor-browser/esr24] Bump version to 24.6.0esrpre DONTBUILD a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 548ea97875a91e3292d51b405dcbd46669a1ec69 Author: Nick Thomas <nthomas(a)mozilla.com> Date: Wed May 28 08:23:30 2014 +1200 Bump version to 24.6.0esrpre DONTBUILD a=lmandel --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 3bd5cba..60f1860 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.5.0esrpre +24.6.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index dbc95cf..c9dc647 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.5.0 +24.6.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index dbc95cf..c9dc647 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.5.0 +24.6.0esrpre

1 0

[tor-browser/esr24] Bug 998303 - browser/base/content/test/browser_urlbar_search_healthreport.js attempts to connect to www.google.com. r=mak, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit d724ed8688db13a9fa421c6713e4168530f63bb4 Author: Drew Willcoxon <adw(a)mozilla.com> Date: Thu May 15 19:04:47 2014 -0700 Bug 998303 - browser/base/content/test/browser_urlbar_search_healthreport.js attempts to connect to www.google.com. r=mak, a=test-only --- .../test/browser_urlbar_search_healthreport.js | 50 +++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/browser/base/content/test/browser_urlbar_search_healthreport.js b/browser/base/content/test/browser_urlbar_search_healthreport.js index 4315a98..e97cf00 100644 --- a/browser/base/content/test/browser_urlbar_search_healthreport.js +++ b/browser/base/content/test/browser_urlbar_search_healthreport.js @@ -42,23 +42,49 @@ function test() { let tab = gBrowser.addTab(); gBrowser.selectedTab = tab; - gURLBar.value = "firefox health report"; - gURLBar.handleCommand(); + let searchStr = "firefox health report"; + let expectedURL = Services.search.currentEngine. + getSubmission(searchStr, "", "keyword").uri.spec; - executeSoon(() => executeSoon(() => { - gBrowser.removeTab(tab); + // Expect the search URL to load but stop it as soon as it starts. + let loadPromise = waitForDocLoadAndStopIt(expectedURL); + // Meanwhile, poll for the new measurement. + let count = 0; + let measurementDeferred = Promise.defer(); + function getNewMeasurement() { + if (count++ >= 10) { + ok(false, "Timed out waiting for new measurement"); + measurementDeferred.resolve(); + return; + } m.getValues().then(function onData(data) { - ok(data.days.hasDay(now), "FHR has data for today."); - let day = data.days.getDay(now); - ok(day.has(field), "FHR has url bar count for today."); + if (data.days.hasDay(now)) { + let day = data.days.getDay(now); + if (day.has(field)) { + let newCount = day.get(field); + if (newCount > oldCount) { + is(newCount, oldCount + 1, + "Exactly one search has been recorded."); + measurementDeferred.resolve(); + return; + } + } + } + executeSoon(getNewMeasurement); + }); + } + executeSoon(getNewMeasurement); - let newCount = day.get(field); + // Trigger the search. + gURLBar.value = searchStr; + gURLBar.handleCommand(); - is(newCount, oldCount + 1, "Exactly one search has been recorded."); - finish(); - }); - })); + // Wait for the page load and new measurement. + Promise.all([loadPromise, measurementDeferred.promise]).then(() => { + gBrowser.removeTab(tab); + finish(); + }); }); }); }

1 0

[tor-browser/esr24] Bug 1000185 - Part 2: Add a bool to keep track of whether nsSMILAnimationController instances are registered with a refresh driver. r=birtles, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit da3de5dd2b884c4d54c86fd0a5164f137a509958 Author: Daniel Holbert <dholbert(a)cs.stanford.edu> Date: Tue May 20 08:34:26 2014 -0400 Bug 1000185 - Part 2: Add a bool to keep track of whether nsSMILAnimationController instances are registered with a refresh driver. r=birtles, a=abillings --- content/smil/nsSMILAnimationController.cpp | 11 +++++++++-- content/smil/nsSMILAnimationController.h | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/content/smil/nsSMILAnimationController.cpp b/content/smil/nsSMILAnimationController.cpp index 77d06cd..b625b21 100644 --- a/content/smil/nsSMILAnimationController.cpp +++ b/content/smil/nsSMILAnimationController.cpp @@ -29,6 +29,7 @@ nsSMILAnimationController::nsSMILAnimationController(nsIDocument* aDoc) mResampleNeeded(false), mDeferredStartSampling(false), mRunningSample(false), + mRegisteredWithRefreshDriver(false), mDocument(aDoc) { NS_ABORT_IF_FALSE(aDoc, "need a non-null document"); @@ -52,6 +53,8 @@ nsSMILAnimationController::~nsSMILAnimationController() NS_ASSERTION(mAnimationElementTable.Count() == 0, "Animation controller shouldn't be tracking any animation" " elements when it dies"); + NS_ASSERTION(!mRegisteredWithRefreshDriver, + "Leaving stale entry in refresh driver's observer list"); } void @@ -263,6 +266,8 @@ nsSMILAnimationController::StartSampling(nsRefreshDriver* aRefreshDriver) NS_ASSERTION(!mDeferredStartSampling, "Started sampling but the deferred start flag is still set"); if (aRefreshDriver) { + MOZ_ASSERT(!mRegisteredWithRefreshDriver, + "Redundantly registering with refresh driver"); NS_ABORT_IF_FALSE(!GetRefreshDriver() || aRefreshDriver == GetRefreshDriver(), "Starting sampling with wrong refresh driver"); @@ -270,19 +275,21 @@ nsSMILAnimationController::StartSampling(nsRefreshDriver* aRefreshDriver) // or else it will confuse our "average time between samples" calculations. mCurrentSampleTime = mozilla::TimeStamp::Now(); aRefreshDriver->AddRefreshObserver(this, Flush_Style); + mRegisteredWithRefreshDriver = true; } } void nsSMILAnimationController::StopSampling(nsRefreshDriver* aRefreshDriver) { - if (aRefreshDriver) { + if (aRefreshDriver && mRegisteredWithRefreshDriver) { // NOTE: The document might already have been detached from its PresContext - // (and RefreshDriver), which would make GetRefreshDriverForDoc return null. + // (and RefreshDriver), which would make GetRefreshDriver() return null. NS_ABORT_IF_FALSE(!GetRefreshDriver() || aRefreshDriver == GetRefreshDriver(), "Stopping sampling with wrong refresh driver"); aRefreshDriver->RemoveRefreshObserver(this, Flush_Style); + mRegisteredWithRefreshDriver = false; } } diff --git a/content/smil/nsSMILAnimationController.h b/content/smil/nsSMILAnimationController.h index ab98cd6..b42ffee 100644 --- a/content/smil/nsSMILAnimationController.h +++ b/content/smil/nsSMILAnimationController.h @@ -214,6 +214,9 @@ protected: bool mDeferredStartSampling; bool mRunningSample; + // Are we registered with our document's refresh driver? + bool mRegisteredWithRefreshDriver; + // Store raw ptr to mDocument. It owns the controller, so controller // shouldn't outlive it nsIDocument* mDocument;

1 0

[tor-browser/esr24] Bug 1005552 - Followup to fix test failures. r=me a=me
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 0a5eddbe0ce5757cd734991bd103d95b67fa403c Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Tue May 20 20:31:34 2014 -0700 Bug 1005552 - Followup to fix test failures. r=me a=me --- layout/style/xbl-marquee/xbl-marquee.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/style/xbl-marquee/xbl-marquee.xml b/layout/style/xbl-marquee/xbl-marquee.xml index 3e7e3a4..2a883ac 100644 --- a/layout/style/xbl-marquee/xbl-marquee.xml +++ b/layout/style/xbl-marquee/xbl-marquee.xml @@ -264,7 +264,7 @@ // // NB: Make sure to wrap the constructor in parentheses to // deal with the weird precedence of |new| in JS. - this["_on" + aName] = new (XPCNativeWrapper.unwrap(window.Function))("event", aValue); + this["_on" + aName] = new (XPCNativeWrapper.unwrap(window).Function)("event", aValue); } catch(e) { return false;

1 0

[tor-browser/esr24] Backed out changeset ae70b479d2ff (bug 998303) for mochitest-bc failures.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4fa1872c817518dce11d7552a64abbf6e0066c0a Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue May 20 20:57:37 2014 -0400 Backed out changeset ae70b479d2ff (bug 998303) for mochitest-bc failures. --- .../test/browser_urlbar_search_healthreport.js | 50 +++++--------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/browser/base/content/test/browser_urlbar_search_healthreport.js b/browser/base/content/test/browser_urlbar_search_healthreport.js index e97cf00..4315a98 100644 --- a/browser/base/content/test/browser_urlbar_search_healthreport.js +++ b/browser/base/content/test/browser_urlbar_search_healthreport.js @@ -42,49 +42,23 @@ function test() { let tab = gBrowser.addTab(); gBrowser.selectedTab = tab; - let searchStr = "firefox health report"; - let expectedURL = Services.search.currentEngine. - getSubmission(searchStr, "", "keyword").uri.spec; + gURLBar.value = "firefox health report"; + gURLBar.handleCommand(); - // Expect the search URL to load but stop it as soon as it starts. - let loadPromise = waitForDocLoadAndStopIt(expectedURL); + executeSoon(() => executeSoon(() => { + gBrowser.removeTab(tab); - // Meanwhile, poll for the new measurement. - let count = 0; - let measurementDeferred = Promise.defer(); - function getNewMeasurement() { - if (count++ >= 10) { - ok(false, "Timed out waiting for new measurement"); - measurementDeferred.resolve(); - return; - } m.getValues().then(function onData(data) { - if (data.days.hasDay(now)) { - let day = data.days.getDay(now); - if (day.has(field)) { - let newCount = day.get(field); - if (newCount > oldCount) { - is(newCount, oldCount + 1, - "Exactly one search has been recorded."); - measurementDeferred.resolve(); - return; - } - } - } - executeSoon(getNewMeasurement); - }); - } - executeSoon(getNewMeasurement); + ok(data.days.hasDay(now), "FHR has data for today."); + let day = data.days.getDay(now); + ok(day.has(field), "FHR has url bar count for today."); - // Trigger the search. - gURLBar.value = searchStr; - gURLBar.handleCommand(); + let newCount = day.get(field); - // Wait for the page load and new measurement. - Promise.all([loadPromise, measurementDeferred.promise]).then(() => { - gBrowser.removeTab(tab); - finish(); - }); + is(newCount, oldCount + 1, "Exactly one search has been recorded."); + finish(); + }); + })); }); }); }

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host b-linux64-ix-0004 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b5a16b38e211de1d06d2d2abd5d0145507a3abfd Author: ffxbld <none@none> Date: Sat May 24 03:10:21 2014 -0700 No bug, Automated blocklist update from host b-linux64-ix-0004 - a=blocklist-update --- browser/app/blocklist.xml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index ffbfe51..2039450 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1398899403000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1400782040000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -359,6 +359,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i584" id="{52b0f3db-f988-4788-b9dc-861d016f4487}"> + <versionRange minVersion="0" maxVersion="0.1.9999999" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i472" id="linksicle(a)linksicle.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -1362,6 +1368,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i564" id="/^(firefox@vebergreat\.net|EFGLQA@78ETGYN-0W7FN789T87\.COM)$/"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i167" id="{b64982b1-d112-42b5-b1e4-d3867c4533f8}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1404,7 +1416,7 @@ <prefs> </prefs> </emItem> - <emItem blockID="i564" id="/^(firefox@vebergreat\.net|EFGLQA@78ETGYN-0W7FN789T87\.COM|{52b0f3db-f988-4788-b9dc-861d016f4487})$/"> + <emItem blockID="i224" id="{336D0C35-8A85-403a-B9D2-65C292C39087}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> @@ -1536,7 +1548,7 @@ </prefs> </emItem> <emItem blockID="i580" id="{51c77233-c0ad-4220-8388-47c11c18b355}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <versionRange minVersion="0" maxVersion="0.1.9999999" severity="1"> </versionRange> <prefs> </prefs> @@ -1577,12 +1589,6 @@ <prefs> </prefs> </emItem> - <emItem blockID="i224" id="{336D0C35-8A85-403a-B9D2-65C292C39087}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> - </versionRange> - <prefs> - </prefs> - </emItem> <emItem blockID="i452" id="{77beece6-3997-403a-92fa-0055bfcf88e5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange>

1 0

[tor-browser/esr24] Bug 1010322 - Change toolkit/mozapps/extensions/test/browser/ tests to point at actual http servers. r=jmaher, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit ff2db0140627086f0d4d4f9fb9a3648b3e19b78a Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Tue May 13 13:28:53 2014 -0400 Bug 1010322 - Change toolkit/mozapps/extensions/test/browser/ tests to point at actual http servers. r=jmaher, a=test-only --- toolkit/mozapps/extensions/test/browser/browser_bug591465.js | 10 +++++----- toolkit/mozapps/extensions/test/browser/browser_list.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591465.js b/toolkit/mozapps/extensions/test/browser/browser_bug591465.js index 94796bd..2380dee 100644 --- a/toolkit/mozapps/extensions/test/browser/browser_bug591465.js +++ b/toolkit/mozapps/extensions/test/browser/browser_bug591465.js @@ -24,11 +24,11 @@ var gLWTheme = { name: "Bling", description: "SO MUCH BLING!", author: "Pixel Pusher", - homepageURL: "http://localhost:4444/data/index.html", - headerURL: "http://localhost:4444/data/header.png", - footerURL: "http://localhost:4444/data/footer.png", - previewURL: "http://localhost:4444/data/preview.png", - iconURL: "http://localhost:4444/data/icon.png" + homepageURL: "http://mochi.test:8888/data/index.html", + headerURL: "http://mochi.test:8888/data/header.png", + footerURL: "http://mochi.test:8888/data/footer.png", + previewURL: "http://mochi.test:8888/data/preview.png", + iconURL: "http://mochi.test:8888/data/icon.png" }; diff --git a/toolkit/mozapps/extensions/test/browser/browser_list.js b/toolkit/mozapps/extensions/test/browser/browser_list.js index e39da0b..fd6cfed 100644 --- a/toolkit/mozapps/extensions/test/browser/browser_list.js +++ b/toolkit/mozapps/extensions/test/browser/browser_list.js @@ -25,11 +25,11 @@ var gLWTheme = { name: "Bling", description: "SO MUCH BLING!", author: "Pixel Pusher", - homepageURL: "http://localhost:4444/data/index.html", - headerURL: "http://localhost:4444/data/header.png", - footerURL: "http://localhost:4444/data/footer.png", - previewURL: "http://localhost:4444/data/preview.png", - iconURL: "http://localhost:4444/data/icon.png" + homepageURL: "http://mochi.test:8888/data/index.html", + headerURL: "http://mochi.test:8888/data/header.png", + footerURL: "http://mochi.test:8888/data/footer.png", + previewURL: "http://mochi.test:8888/data/preview.png", + iconURL: "http://mochi.test:8888/data/icon.png" };

1 0

[tor-browser/esr24] Bug 1000185 - Part 1: Perform synchronous SMIL sample after registering with refresh driver, not before, for consistency. r=birtles, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5ec0afc9cd5dcc90285bbabbd4154c3273102e0c Author: Daniel Holbert <dholbert(a)cs.stanford.edu> Date: Tue May 20 08:34:26 2014 -0400 Bug 1000185 - Part 1: Perform synchronous SMIL sample after registering with refresh driver, not before, for consistency. r=birtles, a=abillings --- content/smil/nsSMILAnimationController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/smil/nsSMILAnimationController.cpp b/content/smil/nsSMILAnimationController.cpp index 377398c..77d06cd 100644 --- a/content/smil/nsSMILAnimationController.cpp +++ b/content/smil/nsSMILAnimationController.cpp @@ -93,8 +93,8 @@ nsSMILAnimationController::Resume(uint32_t aType) nsSMILTimeContainer::Resume(aType); if (wasPaused && !mPauseState && mChildContainerTable.Count()) { - Sample(); // Run the first sample manually MaybeStartSampling(GetRefreshDriver()); + Sample(); // Run the first sample manually } }

1 0

[tor-browser/esr24] Bug 995603 - Ensure mouse-enter/exit events are sent to plugins as appropriate (reland after esr24-specific changes). r=mstange, masayuki a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit ad58a15421657c3f9448a023bed25f441852613f Author: Steven Michaud <smichaud(a)pobox.com> Date: Mon May 19 16:21:11 2014 -0500 Bug 995603 - Ensure mouse-enter/exit events are sent to plugins as appropriate (reland after esr24-specific changes). r=mstange,masayuki a=sledru --- content/events/src/nsContentEventHandler.cpp | 25 ++++++-- content/events/src/nsContentEventHandler.h | 2 +- widget/cocoa/nsChildView.mm | 79 +++++++++----------------- widget/cocoa/nsCocoaWindow.h | 3 - widget/cocoa/nsCocoaWindow.mm | 30 ---------- 5 files changed, 46 insertions(+), 93 deletions(-) diff --git a/content/events/src/nsContentEventHandler.cpp b/content/events/src/nsContentEventHandler.cpp index 8b151cb..e989535 100644 --- a/content/events/src/nsContentEventHandler.cpp +++ b/content/events/src/nsContentEventHandler.cpp @@ -44,11 +44,8 @@ nsContentEventHandler::nsContentEventHandler( } nsresult -nsContentEventHandler::InitCommon() +nsContentEventHandler::InitBasic() { - if (mSelection) - return NS_OK; - NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE); // If text frame which has overflowing selection underline is dirty, @@ -58,11 +55,24 @@ nsContentEventHandler::InitCommon() // Flushing notifications can cause mPresShell to be destroyed (bug 577963). NS_ENSURE_TRUE(!mPresShell->IsDestroying(), NS_ERROR_FAILURE); + return NS_OK; +} + +nsresult +nsContentEventHandler::InitCommon() +{ + if (mSelection) { + return NS_OK; + } + + nsresult rv = InitBasic(); + NS_ENSURE_SUCCESS(rv, rv); + nsCopySupport::GetSelectionForCopy(mPresShell->GetDocument(), getter_AddRefs(mSelection)); nsCOMPtr<nsIDOMRange> firstRange; - nsresult rv = mSelection->GetRangeAt(0, getter_AddRefs(firstRange)); + rv = mSelection->GetRangeAt(0, getter_AddRefs(firstRange)); // This shell doesn't support selection. if (NS_FAILED(rv)) return NS_ERROR_NOT_AVAILABLE; @@ -860,10 +870,13 @@ nsContentEventHandler::OnQueryCharacterAtPoint(nsQueryContentEvent* aEvent) nsresult nsContentEventHandler::OnQueryDOMWidgetHittest(nsQueryContentEvent* aEvent) { - nsresult rv = Init(aEvent); + NS_ASSERTION(aEvent, "aEvent must not be null"); + + nsresult rv = InitBasic(); if (NS_FAILED(rv)) return rv; + aEvent->mSucceeded = false; aEvent->mReply.mWidgetIsHit = false; NS_ENSURE_TRUE(aEvent->widget, NS_ERROR_FAILURE); diff --git a/content/events/src/nsContentEventHandler.h b/content/events/src/nsContentEventHandler.h index 4c4f492..1624d35 100644 --- a/content/events/src/nsContentEventHandler.h +++ b/content/events/src/nsContentEventHandler.h @@ -66,7 +66,7 @@ protected: nsresult Init(nsQueryContentEvent* aEvent); nsresult Init(nsSelectionEvent* aEvent); - // InitCommon() is called from each Init(). + nsresult InitBasic(); nsresult InitCommon(); public: diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index aef01c7..6ced313 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2790,6 +2790,32 @@ NSEvent* gLastDragMouseDownEvent = nil; return mIsPluginView; } +- (NSView *)hitTest:(NSPoint)aPoint +{ + NSView* target = [super hitTest:aPoint]; + if ((target == self) && [self isPluginView] && mGeckoChild) { + nsAutoRetainCocoaObject kungFuDeathGrip(self); + + NSPoint cocoaLoc = [[self superview] convertPoint:aPoint toView:self]; + cocoaLoc.y = nsCocoaUtils::FlippedScreenY(cocoaLoc.y); + nsIntPoint widgetLoc = mGeckoChild->CocoaPointsToDevPixels(cocoaLoc) - + mGeckoChild->WidgetToScreenOffset(); + + nsQueryContentEvent hitTest(true, NS_QUERY_DOM_WIDGET_HITTEST, + mGeckoChild); + hitTest.InitForQueryDOMWidgetHittest(widgetLoc); + // This might destroy our widget. + mGeckoChild->DispatchWindowEvent(hitTest); + if (!mGeckoChild) { + return nil; + } + if (hitTest.mSucceeded && !hitTest.mReply.mWidgetIsHit) { + return nil; + } + } + return target; +} + // Are we processing an NSLeftMouseDown event that will fail to click through? // If so, we shouldn't focus or unfocus a plugin. - (BOOL)isInFailingLeftClickThrough @@ -4913,65 +4939,12 @@ static int32_t RoundUp(double aDouble) return !mGeckoChild->DispatchWindowEvent(geckoEvent); } -// Don't focus a plugin if the user has clicked on a DOM element above it. -// In this case the user has actually clicked on the plugin's ChildView -// (underneath the non-plugin DOM element). But we shouldn't allow the -// ChildView to be focused. See bug 627649. -- (BOOL)currentEventShouldFocusPlugin -{ - if (!mGeckoChild) - return NO; - - NSEvent* currentEvent = [NSApp currentEvent]; - if ([currentEvent type] != NSLeftMouseDown) - return YES; - - nsAutoRetainCocoaObject kungFuDeathGrip(self); - - // hitTest needs coordinates in device pixels - NSPoint eventLoc = nsCocoaUtils::ScreenLocationForEvent(currentEvent); - eventLoc.y = nsCocoaUtils::FlippedScreenY(eventLoc.y); - nsIntPoint widgetLoc = mGeckoChild->CocoaPointsToDevPixels(eventLoc) - - mGeckoChild->WidgetToScreenOffset(); - - nsQueryContentEvent hitTest(true, NS_QUERY_DOM_WIDGET_HITTEST, mGeckoChild); - hitTest.InitForQueryDOMWidgetHittest(widgetLoc); - // This might destroy our widget (and null out mGeckoChild). - mGeckoChild->DispatchWindowEvent(hitTest); - if (!mGeckoChild) - return NO; - if (hitTest.mSucceeded && !hitTest.mReply.mWidgetIsHit) - return NO; - - return YES; -} - -// Don't focus a plugin if we're in a left click-through that will fail (see -// [ChildView isInFailingLeftClickThrough] above). -- (BOOL)shouldFocusPlugin:(BOOL)getFocus -{ - if (!mGeckoChild) - return NO; - - nsCocoaWindow* windowWidget = mGeckoChild->GetXULWindowWidget(); - if (windowWidget && !windowWidget->ShouldFocusPlugin()) - return NO; - - if (getFocus && ![self currentEventShouldFocusPlugin]) - return NO; - - return YES; -} - // Returns NO if the plugin shouldn't be focused/unfocused. - (BOOL)updatePluginFocusStatus:(BOOL)getFocus { if (!mGeckoChild) return NO; - if (![self shouldFocusPlugin:getFocus]) - return NO; - if (mPluginEventModel == NPEventModelCocoa) { nsPluginEvent pluginEvent(true, NS_PLUGIN_FOCUS_EVENT, mGeckoChild); NPCocoaEvent cocoaEvent; diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h index ac434e0..dc5994671 100644 --- a/widget/cocoa/nsCocoaWindow.h +++ b/widget/cocoa/nsCocoaWindow.h @@ -316,9 +316,6 @@ public: void SetPopupWindowLevel(); - bool IsChildInFailingLeftClickThrough(NSView *aChild); - bool ShouldFocusPlugin(); - NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent); protected: diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm index b95c072..b435155 100644 --- a/widget/cocoa/nsCocoaWindow.mm +++ b/widget/cocoa/nsCocoaWindow.mm @@ -2051,36 +2051,6 @@ void nsCocoaWindow::SetPopupWindowLevel() } } -bool nsCocoaWindow::IsChildInFailingLeftClickThrough(NSView *aChild) -{ - if ([aChild isKindOfClass:[ChildView class]]) { - ChildView* childView = (ChildView*) aChild; - if ([childView isInFailingLeftClickThrough]) - return true; - } - NSArray* subviews = [aChild subviews]; - if (subviews) { - NSUInteger count = [subviews count]; - for (NSUInteger i = 0; i < count; ++i) { - NSView* aView = (NSView*) [subviews objectAtIndex:i]; - if (IsChildInFailingLeftClickThrough(aView)) - return true; - } - } - return false; -} - -// Don't focus a plugin if we're in a left click-through that will -// fail (see [ChildView isInFailingLeftClickThrough]). Called from -// [ChildView shouldFocusPlugin]. -bool nsCocoaWindow::ShouldFocusPlugin() -{ - if (!mWindow || IsChildInFailingLeftClickThrough([mWindow contentView])) - return false; - - return true; -} - NS_IMETHODIMP nsCocoaWindow::NotifyIME(NotificationToIME aNotification) {

1 0

[tor-browser/esr24] Bug 1005552 - Stop binding marquee event handlers. r=bz, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 2b2b6fb7d05b3d69cb80552d215652f7a64c26db Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Fri May 16 10:56:41 2014 -0700 Bug 1005552 - Stop binding marquee event handlers. r=bz, a=abillings These functions get invoked as event listeners, so we'll automatically get the proper |this|. The reason for the existing shenanigans was to work around bug 872772, which has now been fixed. --- layout/style/xbl-marquee/xbl-marquee.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/layout/style/xbl-marquee/xbl-marquee.xml b/layout/style/xbl-marquee/xbl-marquee.xml index 50e9644..3e7e3a4 100644 --- a/layout/style/xbl-marquee/xbl-marquee.xml +++ b/layout/style/xbl-marquee/xbl-marquee.xml @@ -264,8 +264,7 @@ // // NB: Make sure to wrap the constructor in parentheses to // deal with the weird precedence of |new| in JS. - var contentFn = new (XPCNativeWrapper.unwrap(window).Function)("event", aValue); - this["_on" + aName] = function(e) { return contentFn.call(this, e); }; + this["_on" + aName] = new (XPCNativeWrapper.unwrap(window.Function))("event", aValue); } catch(e) { return false;

1 0

[tor-browser/esr24] Backed out changeset 8d6f12da582e (bug 995603) for breakage. a=backout
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4dd86fb8cc6c06580682d9404cb250d2ec52c69a Author: Steven Michaud <smichaud(a)pobox.com> Date: Fri May 16 13:43:59 2014 -0500 Backed out changeset 8d6f12da582e (bug 995603) for breakage. a=backout --- content/events/src/nsContentEventHandler.cpp | 25 ++------- content/events/src/nsContentEventHandler.h | 2 +- widget/cocoa/nsChildView.mm | 78 +++++++++++++++++--------- widget/cocoa/nsCocoaWindow.h | 3 + widget/cocoa/nsCocoaWindow.mm | 30 ++++++++++ 5 files changed, 93 insertions(+), 45 deletions(-) diff --git a/content/events/src/nsContentEventHandler.cpp b/content/events/src/nsContentEventHandler.cpp index 03c0721..8b151cb 100644 --- a/content/events/src/nsContentEventHandler.cpp +++ b/content/events/src/nsContentEventHandler.cpp @@ -44,8 +44,11 @@ nsContentEventHandler::nsContentEventHandler( } nsresult -nsContentEventHandler::InitBasic() +nsContentEventHandler::InitCommon() { + if (mSelection) + return NS_OK; + NS_ENSURE_TRUE(mPresShell, NS_ERROR_NOT_AVAILABLE); // If text frame which has overflowing selection underline is dirty, @@ -55,24 +58,11 @@ nsContentEventHandler::InitBasic() // Flushing notifications can cause mPresShell to be destroyed (bug 577963). NS_ENSURE_TRUE(!mPresShell->IsDestroying(), NS_ERROR_FAILURE); - return NS_OK; -} - -nsresult -ContentEventHandler::InitCommon() -{ - if (mSelection) { - return NS_OK; - } - - nsresult rv = InitBasic(); - NS_ENSURE_SUCCESS(rv, rv); - nsCopySupport::GetSelectionForCopy(mPresShell->GetDocument(), getter_AddRefs(mSelection)); nsCOMPtr<nsIDOMRange> firstRange; - rv = mSelection->GetRangeAt(0, getter_AddRefs(firstRange)); + nsresult rv = mSelection->GetRangeAt(0, getter_AddRefs(firstRange)); // This shell doesn't support selection. if (NS_FAILED(rv)) return NS_ERROR_NOT_AVAILABLE; @@ -870,13 +860,10 @@ nsContentEventHandler::OnQueryCharacterAtPoint(nsQueryContentEvent* aEvent) nsresult nsContentEventHandler::OnQueryDOMWidgetHittest(nsQueryContentEvent* aEvent) { - NS_ASSERTION(aEvent, "aEvent must not be null"); - - nsresult rv = InitBasic(); + nsresult rv = Init(aEvent); if (NS_FAILED(rv)) return rv; - aEvent->mSucceeded = false; aEvent->mReply.mWidgetIsHit = false; NS_ENSURE_TRUE(aEvent->widget, NS_ERROR_FAILURE); diff --git a/content/events/src/nsContentEventHandler.h b/content/events/src/nsContentEventHandler.h index 1624d35..4c4f492 100644 --- a/content/events/src/nsContentEventHandler.h +++ b/content/events/src/nsContentEventHandler.h @@ -66,7 +66,7 @@ protected: nsresult Init(nsQueryContentEvent* aEvent); nsresult Init(nsSelectionEvent* aEvent); - nsresult InitBasic(); + // InitCommon() is called from each Init(). nsresult InitCommon(); public: diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index fe619e0..aef01c7 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2790,31 +2790,6 @@ NSEvent* gLastDragMouseDownEvent = nil; return mIsPluginView; } -- (NSView *)hitTest:(NSPoint)aPoint -{ - NSView* target = [super hitTest:aPoint]; - if ((target == self) && [self isPluginView] && mGeckoChild) { - nsAutoRetainCocoaObject kungFuDeathGrip(self); - - NSPoint cocoaLoc = [[self superview] convertPoint:aPoint toView:self]; - LayoutDeviceIntPoint widgetLoc = LayoutDeviceIntPoint::FromUntyped( - mGeckoChild->CocoaPointsToDevPixels(cocoaLoc)); - - WidgetQueryContentEvent hitTest(true, NS_QUERY_DOM_WIDGET_HITTEST, - mGeckoChild); - hitTest.InitForQueryDOMWidgetHittest(widgetLoc); - // This might destroy our widget. - mGeckoChild->DispatchWindowEvent(hitTest); - if (!mGeckoChild) { - return nil; - } - if (hitTest.mSucceeded && !hitTest.mReply.mWidgetIsHit) { - return nil; - } - } - return target; -} - // Are we processing an NSLeftMouseDown event that will fail to click through? // If so, we shouldn't focus or unfocus a plugin. - (BOOL)isInFailingLeftClickThrough @@ -4938,12 +4913,65 @@ static int32_t RoundUp(double aDouble) return !mGeckoChild->DispatchWindowEvent(geckoEvent); } +// Don't focus a plugin if the user has clicked on a DOM element above it. +// In this case the user has actually clicked on the plugin's ChildView +// (underneath the non-plugin DOM element). But we shouldn't allow the +// ChildView to be focused. See bug 627649. +- (BOOL)currentEventShouldFocusPlugin +{ + if (!mGeckoChild) + return NO; + + NSEvent* currentEvent = [NSApp currentEvent]; + if ([currentEvent type] != NSLeftMouseDown) + return YES; + + nsAutoRetainCocoaObject kungFuDeathGrip(self); + + // hitTest needs coordinates in device pixels + NSPoint eventLoc = nsCocoaUtils::ScreenLocationForEvent(currentEvent); + eventLoc.y = nsCocoaUtils::FlippedScreenY(eventLoc.y); + nsIntPoint widgetLoc = mGeckoChild->CocoaPointsToDevPixels(eventLoc) - + mGeckoChild->WidgetToScreenOffset(); + + nsQueryContentEvent hitTest(true, NS_QUERY_DOM_WIDGET_HITTEST, mGeckoChild); + hitTest.InitForQueryDOMWidgetHittest(widgetLoc); + // This might destroy our widget (and null out mGeckoChild). + mGeckoChild->DispatchWindowEvent(hitTest); + if (!mGeckoChild) + return NO; + if (hitTest.mSucceeded && !hitTest.mReply.mWidgetIsHit) + return NO; + + return YES; +} + +// Don't focus a plugin if we're in a left click-through that will fail (see +// [ChildView isInFailingLeftClickThrough] above). +- (BOOL)shouldFocusPlugin:(BOOL)getFocus +{ + if (!mGeckoChild) + return NO; + + nsCocoaWindow* windowWidget = mGeckoChild->GetXULWindowWidget(); + if (windowWidget && !windowWidget->ShouldFocusPlugin()) + return NO; + + if (getFocus && ![self currentEventShouldFocusPlugin]) + return NO; + + return YES; +} + // Returns NO if the plugin shouldn't be focused/unfocused. - (BOOL)updatePluginFocusStatus:(BOOL)getFocus { if (!mGeckoChild) return NO; + if (![self shouldFocusPlugin:getFocus]) + return NO; + if (mPluginEventModel == NPEventModelCocoa) { nsPluginEvent pluginEvent(true, NS_PLUGIN_FOCUS_EVENT, mGeckoChild); NPCocoaEvent cocoaEvent; diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h index dc5994671..ac434e0 100644 --- a/widget/cocoa/nsCocoaWindow.h +++ b/widget/cocoa/nsCocoaWindow.h @@ -316,6 +316,9 @@ public: void SetPopupWindowLevel(); + bool IsChildInFailingLeftClickThrough(NSView *aChild); + bool ShouldFocusPlugin(); + NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent); protected: diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm index b435155..b95c072 100644 --- a/widget/cocoa/nsCocoaWindow.mm +++ b/widget/cocoa/nsCocoaWindow.mm @@ -2051,6 +2051,36 @@ void nsCocoaWindow::SetPopupWindowLevel() } } +bool nsCocoaWindow::IsChildInFailingLeftClickThrough(NSView *aChild) +{ + if ([aChild isKindOfClass:[ChildView class]]) { + ChildView* childView = (ChildView*) aChild; + if ([childView isInFailingLeftClickThrough]) + return true; + } + NSArray* subviews = [aChild subviews]; + if (subviews) { + NSUInteger count = [subviews count]; + for (NSUInteger i = 0; i < count; ++i) { + NSView* aView = (NSView*) [subviews objectAtIndex:i]; + if (IsChildInFailingLeftClickThrough(aView)) + return true; + } + } + return false; +} + +// Don't focus a plugin if we're in a left click-through that will +// fail (see [ChildView isInFailingLeftClickThrough]). Called from +// [ChildView shouldFocusPlugin]. +bool nsCocoaWindow::ShouldFocusPlugin() +{ + if (!mWindow || IsChildInFailingLeftClickThrough([mWindow contentView])) + return false; + + return true; +} + NS_IMETHODIMP nsCocoaWindow::NotifyIME(NotificationToIME aNotification) {

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-315 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 629c9ae2a3c77466e9d348cf8e8b279682255b6f Author: ffxbld <none@none> Date: Sat May 17 03:13:45 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-315 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 3 +++ security/manager/boot/src/nsSTSPreloadList.inc | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 2e6f60f..c1694bd 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,4 +1,5 @@ admin.google.com: did not receive HSTS header +airbnb.com: did not receive HSTS header alpha.irccloud.com: could not connect to host anycoin.me: did not receive HSTS header api.mega.co.nz: could not connect to host @@ -20,6 +21,7 @@ checkout.google.com: did not receive HSTS header chrome-devtools-frontend.appspot.com: did not receive HSTS header chrome.google.com: did not receive HSTS header cloud.google.com: did not receive HSTS header +cloudns.com.au: could not connect to host code.google.com: did not receive HSTS header codereview.chromium.org: did not receive HSTS header crate.io: did not receive HSTS header @@ -105,6 +107,7 @@ talk.google.com: did not receive HSTS header talkgadget.google.com: did not receive HSTS header translate.googleapis.com: did not receive HSTS header uprotect.it: could not connect to host +usaa.com: did not receive HSTS header wallet.google.com: did not receive HSTS header webmail.mayfirst.org: did not receive HSTS header wepay.com: max-age too low: 2592000 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index abb6bf2..bde7a03 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1410602782560000); +const PRTime gPreloadListExpirationTime = INT64_C(1411207520608000); class nsSTSPreload { @@ -119,7 +119,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "luneta.nearbuysystems.com", false }, { "mail.de", true }, { "mailbox.org", false }, - { "makeyourlaws.org", false }, + { "makeyourlaws.org", true }, { "manage.zenpayroll.com", false }, { "manager.linode.com", false }, { "matteomarescotti.name", true }, @@ -131,6 +131,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "members.mayfirst.org", false }, { "members.nearlyfreespeech.net", false }, { "mnsure.org", true }, + { "mobile.usaa.com", false }, { "mudcrab.us", true }, { "my.onlime.ch", false }, { "my.xero.com", false }, @@ -181,6 +182,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "stocktrade.de", false }, { "stripe.com", true }, { "strongest-privacy.com", true }, + { "subrosa.io", true }, { "support.mayfirst.org", false }, { "surkatty.org", true }, { "tent.io", true }, @@ -195,6 +197,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "wiz.biz", true }, { "writeapp.me", false }, { "www.aclu.org", false }, + { "www.airbnb.com", true }, { "www.apollo-auto.com", true }, { "www.banking.co.at", false }, { "www.braintreepayments.com", false }, @@ -212,7 +215,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.irccloud.com", false }, { "www.linode.com", false }, { "www.lookout.com", false }, - { "www.makeyourlaws.org", false }, + { "www.makeyourlaws.org", true }, { "www.mydigipass.com", false }, { "www.mylookout.com", false }, { "www.noisebridge.net", false }, @@ -223,6 +226,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.therapynotes.com", false }, { "www.torproject.org", false }, { "www.twitter.com", false }, + { "www.usaa.com", false }, { "www.zenpayroll.com", false }, { "zenpayroll.com", false }, };

1 0