Title: [117882] releases/WebKitGTK/webkit-1.8
- Revision
- 117882
- Author
- [email protected]
- Date
- 2012-05-21 20:03:10 -0700 (Mon, 21 May 2012)
Log Message
Merge 113229 - Source/WebCore: Move pending sheet removal from ~HTMLLinkElement to removal from document.
https://bugs.webkit.org/show_bug.cgi?id=69184
Reviewed by Adam Barth.
Test: fast/html/pending-stylesheet-crash.html
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::~HTMLLinkElement):
(WebCore::HTMLLinkElement::removedFromDocument):
LayoutTests: Move pending sheet removal from ~HTMLLinkElement to removal from document.
https://bugs.webkit.org/show_bug.cgi?id=69184
Reviewed by Adam Barth.
* fast/html/pending-stylesheet-crash-expected.txt: Added.
* fast/html/pending-stylesheet-crash.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (117881 => 117882)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-05-22 03:01:00 UTC (rev 117881)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-05-22 03:03:10 UTC (rev 117882)
@@ -1,3 +1,13 @@
+2012-04-04 Jeffrey Pfau <[email protected]>
+
+ Move pending sheet removal from ~HTMLLinkElement to removal from document.
+ https://bugs.webkit.org/show_bug.cgi?id=69184
+
+ Reviewed by Adam Barth.
+
+ * fast/html/pending-stylesheet-crash-expected.txt: Added.
+ * fast/html/pending-stylesheet-crash.html: Added.
+
2012-04-04 Yuta Kitamura <[email protected]>
Layout Test http/tests/websocket/tests/hybi/workers/worker-reload.html is flaky
Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/html/pending-stylesheet-crash-expected.txt (0 => 117882)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/html/pending-stylesheet-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/html/pending-stylesheet-crash-expected.txt 2012-05-22 03:03:10 UTC (rev 117882)
@@ -0,0 +1 @@
+This test passes if it doesn't crash
Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/html/pending-stylesheet-crash.html (0 => 117882)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/html/pending-stylesheet-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/html/pending-stylesheet-crash.html 2012-05-22 03:03:10 UTC (rev 117882)
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head id="h">
+</head>
+<body>
+<script>
+if (window.layoutTestController)
+ window.layoutTestController.dumpAsText();
+
+var link = document.createElement('link');
+link.setAttribute('type', 'text/css');
+link.setAttribute('rel', 'stylesheet');
+link.setAttribute('href', 'really-does-not-exist.css');
+document.getElementById('h').appendChild(link);
+link.parentNode.removeChild(link);
+link = null;
+</script>
+<script>
+function gc() {
+ if (window.GCController)
+ GCController.collect();
+ else {
+ // Allocate a sufficient number of objects to force a GC.
+ for (var i = 0; i < 10000; i++)
+ new Object;
+ }
+}
+
+gc();
+</script>
+<p>This test passes if it doesn't crash</p>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (117881 => 117882)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-05-22 03:01:00 UTC (rev 117881)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-05-22 03:03:10 UTC (rev 117882)
@@ -1,3 +1,16 @@
+2012-04-04 Jeffrey Pfau <[email protected]>
+
+ Move pending sheet removal from ~HTMLLinkElement to removal from document.
+ https://bugs.webkit.org/show_bug.cgi?id=69184
+
+ Reviewed by Adam Barth.
+
+ Test: fast/html/pending-stylesheet-crash.html
+
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::~HTMLLinkElement):
+ (WebCore::HTMLLinkElement::removedFromDocument):
+
2012-04-04 Sergio Villar Senin <[email protected]>
[GTK] ASSERT in SocketStreamHandleSoup.cpp
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/html/HTMLLinkElement.cpp (117881 => 117882)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/html/HTMLLinkElement.cpp 2012-05-22 03:01:00 UTC (rev 117881)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/html/HTMLLinkElement.cpp 2012-05-22 03:03:10 UTC (rev 117882)
@@ -73,10 +73,8 @@
if (m_sheet)
m_sheet->clearOwnerNode();
- if (m_cachedSheet) {
+ if (m_cachedSheet)
m_cachedSheet->removeClient(this);
- removePendingSheet();
- }
if (inDocument())
document()->removeStyleSheetCandidateNode(this);
@@ -262,6 +260,9 @@
if (m_sheet)
clearSheet();
+ if (styleSheetIsLoading())
+ removePendingSheet();
+
if (document()->renderer())
document()->styleSelectorChanged(DeferRecalcStyle);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
