Title: [128810] branches/chromium/1229
- Revision
- 128810
- Author
- [email protected]
- Date
- 2012-09-17 14:44:01 -0700 (Mon, 17 Sep 2012)
Log Message
Merge 128654
BUG=147459
Review URL: https://codereview.chromium.org/10918284
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1229/LayoutTests/fast/dom/beforeload/clear-video-poster-in-beforeload-listener-expected.txt (from rev 128654, trunk/LayoutTests/fast/dom/beforeload/clear-video-poster-in-beforeload-listener-expected.txt) (0 => 128810)
--- branches/chromium/1229/LayoutTests/fast/dom/beforeload/clear-video-poster-in-beforeload-listener-expected.txt (rev 0)
+++ branches/chromium/1229/LayoutTests/fast/dom/beforeload/clear-video-poster-in-beforeload-listener-expected.txt 2012-09-17 21:44:01 UTC (rev 128810)
@@ -0,0 +1,3 @@
+This page tests that you can correctly clear a video object's poster attribute in a beforeload listener without causing a crash.
+
+PASS: test completed.
Copied: branches/chromium/1229/LayoutTests/fast/dom/beforeload/clear-video-poster-in-beforeload-listener.html (from rev 128654, trunk/LayoutTests/fast/dom/beforeload/clear-video-poster-in-beforeload-listener.html) (0 => 128810)
--- branches/chromium/1229/LayoutTests/fast/dom/beforeload/clear-video-poster-in-beforeload-listener.html (rev 0)
+++ branches/chromium/1229/LayoutTests/fast/dom/beforeload/clear-video-poster-in-beforeload-listener.html 2012-09-17 21:44:01 UTC (rev 128810)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p>This page tests that you can correctly clear a video object's poster attribute in a beforeload listener without causing a crash.</p>
+<div id="console">FAIL: test didn't run to completion.</div>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+x = document.createElement('video');
+x.addEventListener('beforeload', function () {
+ x.removeAttribute('poster');
+ document.getElementById('console').textContent = 'PASS: test completed.';
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, false);
+x.poster = 'foobar';
+</script>
+</body>
+</html>
Modified: branches/chromium/1229/Source/WebCore/html/HTMLEmbedElement.cpp (128809 => 128810)
--- branches/chromium/1229/Source/WebCore/html/HTMLEmbedElement.cpp 2012-09-17 21:43:53 UTC (rev 128809)
+++ branches/chromium/1229/Source/WebCore/html/HTMLEmbedElement.cpp 2012-09-17 21:44:01 UTC (rev 128810)
@@ -99,8 +99,6 @@
size_t pos = m_serviceType.find(";");
if (pos != notFound)
m_serviceType = m_serviceType.left(pos);
- if (!isImageType() && m_imageLoader)
- m_imageLoader.clear();
} else if (attribute.name() == codeAttr)
m_url = stripLeadingAndTrailingHTMLSpaces(attribute.value());
else if (attribute.name() == srcAttr) {
Modified: branches/chromium/1229/Source/WebCore/html/HTMLObjectElement.cpp (128809 => 128810)
--- branches/chromium/1229/Source/WebCore/html/HTMLObjectElement.cpp 2012-09-17 21:43:53 UTC (rev 128809)
+++ branches/chromium/1229/Source/WebCore/html/HTMLObjectElement.cpp 2012-09-17 21:44:01 UTC (rev 128810)
@@ -105,8 +105,6 @@
m_serviceType = m_serviceType.left(pos);
if (renderer())
setNeedsWidgetUpdate(true);
- if (!isImageType() && m_imageLoader)
- m_imageLoader.clear();
} else if (attribute.name() == dataAttr) {
m_url = stripLeadingAndTrailingHTMLSpaces(attribute.value());
if (renderer()) {
Modified: branches/chromium/1229/Source/WebCore/html/HTMLVideoElement.cpp (128809 => 128810)
--- branches/chromium/1229/Source/WebCore/html/HTMLVideoElement.cpp 2012-09-17 21:43:53 UTC (rev 128809)
+++ branches/chromium/1229/Source/WebCore/html/HTMLVideoElement.cpp 2012-09-17 21:44:01 UTC (rev 128810)
@@ -116,8 +116,6 @@
m_imageLoader = adoptPtr(new HTMLImageLoader(this));
m_imageLoader->updateFromElementIgnoringPreviousError();
} else {
- if (m_imageLoader)
- m_imageLoader.clear();
if (renderer())
toRenderImage(renderer())->imageResource()->setCachedImage(0);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
