From 6f117461a51f3ffea4ca5e51164b0caa198457e4 Mon Sep 17 00:00:00 2001 From: oliver Date: Fri, 12 Oct 2007 14:21:36 +0000 Subject: [PATCH] 2007-10-01 Eric Seidel Reviewed by Oliver Hunt. SVG Subresources will not be saved when creating WebArchives http://bugs.webkit.org/show_bug.cgi?id=15280 Implement _subresourceURLs methods for more SVGElement types more such methods will be needed as we add support for other external references (such as use, mpath, tref, etc.) * DOM/WebDOMOperations.mm: (-[DOMSVGScriptElement _subresourceURLs]): added. (-[DOMSVGCursorElement _subresourceURLs]): added. (-[DOMSVGFEImageElement _subresourceURLs]): added. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@26461 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 13 ++ .../webarchive/resources/green-checker.png | Bin 0 -> 5552 bytes .../resources/svg-script-subresources.js | 1 + .../svg-cursor-subresources-expected.txt | 195 ++++++++++++++++++ .../webarchive/svg-cursor-subresources.svg | 10 + .../svg-feimage-subresources-expected.txt | 193 +++++++++++++++++ .../webarchive/svg-feimage-subresources.svg | 10 + .../svg-script-subresouces-expected.txt | 49 +++++ .../svg/webarchive/svg-script-subresouces.svg | 8 + .../test-xml-stylesheet-expected.txt | 20 +- WebKit/ChangeLog | 16 ++ WebKit/DOM/WebDOMOperations.mm | 27 +++ 12 files changed, 531 insertions(+), 11 deletions(-) create mode 100644 LayoutTests/svg/webarchive/resources/green-checker.png create mode 100644 LayoutTests/svg/webarchive/resources/svg-script-subresources.js create mode 100644 LayoutTests/svg/webarchive/svg-cursor-subresources-expected.txt create mode 100644 LayoutTests/svg/webarchive/svg-cursor-subresources.svg create mode 100644 LayoutTests/svg/webarchive/svg-feimage-subresources-expected.txt create mode 100644 LayoutTests/svg/webarchive/svg-feimage-subresources.svg create mode 100644 LayoutTests/svg/webarchive/svg-script-subresouces-expected.txt create mode 100644 LayoutTests/svg/webarchive/svg-script-subresouces.svg diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 2a80a36203f8..c26e168d3ace 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,16 @@ +2007-10-01 Eric Seidel + + Reviewed by Oliver Hunt. + + SVG Subresources will not be saved when creating WebArchives + http://bugs.webkit.org/show_bug.cgi?id=15280 + + * svg/webarchive/resources/green-checker.png: Added. + * svg/webarchive/resources/svg-script-subresources.js: Added. + * svg/webarchive/svg-cursor-subresources.svg: Added. + * svg/webarchive/svg-feimage-subresources.svg: Added. + * svg/webarchive/svg-script-subresouces.svg: Added. + 2007-10-01 Eric Seidel Reviewed by Oliver Hunt. diff --git a/LayoutTests/svg/webarchive/resources/green-checker.png b/LayoutTests/svg/webarchive/resources/green-checker.png new file mode 100644 index 0000000000000000000000000000000000000000..5f24d7c51a8f59151f99809f2b78bd601cbe90a7 GIT binary patch literal 5552 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 + + + + WebMainResource + + WebResourceData + + PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5z + OnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICA8c2Ny + aXB0PgogICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKICAg + ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wRE9NQXNXZWJBcmNoaXZl + KCk7CiAgPC9zY3JpcHQ+CiAgPGN1cnNvciBpZD0ibXljdXJzb3IiIHhsaW5r + OmhyZWY9InJlc291cmNlcy9ncmVlbi1jaGVja2VyLnBuZyIvPgogIDxyZWN0 + IHN0eWxlPSJjdXJzb3I6IHVybCgjbXljdXJzb3IpIiB3aWR0aD0iMTAwIiBo + ZWlnaHQ9IjEwMCIgZmlsbD0id2hpdGUiIHN0cm9rZT0iYmx1ZSIvPgogIAog + IDx0ZXh0IHg9IjEwIiB5PSIxMzAiPkhvdmVyIG92ZXIgdGhlIHJlY3QsIHlv + dSBzaG91bGQgc2VlIGEgKGxhcmdlKSBjdXN0b20gY3Vyc29yPC90ZXh0Pgo8 + L3N2Zz4= + + WebResourceFrameName + + WebResourceMIMEType + image/svg+xml + WebResourceTextEncodingName + UTF-8 + WebResourceURL + file:///LayoutTests/svg/webarchive/svg-cursor-subresources.svg + + WebSubresources + + + WebResourceData + + iVBORw0KGgoAAAANSUhEUgAAAfcAAAGaCAIAAACdfZ30AAAKdWlD + Q1BJQ0MgUHJvZmlsZQAAeJyVlndQk+kWxs+XL5WEFhJ6Cb136UWq + gNKLNFEpEVgCCRAUVC4qNsS+oqgIi1gRAaUp3YKFojQRaaKCymJB + UBQBc/8Iu96de3d27vnrvGfmLc/vPO/MAaBIhnM4LAwAxCdwk3xd + HBhBwSEMQh8ggAUqUAEbHpnMsff2doe/jdk+QAAAenTDORxWivn+ + tFTm+ARisN2zsN4b/ft9AAAglBQUHAKA6AAALZqf2wEALYKf+wMA + bROXwwVAYgCAFhkTHgWAbAUAnSR/X0cA5BIACEXz8xsAIBTBzx8A + gNDGyGguANIPgFITomITALDvAPC2UczkSACyDgBERSVHxgOQDwOA + Xnw8OwqA3AwAGpGcJC4A+S0A6AYFhzD4T040AHCqBxBm/qyF3wQo + zAXQ1PhZU34PIHUf4FTuz9qMLyAAgIg/Tt5gbAQAAAjFAQA3wuPN + qAEQjgIsHuHx5s/yeItFAOgQQDMrMiVp4xIvBOkA+Kc1X/NSoAgA + AigWTySRKULColQxuoSktIysvIKikoqquoaWto6evqGRsYmpuYWl + tY2tnb2Dk7OLq9tKdw9Pbx9f/4DVQcEhoWvWrlsfHhHJ3BAdE/tL + XHwCm5OYlMxN2ZSatnnL1vR/ZWzbkblz1+49e7P2Ze8/cPDQ4SNH + fz2Wc/xE7slTp/PO5Bf8Vni26Nz5CxcuXrpcfKWk5GppWfm1a9cr + Kquqq2tu3KytratvaGhsam6+dfvOnbst9+7df/DwYWtbW3vHo0eP + Ozu7urt7enuf9PU9fdr/7NnA4ODQ8PDIyPPR0RcvX74aGxt//frN + 24mJ3ycn373/8OHj1KdP0zOfv8zOfv029/37/MLijx88QHEEogBZ + UFiEKkYXl5SWkZNnKCqrqKlramnr6hkYGi8zMTO3sLK2WW5n7+jk + vMLVbeUqD08vb1+/v+qPYm6Iif0ljhWfwOYkJnNTNv4EsP1/E/iJ + 4K8Mrl4tLSu/dv16RWVVdU3NjZu1dfX1DY1Nzbdu3b5zt6VliUB7 + R8ejx51dXd09Pb1P+vqe9vc/GxgYHBoeHnn+/E/1b/jq3/2H+iX5 + c9/nF/j6MSgWhyeSBMgUQSFhEVGqGI0uLiEpJS0jKyevwFBUUlZR + VVPX0NTS1tHV0zcwNDJeZmJiamZuYWllbWO73M7ewdHJeYWLq9vK + lavcPTy9vH18/fz9A1YHBgWHhK4JC1uiE8X3xxIgvkWWGP0BaYnS + EqYlTnyr8EEtmeXc+QsXL12+XHyl5GppaVn5tesVlVVVf5qlsamp + +Seo1rb2jkePu7p7ep887X82ODwy+vLV+JuJyXcfPs18+Tq38IMH + wP/7AAB4U4AD+QCBTAAPDYDdtwE0FAGkXQC8BQH8LQAzYwyYoqeA + FLoAigBg+H8LUCCCEIiDAmiBKTiBH0RBCuyB01AB7TAGPxApxBTx + RdjIQaQM6URmMJIYWwwTcwRThxlHqehylIWeRtvQBaw+Nhybg23D + oTg7XAauDvcNb4pPxlfgvxDMCGmERiKO6E7MIY6TLEi7SE8EVAU2 + Cjwky5OTyQ8pDEoqpUtQRzBPcFEoTKhRmCGcKfxWxEukQlROdI/o + NHUttVNsuVgZTZl2ii5NPyOuJF4sYSRRJ+kq2S/1i9SC9GEZdZkG + 2QDZCbld8oryDQqhCouMQkU3xc9Kucr2yp9UClV91bBqVerRGgoa + Q5pHtXy16dpPdE7qhutp6n3SbzQ4ZLjeyNiYYDy0rNEkx3STWYi5 + rYWSJd7yndUz61abOtuS5fl2x+yzHTIdtzvtcs5asd/loOspt9qV + k+7iHgGe2V7N3nO+Fn6Z/u2r6YFrg8pCkNCgNTVrFdbtWv97hH9k + D9NlQ2OMXWxrnA9rLGEjh55YmRyUgt1YnRq7WWHLm/TSjPTt7pky + O9/v7t57c1/e/uyDOw9vOco+FnOcm3v81NAZi4JDhe/Prbhw+TLx + StjVlnKV6/sqp2uCblbX0xtTm4fvWLfk3p9t9Wy/8mihK6Cn+Ml8 + v8tAztDzkboXpFc+4+ZvYifKJivft03Rpi0+G82mfbv1vXARy+P9 + 2X88UIAK0qAC+mAFrhAI0bAJsiAPyqEFhuAzIoRoIk7IeiQdyUPq + kWEMYFQwKzEczHFMI+YtSkPt0QT0DNqB8rBGWCb2FLYLJ4BzxKXj + anFzeHP8JnwdAQjOhCxCN1GWGEOsIqEkP9J50ryAl8AFAR45hFxN + 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 + X6wAAAAASUVORK5CYII= + + WebResourceMIMEType + image/png + WebResourceResponse + + MIMEType + image/png + URL + file:///LayoutTests/svg/webarchive/resources/green-checker.png + expectedContentLength + 5552 + + WebResourceURL + file:///LayoutTests/svg/webarchive/resources/green-checker.png + + + + diff --git a/LayoutTests/svg/webarchive/svg-cursor-subresources.svg b/LayoutTests/svg/webarchive/svg-cursor-subresources.svg new file mode 100644 index 000000000000..06550c081700 --- /dev/null +++ b/LayoutTests/svg/webarchive/svg-cursor-subresources.svg @@ -0,0 +1,10 @@ + + + + + + Hover over the rect, you should see a (large) custom cursor + diff --git a/LayoutTests/svg/webarchive/svg-feimage-subresources-expected.txt b/LayoutTests/svg/webarchive/svg-feimage-subresources-expected.txt new file mode 100644 index 000000000000..affdf0c229a2 --- /dev/null +++ b/LayoutTests/svg/webarchive/svg-feimage-subresources-expected.txt @@ -0,0 +1,193 @@ + + + + + WebMainResource + + WebResourceData + + PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5z + OnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICA8c2Ny + aXB0PgogICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKICAg + ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wRE9NQXNXZWJBcmNoaXZl + KCk7CiAgPC9zY3JpcHQ+CiAgPGZpbHRlciBpZD0iTXlGaWx0ZXIiPgogICAg + PGZlSW1hZ2UgeGxpbms6aHJlZj0icmVzb3VyY2VzL2dyZWVuLWNoZWNrZXIu + cG5nIi8+CiAgPC9maWx0ZXI+CiAgPHJlY3QgaWQ9InJlY3QiIHdpZHRoPSIx + MDAiIGhlaWdodD0iMTAwIiBmaWxsPSJyZWQiIGZpbHRlcj0idXJsKCNNeUZp + bHRlcikiLz4KPC9zdmc+ + + WebResourceFrameName + + WebResourceMIMEType + image/svg+xml + WebResourceTextEncodingName + UTF-8 + WebResourceURL + file:///LayoutTests/svg/webarchive/svg-feimage-subresources.svg + + WebSubresources + + + WebResourceData + + iVBORw0KGgoAAAANSUhEUgAAAfcAAAGaCAIAAACdfZ30AAAKdWlD + Q1BJQ0MgUHJvZmlsZQAAeJyVlndQk+kWxs+XL5WEFhJ6Cb136UWq + gNKLNFEpEVgCCRAUVC4qNsS+oqgIi1gRAaUp3YKFojQRaaKCymJB + UBQBc/8Iu96de3d27vnrvGfmLc/vPO/MAaBIhnM4LAwAxCdwk3xd + HBhBwSEMQh8ggAUqUAEbHpnMsff2doe/jdk+QAAAenTDORxWivn+ + tFTm+ARisN2zsN4b/ft9AAAglBQUHAKA6AAALZqf2wEALYKf+wMA + bROXwwVAYgCAFhkTHgWAbAUAnSR/X0cA5BIACEXz8xsAIBTBzx8A + gNDGyGguANIPgFITomITALDvAPC2UczkSACyDgBERSVHxgOQDwOA + Xnw8OwqA3AwAGpGcJC4A+S0A6AYFhzD4T040AHCqBxBm/qyF3wQo + zAXQ1PhZU34PIHUf4FTuz9qMLyAAgIg/Tt5gbAQAAAjFAQA3wuPN + qAEQjgIsHuHx5s/yeItFAOgQQDMrMiVp4xIvBOkA+Kc1X/NSoAgA + AigWTySRKULColQxuoSktIysvIKikoqquoaWto6evqGRsYmpuYWl + tY2tnb2Dk7OLq9tKdw9Pbx9f/4DVQcEhoWvWrlsfHhHJ3BAdE/tL + XHwCm5OYlMxN2ZSatnnL1vR/ZWzbkblz1+49e7P2Ze8/cPDQ4SNH + fz2Wc/xE7slTp/PO5Bf8Vni26Nz5CxcuXrpcfKWk5GppWfm1a9cr + Kquqq2tu3KytratvaGhsam6+dfvOnbst9+7df/DwYWtbW3vHo0eP + Ozu7urt7enuf9PU9fdr/7NnA4ODQ8PDIyPPR0RcvX74aGxt//frN + 24mJ3ycn373/8OHj1KdP0zOfv8zOfv029/37/MLijx88QHEEogBZ + UFiEKkYXl5SWkZNnKCqrqKlramnr6hkYGi8zMTO3sLK2WW5n7+jk + vMLVbeUqD08vb1+/v+qPYm6Iif0ljhWfwOYkJnNTNv4EsP1/E/iJ + 4K8Mrl4tLSu/dv16RWVVdU3NjZu1dfX1DY1Nzbdu3b5zt6VliUB7 + R8ejx51dXd09Pb1P+vqe9vc/GxgYHBoeHnn+/E/1b/jq3/2H+iX5 + c9/nF/j6MSgWhyeSBMgUQSFhEVGqGI0uLiEpJS0jKyevwFBUUlZR + VVPX0NTS1tHV0zcwNDJeZmJiamZuYWllbWO73M7ewdHJeYWLq9vK + lavcPTy9vH18/fz9A1YHBgWHhK4JC1uiE8X3xxIgvkWWGP0BaYnS + EqYlTnyr8EEtmeXc+QsXL12+XHyl5GppaVn5tesVlVVVf5qlsamp + +Seo1rb2jkePu7p7ep887X82ODwy+vLV+JuJyXcfPs18+Tq38IMH + wP/7AAB4U4AD+QCBTAAPDYDdtwE0FAGkXQC8BQH8LQAzYwyYoqeA + FLoAigBg+H8LUCCCEIiDAmiBKTiBH0RBCuyB01AB7TAGPxApxBTx + RdjIQaQM6URmMJIYWwwTcwRThxlHqehylIWeRtvQBaw+Nhybg23D + oTg7XAauDvcNb4pPxlfgvxDMCGmERiKO6E7MIY6TLEi7SE8EVAU2 + Cjwky5OTyQ8pDEoqpUtQRzBPcFEoTKhRmCGcKfxWxEukQlROdI/o + NHUttVNsuVgZTZl2ii5NPyOuJF4sYSRRJ+kq2S/1i9SC9GEZdZkG + 2QDZCbld8oryDQqhCouMQkU3xc9Kucr2yp9UClV91bBqVerRGgoa + Q5pHtXy16dpPdE7qhutp6n3SbzQ4ZLjeyNiYYDy0rNEkx3STWYi5 + rYWSJd7yndUz61abOtuS5fl2x+yzHTIdtzvtcs5asd/loOspt9qV + k+7iHgGe2V7N3nO+Fn6Z/u2r6YFrg8pCkNCgNTVrFdbtWv97hH9k + D9NlQ2OMXWxrnA9rLGEjh55YmRyUgt1YnRq7WWHLm/TSjPTt7pky + O9/v7t57c1/e/uyDOw9vOco+FnOcm3v81NAZi4JDhe/Prbhw+TLx + StjVlnKV6/sqp2uCblbX0xtTm4fvWLfk3p9t9Wy/8mihK6Cn+Ml8 + v8tAztDzkboXpFc+4+ZvYifKJivft03Rpi0+G82mfbv1vXARy+P9 + 2X88UIAK0qAC+mAFrhAI0bAJsiAPyqEFhuAzIoRoIk7IeiQdyUPq + kWEMYFQwKzEczHFMI+YtSkPt0QT0DNqB8rBGWCb2FLYLJ4BzxKXj + anFzeHP8JnwdAQjOhCxCN1GWGEOsIqEkP9J50ryAl8AFAR45hFxN + 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 + X6wAAAAASUVORK5CYII= + + WebResourceMIMEType + image/png + WebResourceResponse + + MIMEType + image/png + URL + file:///LayoutTests/svg/webarchive/resources/green-checker.png + expectedContentLength + 5552 + + WebResourceURL + file:///LayoutTests/svg/webarchive/resources/green-checker.png + + + + diff --git a/LayoutTests/svg/webarchive/svg-feimage-subresources.svg b/LayoutTests/svg/webarchive/svg-feimage-subresources.svg new file mode 100644 index 000000000000..09ee5ba3ec70 --- /dev/null +++ b/LayoutTests/svg/webarchive/svg-feimage-subresources.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/LayoutTests/svg/webarchive/svg-script-subresouces-expected.txt b/LayoutTests/svg/webarchive/svg-script-subresouces-expected.txt new file mode 100644 index 000000000000..204fbb313514 --- /dev/null +++ b/LayoutTests/svg/webarchive/svg-script-subresouces-expected.txt @@ -0,0 +1,49 @@ + + + + + WebMainResource + + WebResourceData + + PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5z + OnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICA8c2Ny + aXB0PgogICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKICAg + ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wRE9NQXNXZWJBcmNoaXZl + KCk7CiAgPC9zY3JpcHQ+CiAgPHJlY3QgaWQ9InJlY3QiIHdpZHRoPSIxMDAi + IGhlaWdodD0iMTAwIiBmaWxsPSJyZWQiIHN0eWxlPSI6ICMwMDgwMDA7ICIv + PgogIDxzY3JpcHQgeGxpbms6aHJlZj0icmVzb3VyY2VzL3N2Zy1zY3JpcHQt + c3VicmVzb3VyY2VzLmpzIiB0eXBlPSJ0ZXh0L2VjbWFzY3JpcHQiLz4KPC9z + dmc+ + + WebResourceFrameName + + WebResourceMIMEType + image/svg+xml + WebResourceTextEncodingName + UTF-8 + WebResourceURL + file:///LayoutTests/svg/webarchive/svg-script-subresouces.svg + + WebSubresources + + + WebResourceData + document.getElementById("rect").style.fill = "green"; + WebResourceMIMEType + text/javascript + WebResourceResponse + + MIMEType + text/javascript + URL + file:///LayoutTests/svg/webarchive/resources/svg-script-subresources.js + expectedContentLength + 53 + + WebResourceURL + file:///LayoutTests/svg/webarchive/resources/svg-script-subresources.js + + + + diff --git a/LayoutTests/svg/webarchive/svg-script-subresouces.svg b/LayoutTests/svg/webarchive/svg-script-subresouces.svg new file mode 100644 index 000000000000..283f6f57d198 --- /dev/null +++ b/LayoutTests/svg/webarchive/svg-script-subresouces.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/LayoutTests/webarchive/test-xml-stylesheet-expected.txt b/LayoutTests/webarchive/test-xml-stylesheet-expected.txt index 8e62e8e325fe..d86ecb39adc3 100644 --- a/LayoutTests/webarchive/test-xml-stylesheet-expected.txt +++ b/LayoutTests/webarchive/test-xml-stylesheet-expected.txt @@ -1,5 +1,5 @@ - + WebMainResource @@ -35,16 +35,14 @@ WebResourceMIMEType text/css WebResourceResponse - - YnBsaXN0MDDUAQIDBAUGBwpZJGFyY2hpdmVyWCR2ZXJzaW9uVCR0 - b3BYJG9iamVjdHNfEA9OU0tleWVkQXJjaGl2ZXISAAGGoNEICV8Q - E1dlYlJlc291cmNlUmVzcG9uc2WAAaQLDBscVSRudWxs1w0ODxAR - EhMUFRYXGBkVUiQyUiQzUiQ0UiQwViRjbGFzc1IkNVIkMYACgAAQ - HxAHgAMjf+////////+AAFh0ZXh0L2Nzc9IdHh8gWCRjbGFzc2Vz - WiRjbGFzc25hbWWiICFdTlNVUkxSZXNwb25zZVhOU09iamVjdAgR - GyQpMkRJTGJkaW9+gYSHipGUl5mbnZ+hqqy1usPO0d8AAAAAAAAB - AQAAAAAAAAAiAAAAAAAAAAAAAAAAAAAA6A== - + + MIMEType + text/css + URL + file:///LayoutTests/webarchive/resources/test-xml-stylesheet.css + expectedContentLength + 31 + WebResourceURL file:///LayoutTests/webarchive/resources/test-xml-stylesheet.css diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog index 22b8a6381afa..f6649976bcc9 100644 --- a/WebKit/ChangeLog +++ b/WebKit/ChangeLog @@ -1,3 +1,19 @@ +2007-10-01 Eric Seidel + + Reviewed by Oliver Hunt. + + SVG Subresources will not be saved when creating WebArchives + http://bugs.webkit.org/show_bug.cgi?id=15280 + + Implement _subresourceURLs methods for more SVGElement types + more such methods will be needed as we add support for other + external references (such as use, mpath, tref, etc.) + + * DOM/WebDOMOperations.mm: + (-[DOMSVGScriptElement _subresourceURLs]): added. + (-[DOMSVGCursorElement _subresourceURLs]): added. + (-[DOMSVGFEImageElement _subresourceURLs]): added. + 2007-10-01 Eric Seidel Reviewed by Oliver Hunt. diff --git a/WebKit/DOM/WebDOMOperations.mm b/WebKit/DOM/WebDOMOperations.mm index 6ed465090e17..ce9088baeb33 100644 --- a/WebKit/DOM/WebDOMOperations.mm +++ b/WebKit/DOM/WebDOMOperations.mm @@ -203,6 +203,33 @@ @end +@implementation DOMSVGScriptElement (WebDOMSVGScriptElementOperationsPrivate) + +- (NSArray *)_subresourceURLs +{ + return [self _URLsFromSelectors:@selector(href), nil]; +} + +@end + +@implementation DOMSVGCursorElement (WebDOMSVGCursorElementOperationsPrivate) + +- (NSArray *)_subresourceURLs +{ + return [self _URLsFromSelectors:@selector(href), nil]; +} + +@end + +@implementation DOMSVGFEImageElement (WebDOMSVGFEImageElementOperationsPrivate) + +- (NSArray *)_subresourceURLs +{ + return [self _URLsFromSelectors:@selector(href), nil]; +} + +@end + #endif @implementation DOMProcessingInstruction (WebDOMProcessingInstructionOperationsPrivate) -- 2.36.0