diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 22bbf4a0f228..30c7f5accd53 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -284,9 +284,6 @@ function onLoadPageInfo() gStrings.notSet = gBundle.getString("notset"); gStrings.mediaImg = gBundle.getString("mediaImg"); gStrings.mediaBGImg = gBundle.getString("mediaBGImg"); - gStrings.mediaBorderImg = gBundle.getString("mediaBorderImg"); - gStrings.mediaListImg = gBundle.getString("mediaListImg"); - gStrings.mediaCursor = gBundle.getString("mediaCursor"); gStrings.mediaObject = gBundle.getString("mediaObject"); gStrings.mediaEmbed = gBundle.getString("mediaEmbed"); gStrings.mediaLink = gBundle.getString("mediaLink"); @@ -616,35 +613,13 @@ function addImage(url, type, alt, elem, isBg) function grabAll(elem) { - // check for images defined in CSS (e.g. background, borders), any node may have multiple + // check for background images, any node may have multiple var computedStyle = elem.ownerDocument.defaultView.getComputedStyle(elem, ""); - if (computedStyle) { - var addImgFunc = function (label, val) { - if (val.primitiveType == CSSPrimitiveValue.CSS_URI) { - addImage(val.getStringValue(), label, gStrings.notSet, elem, true); - } - else if (val.primitiveType == CSSPrimitiveValue.CSS_STRING) { - // This is for -moz-image-rect. - // TODO: Reimplement once bug 714757 is fixed - var strVal = val.getStringValue(); - if (strVal.search(/^.*url\(\"?/) > -1) { - url = strVal.replace(/^.*url\(\"?/,"").replace(/\"?\).*$/,""); - addImage(url, label, gStrings.notSet, elem, true); - } - } - else if (val.cssValueType == CSSValue.CSS_VALUE_LIST) { - // recursively resolve multiple nested CSS value lists - for (var i = 0; i < val.length; i++) - addImgFunc(label, val.item(i)); - } - }; - - addImgFunc(gStrings.mediaBGImg, computedStyle.getPropertyCSSValue("background-image")); - addImgFunc(gStrings.mediaBorderImg, computedStyle.getPropertyCSSValue("-moz-border-image")); - // TODO: support unprefixed "border-image" once bug 713643 is fixed. - addImgFunc(gStrings.mediaListImg, computedStyle.getPropertyCSSValue("list-style-image")); - addImgFunc(gStrings.mediaCursor, computedStyle.getPropertyCSSValue("cursor")); + Array.forEach(computedStyle.getPropertyCSSValue("background-image"), function (url) { + if (url.primitiveType == CSSPrimitiveValue.CSS_URI) + addImage(url.getStringValue(), gStrings.mediaBGImg, gStrings.notSet, elem, true); + }); } // one swi^H^H^Hif-else to rule them all diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in index a34238afb848..32cd5da92d84 100644 --- a/browser/base/content/test/Makefile.in +++ b/browser/base/content/test/Makefile.in @@ -118,7 +118,6 @@ _BROWSER_FILES = \ browser_bug441778.js \ browser_popupNotification.js \ browser_bug455852.js \ - browser_bug460146.js \ browser_bug462673.js \ browser_bug477014.js \ browser_bug479408.js \ diff --git a/browser/base/content/test/browser_bug460146.js b/browser/base/content/test/browser_bug460146.js deleted file mode 100644 index 3ddaae97e2f4..000000000000 --- a/browser/base/content/test/browser_bug460146.js +++ /dev/null @@ -1,51 +0,0 @@ -/* Check proper image url retrieval from all kinds of elements/styles */ - -function test() { - waitForExplicitFinish(); - - gBrowser.selectedTab = gBrowser.addTab(); - - gBrowser.selectedBrowser.addEventListener("load", function () { - gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true); - - var doc = gBrowser.contentDocument; - var pageInfo = BrowserPageInfo(doc, "mediaTab"); - - pageInfo.addEventListener("load", function () { - pageInfo.removeEventListener("load", arguments.callee, true); - pageInfo.onFinished.push(function () { - executeSoon(function () { - var imageTree = pageInfo.document.getElementById("imagetree"); - var imageRowsNum = imageTree.view.rowCount; - - ok(imageTree, "Image tree is null (media tab is broken)"); - - ok(imageRowsNum == 7, "Number of images listed: " + - imageRowsNum + ", should be 7"); - - pageInfo.close(); - gBrowser.removeCurrentTab(); - finish(); - }); - }); - }, true); - }, true); - - content.location = - "data:text/html," + - "" + - " " + - " Test for media tab" + - " " + // Icon - " " + - " " + // Background - " " + // Image - " " + - "
test
" + // Border - " test link" + // Cursor - " " + // Object - " " + - ""; -} diff --git a/browser/locales/en-US/chrome/browser/pageInfo.properties b/browser/locales/en-US/chrome/browser/pageInfo.properties index 3379c2272719..aa4ca0a61a31 100644 --- a/browser/locales/en-US/chrome/browser/pageInfo.properties +++ b/browser/locales/en-US/chrome/browser/pageInfo.properties @@ -51,9 +51,6 @@ mediaImg=Image mediaVideo=Video mediaAudio=Audio mediaBGImg=Background -mediaBorderImg=Border -mediaListImg=Bullet -mediaCursor=Cursor mediaObject=Object mediaEmbed=Embed mediaLink=Icon