tbb-commits August 2014

tbb-commits@lists.torproject.org

3 participants
290 discussions

[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] 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 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 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 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] 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] 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] 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] 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] No bug, Automated HSTS preload list update from host bld-linux64-spot-126 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit cd05cbc3690324f656e43ff3b5ba2d5a0ae37514 Author: ffxbld <none@none> Date: Sat Apr 5 03:15:28 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-126 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 2 +- security/manager/boot/src/nsSTSPreloadList.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index ec727af..342aec9 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -34,7 +34,6 @@ email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header espra.com: could not connect to host -factor.cc: could not connect to host fatzebra.com.au: did not receive HSTS header fj.simple.com: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header @@ -45,6 +44,7 @@ googleplex.com: could not connect to host goto.google.com: did not receive HSTS header greplin.com: did not receive HSTS header groups.google.com: did not receive HSTS header +haste.ch: could not connect to host history.google.com: did not receive HSTS header hostedtalkgadget.google.com: did not receive HSTS header id.atlassian.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index b0d59de9..2f909b9 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(1406973929143000); +const PRTime gPreloadListExpirationTime = INT64_C(1407578787593000); class nsSTSPreload { @@ -130,6 +130,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "p.linode.com", false }, { "packagist.org", false }, { "passwd.io", true }, + { "passwordbox.com", false }, { "paste.linode.com", false }, { "pastebin.linode.com", false }, { "pay.gigahost.dk", true },

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits August 2014