From 1b579c65ea7956bf4f9515712ff105b926954823 Mon Sep 17 00:00:00 2001 From: Raymond Lee Date: Thu, 18 Aug 2011 10:56:25 +0800 Subject: [PATCH 01/14] Bug 628887 - When in an expanded stack, arrow keys should only move between those r=tim --- browser/base/content/tabview/ui.js | 32 +++++++----- browser/base/content/test/tabview/Makefile.in | 1 + .../test/tabview/browser_tabview_bug628887.js | 50 +++++++++++++++++++ 3 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 browser/base/content/test/tabview/browser_tabview_bug628887.js diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js index 97783df5d96..d2f4e9309db 100644 --- a/browser/base/content/tabview/ui.js +++ b/browser/base/content/tabview/ui.js @@ -1130,18 +1130,26 @@ let UI = { function getClosestTabBy(norm) { if (!self.getActiveTab()) return null; - let centers = - [[item.bounds.center(), item] - for each(item in TabItems.getItems()) if (!item.parent || !item.parent.hidden)]; - let myCenter = self.getActiveTab().bounds.center(); - let matches = centers - .filter(function(item){return norm(item[0], myCenter)}) - .sort(function(a,b){ - return myCenter.distance(a[0]) - myCenter.distance(b[0]); - }); - if (matches.length > 0) - return matches[0][1]; - return null; + + let activeTab = self.getActiveTab(); + let activeTabGroup = activeTab.parent; + let myCenter = activeTab.bounds.center(); + let match; + + TabItems.getItems().forEach(function (item) { + if (!item.parent.hidden && + (!activeTabGroup.expanded || activeTabGroup.id == item.parent.id)) { + let itemCenter = item.bounds.center(); + + if (norm(itemCenter, myCenter)) { + let itemDist = myCenter.distance(itemCenter); + if (!match || match[0] > itemDist) + match = [itemDist, item]; + } + } + }); + + return match && match[1]; } let preventDefault = true; diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in index e25825362bc..d2aeb1d3311 100644 --- a/browser/base/content/test/tabview/Makefile.in +++ b/browser/base/content/test/tabview/Makefile.in @@ -120,6 +120,7 @@ _BROWSER_FILES = \ browser_tabview_bug628061.js \ browser_tabview_bug628165.js \ browser_tabview_bug628270.js \ + browser_tabview_bug628887.js \ browser_tabview_bug629189.js \ browser_tabview_bug629195.js \ browser_tabview_bug630102.js \ diff --git a/browser/base/content/test/tabview/browser_tabview_bug628887.js b/browser/base/content/test/tabview/browser_tabview_bug628887.js new file mode 100644 index 00000000000..78d0df16074 --- /dev/null +++ b/browser/base/content/test/tabview/browser_tabview_bug628887.js @@ -0,0 +1,50 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +function test() { + waitForExplicitFinish(); + + newWindowWithTabView(function(win) { + registerCleanupFunction(function() win.close()); + + let cw = win.TabView.getContentWindow(); + let groupItemOne = cw.GroupItems.groupItems[0]; + + let groupItemTwo = createGroupItemWithBlankTabs(win, 100, 100, 40, 2); + ok(groupItemTwo.isStacked(), "groupItem is now stacked"); + + is(win.gBrowser.tabs.length, 3, "There are three tabs"); + + // the focus should remain within the group after it's expanded + groupItemTwo.addSubscriber("expanded", function onExpanded() { + groupItemTwo.removeSubscriber("expanded", onExpanded); + + ok(groupItemTwo.expanded, "groupItemTwo is expanded"); + is(cw.UI.getActiveTab(), groupItemTwo.getChild(0), + "The first tab item in group item two is active in expanded mode"); + + EventUtils.synthesizeKey("VK_DOWN", {}, cw); + is(cw.UI.getActiveTab(), groupItemTwo.getChild(0), + "The first tab item is still active after pressing down key"); + + // the focus should goes to other group if the down arrow is pressed + groupItemTwo.addSubscriber("collapsed", function onExpanded() { + groupItemTwo.removeSubscriber("collapsed", onExpanded); + + ok(!groupItemTwo.expanded, "groupItemTwo is not expanded"); + is(cw.UI.getActiveTab(), groupItemTwo.getChild(0), + "The first tab item is active in group item two in collapsed mode"); + + EventUtils.synthesizeKey("VK_DOWN", {}, cw); + is(cw.UI.getActiveTab(), groupItemOne.getChild(0), + "The first tab item in group item one is active after pressing down key"); + + finish(); + }); + + groupItemTwo.collapse(); + }); + + groupItemTwo.expand(); + }); +} From df09afc14e4f95d47896cc94a0ccf2d4ed26279d Mon Sep 17 00:00:00 2001 From: Tim Taubert Date: Wed, 24 Aug 2011 13:38:17 +0200 Subject: [PATCH 02/14] Bug 679853 - switching from private browsing does not show panorama if it was open before; r=dietrich --- browser/base/content/tabview/ui.js | 10 +++--- browser/base/content/test/tabview/Makefile.in | 1 + .../test/tabview/browser_tabview_bug679853.js | 32 +++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 browser/base/content/test/tabview/browser_tabview_bug679853.js diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js index d2f4e9309db..08cbbb66435 100644 --- a/browser/base/content/tabview/ui.js +++ b/browser/base/content/tabview/ui.js @@ -713,7 +713,6 @@ let UI = { if (data == "enter" || data == "exit") { hideSearch(); self._privateBrowsing.transitionMode = data; - self.storageBusy(); } } else if (topic == "private-browsing-transition-complete") { // We use .transitionMode here, as aData is empty. @@ -722,7 +721,6 @@ let UI = { self.showTabView(false); self._privateBrowsing.transitionMode = ""; - self.storageReady(); } } @@ -869,8 +867,12 @@ let UI = { this._currentTab = tab; if (this.isTabViewVisible()) { - if (!this.restoredClosedTab && this._lastOpenedTab == tab && - tab._tabViewTabItem) { + // We want to zoom in if: + // 1) we didn't just restore a tab via Ctrl+Shift+T + // 2) we're not in the middle of switching from/to private browsing + // 3) the currently selected tab is the last created tab and has a tabItem + if (!this.restoredClosedTab && !this._privateBrowsing.transitionMode && + this._lastOpenedTab == tab && tab._tabViewTabItem) { tab._tabViewTabItem.zoomIn(true); this._lastOpenedTab = null; return; diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in index d2aeb1d3311..972fa2263c1 100644 --- a/browser/base/content/test/tabview/Makefile.in +++ b/browser/base/content/test/tabview/Makefile.in @@ -155,6 +155,7 @@ _BROWSER_FILES = \ browser_tabview_bug669694.js \ browser_tabview_bug673196.js \ browser_tabview_bug673729.js \ + browser_tabview_bug679853.js \ browser_tabview_click_group.js \ browser_tabview_dragdrop.js \ browser_tabview_exit_button.js \ diff --git a/browser/base/content/test/tabview/browser_tabview_bug679853.js b/browser/base/content/test/tabview/browser_tabview_bug679853.js new file mode 100644 index 00000000000..59cb2d66c69 --- /dev/null +++ b/browser/base/content/test/tabview/browser_tabview_bug679853.js @@ -0,0 +1,32 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +function test() { + waitForExplicitFinish(); + + // clean up after ourselves + registerCleanupFunction(function () { + while (gBrowser.tabs.length > 1) + gBrowser.removeTab(gBrowser.tabs[1]); + + hideTabView(); + }); + + // select the new tab + gBrowser.selectedTab = gBrowser.addTab(); + + showTabView(function () { + // enter private browsing mode + togglePrivateBrowsing(function () { + ok(!TabView.isVisible(), "tabview is hidden"); + + showTabView(function () { + // leave private browsing mode + togglePrivateBrowsing(function () { + ok(TabView.isVisible(), "tabview is visible"); + hideTabView(finish); + }); + }); + }); + }); +} From cbf95f645c5d61b0066a68df4861027f7be146ba Mon Sep 17 00:00:00 2001 From: Raymond Lee Date: Tue, 23 Aug 2011 22:48:53 +0800 Subject: [PATCH 03/14] Bug 674794 - favicons of app tabs aren't updated on Panorama r=tim --- browser/base/content/tabview/ui.js | 12 ++++++++---- .../test/tabview/browser_tabview_bug600645.js | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js index 08cbbb66435..21fa630a902 100644 --- a/browser/base/content/tabview/ui.js +++ b/browser/base/content/tabview/ui.js @@ -1623,11 +1623,15 @@ let UI = { getFavIconUrlForTab: function UI_getFavIconUrlForTab(tab) { let url; - // use the tab image if it doesn't start with http e.g. data:image/png, chrome:// - if (tab.image && !(/^https?:/.test(tab.image))) - url = tab.image; - else + if (tab.image) { + // if starts with http/https, fetch icon from favicon service via the moz-anno protocal + if (/^https?:/.test(tab.image)) + url = gFavIconService.getFaviconLinkForIcon(gWindow.makeURI(tab.image)).spec; + else + url = tab.image; + } else { url = gFavIconService.getFaviconImageForPage(tab.linkedBrowser.currentURI).spec; + } return url; }, diff --git a/browser/base/content/test/tabview/browser_tabview_bug600645.js b/browser/base/content/test/tabview/browser_tabview_bug600645.js index 7bb13d7b7db..8ee342e38ce 100644 --- a/browser/base/content/test/tabview/browser_tabview_bug600645.js +++ b/browser/base/content/test/tabview/browser_tabview_bug600645.js @@ -40,8 +40,18 @@ function onTabViewWindowLoaded() { // fired, a delay is used here to avoid the test code run before the browser // code. executeSoon(function() { - is($icon.attr("src"), fi.defaultFavicon.spec, - "The icon is showing the default fav icon"); + let iconSrc = $icon.attr("src"); + let hasData = true; + try { + fi.getFaviconDataAsDataURL(iconSrc); + } catch(e) { + hasData = false; + } + ok(!hasData, "The icon src doesn't return any data"); + // with moz-anno:favicon automatically redirects to the default favIcon + // if the given url is invalid + ok(/^moz-anno:favicon:/.test(iconSrc), + "The icon url starts with moz-anno:favicon so the default fav icon would be displayed"); // clean up gBrowser.removeTab(newTab); From db845aa75b6459bcc8d0eaffcf1c4864ef6e4caf Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Wed, 24 Aug 2011 11:31:29 -0400 Subject: [PATCH 04/14] Bug 680816: XHR cannot be reused with responseType='arraybuffer'. r=sicking --- content/base/src/nsXMLHttpRequest.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index dc6c724fedd..34c7d352306 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -1728,6 +1728,7 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt) mResponseBody.Truncate(); mResponseBodyUnicode.SetIsVoid(PR_TRUE); mResponseBlob = nsnull; + mResultArrayBuffer = nsnull; // Set up responseXML PRBool parseBody = mResponseType == XML_HTTP_RESPONSE_TYPE_DEFAULT || From 9c11f7627d0a22086949a71365f32221da1cb143 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Wed, 24 Aug 2011 12:33:31 -0400 Subject: [PATCH 05/14] Bug 680816: Test --- content/base/test/test_XHR.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/content/base/test/test_XHR.html b/content/base/test/test_XHR.html index 8243bb704bd..b750f871546 100644 --- a/content/base/test/test_XHR.html +++ b/content/base/test/test_XHR.html @@ -121,6 +121,17 @@ ab = xhr.response; ok(ab != null, "should have a non-null arraybuffer"); arraybuffer_equals_to(ab, "hello pass\n"); +// test reusing the same XHR (Bug 680816) +xhr.open("GET", 'file_XHR_binary1.bin', false); +xhr.responseType = 'arraybuffer'; +xhr.send(null); +is(xhr.status, 200, "wrong status"); +ab2 = xhr.response; +ok(ab2 != null, "should have a non-null arraybuffer"); +ok(ab2 != ab, "arraybuffer on XHR reuse should be distinct"); +arraybuffer_equals_to(ab, "hello pass\n"); +arraybuffer_equals_to(ab2, "\xaa\xee\0\x03\xff\xff\xff\xff\xbb\xbb\xbb\xbb"); + // with a binary file xhr = new XMLHttpRequest(); xhr.open("GET", 'file_XHR_binary1.bin', false); From 57859353b234f4199543c78adfd7d9a930105fb2 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Wed, 24 Aug 2011 13:46:53 -0400 Subject: [PATCH 06/14] Bug 681688: Outparamdel nsXMLHttpRequest::GetLoadGroup. r=smaug --- content/base/src/nsXMLHttpRequest.cpp | 18 +++++++----------- content/base/src/nsXMLHttpRequest.h | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 34c7d352306..b72e5d3f69f 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -1230,23 +1230,20 @@ nsXMLHttpRequest::GetResponseHeader(const nsACString& header, return rv; } -nsresult -nsXMLHttpRequest::GetLoadGroup(nsILoadGroup **aLoadGroup) +already_AddRefed +nsXMLHttpRequest::GetLoadGroup() const { - NS_ENSURE_ARG_POINTER(aLoadGroup); - *aLoadGroup = nsnull; - if (mState & XML_HTTP_REQUEST_BACKGROUND) { - return NS_OK; + return nsnull; } nsCOMPtr doc = nsContentUtils::GetDocumentFromScriptContext(mScriptContext); if (doc) { - *aLoadGroup = doc->GetDocumentLoadGroup().get(); // already_AddRefed + return doc->GetDocumentLoadGroup(); } - return NS_OK; + return nsnull; } nsresult @@ -1493,8 +1490,7 @@ nsXMLHttpRequest::Open(const nsACString& method, const nsACString& url, // When we are called from JS we can find the load group for the page, // and add ourselves to it. This way any pending requests // will be automatically aborted if the user leaves the page. - nsCOMPtr loadGroup; - GetLoadGroup(getter_AddRefs(loadGroup)); + nsCOMPtr loadGroup = GetLoadGroup(); // get Content Security Policy from principal to pass into channel nsCOMPtr channelPolicy; @@ -2076,7 +2072,7 @@ GetRequestBody(nsIVariant* aBody, nsIInputStream** aResult, // nsIInputStream? nsCOMPtr stream = do_QueryInterface(supports); if (stream) { - *aResult = stream.forget().get(); + stream.forget(aResult); aCharset.Truncate(); return NS_OK; diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h index a08f6da2dd4..1bef072d90e 100644 --- a/content/base/src/nsXMLHttpRequest.h +++ b/content/base/src/nsXMLHttpRequest.h @@ -214,7 +214,7 @@ protected: // Change the state of the object with this. The broadcast argument // determines if the onreadystatechange listener should be called. nsresult ChangeState(PRUint32 aState, PRBool aBroadcast = PR_TRUE); - nsresult GetLoadGroup(nsILoadGroup **aLoadGroup); + already_AddRefed GetLoadGroup() const; nsIURI *GetBaseURI(); nsresult RemoveAddEventListener(const nsAString& aType, From f17404327ff2139a15e189131e6659ec59b27c58 Mon Sep 17 00:00:00 2001 From: Matheus Kerschbaum Date: Thu, 25 Aug 2011 02:18:22 +0100 Subject: [PATCH 07/14] Bug 403616 - Remove --enable-application=standalone build option. r=callek --- configure.in | 10 +--------- js/src/xpconnect/loader/mozJSLoaderUtils.cpp | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/configure.in b/configure.in index 93806e05ff0..bef3fd3f497 100644 --- a/configure.in +++ b/configure.in @@ -4797,9 +4797,7 @@ MOZ_ARG_ENABLE_STRING(application, xulrunner content/xslt (Standalone Transformiix XSLT) netwerk (Standalone Necko) - tools/update-packaging (AUS-related packaging tools) - standalone (use this for standalone - xpcom/xpconnect or to manually drive a build)], + tools/update-packaging (AUS-related packaging tools)], [ MOZ_BUILD_APP=$enableval ] ) MOZ_ARG_WITH_STRING(xulrunner-stub-name, @@ -4877,12 +4875,6 @@ content/xslt) AC_DEFINE(TX_EXE) ;; -standalone) - MOZ_APP_NAME=mozilla - MOZ_APP_DISPLAYNAME=Mozilla - MOZ_APP_VERSION=$MOZILLA_VERSION - ;; - esac AC_SUBST(MOZ_BUILD_APP) diff --git a/js/src/xpconnect/loader/mozJSLoaderUtils.cpp b/js/src/xpconnect/loader/mozJSLoaderUtils.cpp index 0f77b8786f2..b42111a08e3 100644 --- a/js/src/xpconnect/loader/mozJSLoaderUtils.cpp +++ b/js/src/xpconnect/loader/mozJSLoaderUtils.cpp @@ -35,8 +35,6 @@ * * ***** END LICENSE BLOCK ***** */ -#if !defined(XPCONNECT_STANDALONE) - #include "nsAutoPtr.h" #include "nsScriptLoader.h" @@ -191,5 +189,3 @@ WriteCachedScript(StartupCache* cache, nsACString &uri, JSContext *cx, JSObject rv = cache->PutBuffer(PromiseFlatCString(uri).get(), buf, len); return rv; } - -#endif /* XPCONNECT_STANDALONE */ From e112e2044feb368f3ecb936dede6973829e7df16 Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Wed, 24 Aug 2011 18:34:00 -0700 Subject: [PATCH 08/14] Bug 462117 - Reducing the number of visible controls when the video is too small. r=dolske --- toolkit/content/widgets/videocontrols.css | 20 ++++++++++++++++ toolkit/content/widgets/videocontrols.xml | 29 +++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/toolkit/content/widgets/videocontrols.css b/toolkit/content/widgets/videocontrols.css index b3ef938fb82..9bbbd279f4d 100644 --- a/toolkit/content/widgets/videocontrols.css +++ b/toolkit/content/widgets/videocontrols.css @@ -53,3 +53,23 @@ .statusOverlay[fadeout] { opacity: 0; } + +.controlBar[sizemode="hidden"], +.controlBar[sizemode="small"] .durationBox, +.controlBar[sizemode="small"] .durationLabel, +.controlBar[sizemode="small"] .positionLabel { + visibility: collapse; +} + +.controlBar[sizemode="small"] .scrubberStack { + visibility: hidden; +} + +.controlBar[sizemode="small"] .scrubberStack > * { + min-width: 0; + width: 0; + padding-left: 0; + padding-right: 0; + margin-left: 0; + margin-right: 0; +} diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml index cbbb04ce169..ed2364bb2a6 100644 --- a/toolkit/content/widgets/videocontrols.xml +++ b/toolkit/content/widgets/videocontrols.xml @@ -860,6 +860,32 @@ if (this.debug) dump("videoctl: " + msg + "\n"); }, + + adjustControlSize : function adjustControlSize() { + let videoHeight = this.video.clientHeight; + let videoWidth = this.video.clientWidth; + + // The scrubber has |flex=1|, therefore |minimumScrubberWidth| + // was generated by empirical testing. + let minimumScrubberWidth = 25; + let minWidthAllControls = this.playButton.clientWidth + + minimumScrubberWidth + + this.durationLabel.clientWidth + + this.muteButton.clientWidth; + let minimumHeightForControlBar = this.controlBar.clientHeight; + + let sizeMode = "normal"; + if (videoHeight < minimumHeightForControlBar) { + sizeMode = "hidden"; + } else { + var minWidthOnlyPlayPause = this.playButton.clientWidth + this.muteButton.clientWidth; + if (videoWidth < minWidthOnlyPlayPause) + sizeMode = "hidden"; + else if (videoWidth < minWidthAllControls) + sizeMode = "small"; + } + this.controlBar.setAttribute("sizemode", sizeMode); + }, init : function (binding) { this.video = binding.parentNode; @@ -919,6 +945,9 @@ this.video.setAttribute("tabindex", 0); this.video.addEventListener("keypress", function (e) { self.keyHandler(e) }, false); + // An event handler for |onresize| should be added when bug 227495 is fixed. + self.adjustControlSize(); + this.log("--- videocontrols initialized ---"); } }) ]]> From a396c7ce02929a6cb7359b26de0dabdc53c346ff Mon Sep 17 00:00:00 2001 From: Blair McBride Date: Thu, 25 Aug 2011 17:49:46 +1200 Subject: [PATCH 09/14] Backed out changeset 6fd779fb622d due to orange --- toolkit/content/widgets/videocontrols.css | 20 ---------------- toolkit/content/widgets/videocontrols.xml | 29 ----------------------- 2 files changed, 49 deletions(-) diff --git a/toolkit/content/widgets/videocontrols.css b/toolkit/content/widgets/videocontrols.css index 9bbbd279f4d..b3ef938fb82 100644 --- a/toolkit/content/widgets/videocontrols.css +++ b/toolkit/content/widgets/videocontrols.css @@ -53,23 +53,3 @@ .statusOverlay[fadeout] { opacity: 0; } - -.controlBar[sizemode="hidden"], -.controlBar[sizemode="small"] .durationBox, -.controlBar[sizemode="small"] .durationLabel, -.controlBar[sizemode="small"] .positionLabel { - visibility: collapse; -} - -.controlBar[sizemode="small"] .scrubberStack { - visibility: hidden; -} - -.controlBar[sizemode="small"] .scrubberStack > * { - min-width: 0; - width: 0; - padding-left: 0; - padding-right: 0; - margin-left: 0; - margin-right: 0; -} diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml index ed2364bb2a6..cbbb04ce169 100644 --- a/toolkit/content/widgets/videocontrols.xml +++ b/toolkit/content/widgets/videocontrols.xml @@ -860,32 +860,6 @@ if (this.debug) dump("videoctl: " + msg + "\n"); }, - - adjustControlSize : function adjustControlSize() { - let videoHeight = this.video.clientHeight; - let videoWidth = this.video.clientWidth; - - // The scrubber has |flex=1|, therefore |minimumScrubberWidth| - // was generated by empirical testing. - let minimumScrubberWidth = 25; - let minWidthAllControls = this.playButton.clientWidth + - minimumScrubberWidth + - this.durationLabel.clientWidth + - this.muteButton.clientWidth; - let minimumHeightForControlBar = this.controlBar.clientHeight; - - let sizeMode = "normal"; - if (videoHeight < minimumHeightForControlBar) { - sizeMode = "hidden"; - } else { - var minWidthOnlyPlayPause = this.playButton.clientWidth + this.muteButton.clientWidth; - if (videoWidth < minWidthOnlyPlayPause) - sizeMode = "hidden"; - else if (videoWidth < minWidthAllControls) - sizeMode = "small"; - } - this.controlBar.setAttribute("sizemode", sizeMode); - }, init : function (binding) { this.video = binding.parentNode; @@ -945,9 +919,6 @@ this.video.setAttribute("tabindex", 0); this.video.addEventListener("keypress", function (e) { self.keyHandler(e) }, false); - // An event handler for |onresize| should be added when bug 227495 is fixed. - self.adjustControlSize(); - this.log("--- videocontrols initialized ---"); } }) ]]> From c0c1c453f2df3d375f9828d8cfbf84aa945aac95 Mon Sep 17 00:00:00 2001 From: Blair McBride Date: Thu, 25 Aug 2011 17:50:43 +1200 Subject: [PATCH 10/14] Bug 678761 - Add-on selection UI footer may not always look good on non-aero themes. r=dao --- .../mozapps/extensions/selectAddons-aero.css | 3 +++ .../winstripe/mozapps/extensions/selectAddons.css | 13 +++++++++++-- toolkit/themes/winstripe/mozapps/jar.mn | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 toolkit/themes/winstripe/mozapps/extensions/selectAddons-aero.css diff --git a/toolkit/themes/winstripe/mozapps/extensions/selectAddons-aero.css b/toolkit/themes/winstripe/mozapps/extensions/selectAddons-aero.css new file mode 100644 index 00000000000..60dd9f5f944 --- /dev/null +++ b/toolkit/themes/winstripe/mozapps/extensions/selectAddons-aero.css @@ -0,0 +1,3 @@ +%define WINSTRIPE_AERO +%include selectAddons.css +%undef WINSTRIPE_AERO diff --git a/toolkit/themes/winstripe/mozapps/extensions/selectAddons.css b/toolkit/themes/winstripe/mozapps/extensions/selectAddons.css index 6c173c042c2..0933ee0af2d 100644 --- a/toolkit/themes/winstripe/mozapps/extensions/selectAddons.css +++ b/toolkit/themes/winstripe/mozapps/extensions/selectAddons.css @@ -188,12 +188,21 @@ #footer { padding: 15px 12px; - background-color: #f1f5fb; - box-shadow: 0px 1px 2px rgb(204,214,234) inset; } .progress-label, #footer-label { +%ifdef WINSTRIPE_AERO font-style: italic; +%endif color: GrayText; } + +%ifdef WINSTRIPE_AERO +@media all and (-moz-windows-default-theme) { + #footer { + background-color: #f1f5fb; + box-shadow: 0px 1px 2px rgb(204,214,234) inset; + } +} +%endif diff --git a/toolkit/themes/winstripe/mozapps/jar.mn b/toolkit/themes/winstripe/mozapps/jar.mn index ea68e8860cf..829975fe212 100644 --- a/toolkit/themes/winstripe/mozapps/jar.mn +++ b/toolkit/themes/winstripe/mozapps/jar.mn @@ -86,7 +86,7 @@ toolkit.jar: skin/classic/aero/mozapps/extensions/about.css (extensions/about.css) skin/classic/aero/mozapps/extensions/blocklist.css (extensions/blocklist.css) * skin/classic/aero/mozapps/extensions/extensions.css (extensions/extensions-aero.css) -* skin/classic/aero/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) +* skin/classic/aero/mozapps/extensions/selectAddons.css (extensions/selectAddons-aero.css) skin/classic/aero/mozapps/extensions/update.css (extensions/update.css) skin/classic/aero/mozapps/extensions/extensions.svg (extensions/extensions.svg) skin/classic/aero/mozapps/extensions/themeGeneric.png (extensions/themeGeneric-aero.png) From 6b53273859635ceb707fab918329e51e75843288 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 25 Aug 2011 10:45:53 +0200 Subject: [PATCH 11/14] Bug 681615 - Move a couple of tests from content/html/content/test to content/html/content/test/forms; r=mounir --HG-- rename : content/html/content/test/test_bug555840.html => content/html/content/test/forms/test_datalist_element.html rename : content/html/content/test/test_bug556007.html => content/html/content/test/forms/test_input_list_attribute.html rename : content/html/content/test/test_bug345624-2.html => content/html/content/test/forms/test_maxlength_attribute.html rename : content/html/content/test/test_bug345624-1.html => content/html/content/test/forms/test_validation.html --- content/html/content/test/Makefile.in | 5 -- content/html/content/test/forms/Makefile.in | 4 ++ .../test_datalist_element.html} | 52 ++++++++++++---- .../test_input_list_attribute.html} | 0 .../test_maxlength_attribute.html} | 6 +- .../test_validation.html} | 0 content/html/content/test/test_bug595457.html | 60 ------------------- 7 files changed, 49 insertions(+), 78 deletions(-) rename content/html/content/test/{test_bug555840.html => forms/test_datalist_element.html} (63%) rename content/html/content/test/{test_bug556007.html => forms/test_input_list_attribute.html} (100%) rename content/html/content/test/{test_bug345624-2.html => forms/test_maxlength_attribute.html} (93%) rename content/html/content/test/{test_bug345624-1.html => forms/test_validation.html} (100%) delete mode 100644 content/html/content/test/test_bug595457.html diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in index 6d89b095523..e468700fab6 100644 --- a/content/html/content/test/Makefile.in +++ b/content/html/content/test/Makefile.in @@ -197,8 +197,6 @@ _TEST_FILES = \ test_bug573969.html \ test_bug549475.html \ test_bug585508.html \ - test_bug345624-1.html \ - test_bug345624-2.html \ test_bug561640.html \ test_bug566064.html \ test_bug582412-1.html \ @@ -213,7 +211,6 @@ _TEST_FILES = \ test_bug590353-1.html \ test_bug590353-2.html \ test_bug593689.html \ - test_bug555840.html \ test_bug561636.html \ test_bug590363.html \ test_bug557628.html \ @@ -221,7 +218,6 @@ _TEST_FILES = \ test_bug595429.html \ test_bug595447.html \ test_bug595449.html \ - test_bug595457.html \ test_bug557087-1.html \ test_bug557087-2.html \ test_bug557087-3.html \ @@ -234,7 +230,6 @@ _TEST_FILES = \ test_bug596350.html \ test_bug598833-1.html \ test_bug600155.html \ - test_bug556007.html \ test_bug606817.html \ test_bug297761.html \ file_bug297761.html \ diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in index 53d4906e2bc..8d13ad9af6c 100644 --- a/content/html/content/test/forms/Makefile.in +++ b/content/html/content/test/forms/Makefile.in @@ -48,6 +48,7 @@ _TEST_FILES = \ test_save_restore_radio_groups.html \ test_mozistextfield.html \ test_input_attributes_reflection.html \ + test_input_list_attribute.html \ test_input_email.html \ test_input_url.html \ test_pattern_attribute.html \ @@ -59,6 +60,9 @@ _TEST_FILES = \ test_output_element.html \ test_button_attributes_reflection.html \ test_textarea_attributes_reflection.html \ + test_validation.html \ + test_maxlength_attribute.html \ + test_datalist_element.html \ $(NULL) libs:: $(_TEST_FILES) diff --git a/content/html/content/test/test_bug555840.html b/content/html/content/test/forms/test_datalist_element.html similarity index 63% rename from content/html/content/test/test_bug555840.html rename to content/html/content/test/forms/test_datalist_element.html index 6667700a741..67c8e854a2e 100644 --- a/content/html/content/test/test_bug555840.html +++ b/content/html/content/test/forms/test_datalist_element.html @@ -1,15 +1,11 @@ - - Test for Bug 555840 + Test for the datalist element -Mozilla Bug 555840