[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
jschuh at chromium.org
jschuh at chromium.org
Fri Jan 21 14:38:41 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit c70d2d681d2b0062d182d0567a0b4bb84f400161
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 23 20:38:09 2010 +0000
2010-12-23 Justin Schuh <jschuh at chromium.org>
Reviewed by Eric Seidel.
CSSCursorImageValue destructor should clear referenced element.
https://bugs.webkit.org/show_bug.cgi?id=51417
Calls correct method to clear image and renames method to avoid future confusion.
Test: svg/css/cursor-image-replace.svg
* css/CSSCursorImageValue.cpp:
(WebCore::CSSCursorImageValue::~CSSCursorImageValue):
* svg/SVGElement.cpp:
(WebCore::SVGElement::cursorImageValueRemoved):
* svg/SVGElement.h:
2010-12-23 Justin Schuh <jschuh at chromium.org>
Reviewed by Eric Seidel.
CSSCursorImageValue destructor should clear referenced element.
https://bugs.webkit.org/show_bug.cgi?id=51417
* svg/css/cursor-image-replace-expected.txt: Added.
* svg/css/cursor-image-replace.svg: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74574 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3c04b1c..7567408 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-23 Justin Schuh <jschuh at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ CSSCursorImageValue destructor should clear referenced element.
+ https://bugs.webkit.org/show_bug.cgi?id=51417
+
+ * svg/css/cursor-image-replace-expected.txt: Added.
+ * svg/css/cursor-image-replace.svg: Added.
+
2010-12-23 Kenneth Russell <kbr at google.com>
Unreviewed Chromium expectations update. Allow
diff --git a/LayoutTests/svg/css/cursor-replace-expected.txt b/LayoutTests/svg/css/cursor-image-replace-expected.txt
similarity index 100%
copy from LayoutTests/svg/css/cursor-replace-expected.txt
copy to LayoutTests/svg/css/cursor-image-replace-expected.txt
diff --git a/LayoutTests/svg/css/cursor-image-replace.svg b/LayoutTests/svg/css/cursor-image-replace.svg
new file mode 100644
index 0000000..cef65d6
--- /dev/null
+++ b/LayoutTests/svg/css/cursor-image-replace.svg
@@ -0,0 +1,59 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400" onload="startup()">
+<defs id="defs">
+ <cursor id="cursor1" xlink:href="data:image/png;base64,"/>
+ <cursor id="cursor2" xlink:href="data:image/png;base64,"/>
+</defs>
+
+<script>
+<![CDATA[
+
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ gc = function(){window.GCController.collect()};
+} else if (!window.gc)
+ gc = function(){};
+
+var outer;
+var inner;
+
+function startup() {
+ outer = document.getElementById("outer");
+ inner = document.getElementById("inner");
+
+ if (location.hash != "#3") {
+ if (location.hash)
+ location.hash = "#" + (parseInt(location.hash.slice(1)) + 1).toString();
+ else
+ location.hash = "#1";
+ setTimeout(step1, 0);
+ } else {
+ gc();
+ inner.setAttribute('fill', "green");
+ while (inner.firstChild)
+ inner.removeChild(inner.firstChild);
+ inner.appendChild(document.createTextNode("PASS: Successfully changed cursors."));
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+}
+
+function step1() {
+ outer.setAttribute('cursor', "url('#cursor2')");
+ inner.removeAttribute('cursor');
+ setTimeout(step2, 0);
+}
+
+function step2() {
+ outer.removeAttribute('cursor');
+ setTimeout(function(){location.reload()}, 0);
+}
+
+
+//]]>
+</script>
+
+<g id="outer">
+ <text x="20" y="20" fill="red" id="inner" cursor="url('#cursor1')">X</text>
+</g>
+</svg>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5e36032..c964e8d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-23 Justin Schuh <jschuh at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ CSSCursorImageValue destructor should clear referenced element.
+ https://bugs.webkit.org/show_bug.cgi?id=51417
+
+ Calls correct method to clear image and renames method to avoid future confusion.
+
+ Test: svg/css/cursor-image-replace.svg
+
+ * css/CSSCursorImageValue.cpp:
+ (WebCore::CSSCursorImageValue::~CSSCursorImageValue):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::cursorImageValueRemoved):
+ * svg/SVGElement.h:
+
2010-12-22 Sam Weinig <sam at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 11d6f67..de983f3 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -22281,7 +22281,6 @@
isa = PBXProject;
buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
compatibilityVersion = "Xcode 2.4";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
diff --git a/WebCore/css/CSSCursorImageValue.cpp b/WebCore/css/CSSCursorImageValue.cpp
index e82cf16..ab83bb7 100644
--- a/WebCore/css/CSSCursorImageValue.cpp
+++ b/WebCore/css/CSSCursorImageValue.cpp
@@ -71,7 +71,7 @@ CSSCursorImageValue::~CSSCursorImageValue()
for (; it != end; ++it) {
SVGElement* referencedElement = *it;
- referencedElement->cursorElementRemoved();
+ referencedElement->cursorImageValueRemoved();
if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(url, referencedElement->document()))
cursorElement->removeClient(referencedElement);
}
diff --git a/WebCore/svg/SVGElement.cpp b/WebCore/svg/SVGElement.cpp
index 3889dfd..1f5b0fa 100644
--- a/WebCore/svg/SVGElement.cpp
+++ b/WebCore/svg/SVGElement.cpp
@@ -222,7 +222,7 @@ void SVGElement::setCursorImageValue(CSSCursorImageValue* cursorImageValue)
rareData->setCursorImageValue(cursorImageValue);
}
-void SVGElement::cursorImageElementRemoved()
+void SVGElement::cursorImageValueRemoved()
{
ASSERT(hasRareSVGData());
rareSVGData()->setCursorImageValue(0);
diff --git a/WebCore/svg/SVGElement.h b/WebCore/svg/SVGElement.h
index 0fe9a4f..d961c73 100644
--- a/WebCore/svg/SVGElement.h
+++ b/WebCore/svg/SVGElement.h
@@ -77,7 +77,7 @@ public:
void setCursorElement(SVGCursorElement*);
void cursorElementRemoved();
void setCursorImageValue(CSSCursorImageValue*);
- void cursorImageElementRemoved();
+ void cursorImageValueRemoved();
virtual void updateAnimatedSVGAttribute(const QualifiedName&) const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list