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

Merge m-c to inbound.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-04-17 07:35:49 -04:00
commit 72ebe92d75
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/test/emulator.manifest
View File

@ -1,6 +1,6 @@
[{
"size": 634920651,
"digest": "731237d9fcd51637e1fdb7240f57d11f1bda18770025186c06ff72e960551c764bada3c43bae2347f716acd36492c2f4e6bb8eddd9ced7198cbcd8c994ea0705",
"size": 647503948,
"digest": "9ba4f195052e0d5eaae734375aed52f52b7b3337fa8caf01a61830529266e282be19697095c88135379c984d7242ec36b384cf81155176bb6527e6621f32eed3",
"algorithm": "sha512",
"filename": "emulator.zip"
}]

12
browser/base/content/nsContextMenu.js
View File

@ -396,7 +396,7 @@ nsContextMenu.prototype = {
this.showItem("context-media-showcontrols", onMedia && !this.target.controls);
this.showItem("context-media-hidecontrols", onMedia && this.target.controls);
this.showItem("context-video-fullscreen", this.onVideo && this.target.ownerDocument.mozFullScreenElement == null);
var statsShowing = this.onVideo && this.target.wrappedJSObject.mozMediaStatisticsShowing;
var statsShowing = this.onVideo && XPCNativeWrapper.unwrap(this.target).mozMediaStatisticsShowing;
this.showItem("context-video-showstats", this.onVideo && this.target.controls && !statsShowing);
this.showItem("context-video-hidestats", this.onVideo && this.target.controls && statsShowing);
@ -1505,14 +1505,10 @@ nsContextMenu.prototype = {
case "showcontrols":
media.setAttribute("controls", "true");
break;
case "showstats":
var event = document.createEvent("CustomEvent");
event.initCustomEvent("media-showStatistics", false, true, true);
media.dispatchEvent(event);
break;
case "hidestats":
var event = document.createEvent("CustomEvent");
event.initCustomEvent("media-showStatistics", false, true, false);
case "showstats":
var event = media.ownerDocument.createEvent("CustomEvent");
event.initCustomEvent("media-showStatistics", false, true, command == "showstats");
media.dispatchEvent(event);
break;
}

12
browser/config/mozconfigs/linux64/debug-static-analysis-clang Normal file
View File

@ -0,0 +1,12 @@
. "$topsrcdir/build/mozconfig.common"
ac_add_options --enable-debug
# Use Clang as specified in manifest
export CC="$topsrcdir/clang/bin/clang"
export CXX="$topsrcdir/clang/bin/clang++"
# Add the static checker
ac_add_options --enable-clang-plugin
. "$topsrcdir/build/mozconfig.common.override"

7
toolkit/content/widgets/videocontrols.xml
View File

@ -456,7 +456,7 @@
this.adjustControlSize();
// Preserve Statistics when toggling fullscreen mode due to bug 714071.
if (this.video.mozMediaStatisticsShowing)
if (XPCNativeWrapper.unwrap(this.video).mozMediaStatisticsShowing)
this.showStatistics(true);
this._handleCustomEventsBound = this.handleCustomEvents.bind(this);
@ -1094,14 +1094,15 @@
this.statsInterval = null;
}
let unwrappedVideo = XPCNativeWrapper.unwrap(this.video);
if (shouldShow) {
this.video.mozMediaStatisticsShowing = true;
unwrappedVideo.mozMediaStatisticsShowing = true;
this.statsOverlay.hidden = false;
this.statsInterval = setInterval(this.updateStats.bind(this), this.STATS_INTERVAL_MS);
this.updateStats();
} else {
delete this.video.mozMediaStatisticsShowing;
delete unwrappedVideo.mozMediaStatisticsShowing;
this.statsOverlay.hidden = true;
}
},