Title: [92930] branches/safari-534.51-branch
- Revision
- 92930
- Author
- [email protected]
- Date
- 2011-08-11 22:44:04 -0700 (Thu, 11 Aug 2011)
Log Message
Merge r91531.
Modified Paths
Added Paths
Diff
Modified: branches/safari-534.51-branch/LayoutTests/ChangeLog (92929 => 92930)
--- branches/safari-534.51-branch/LayoutTests/ChangeLog 2011-08-12 05:41:56 UTC (rev 92929)
+++ branches/safari-534.51-branch/LayoutTests/ChangeLog 2011-08-12 05:44:04 UTC (rev 92930)
@@ -1,5 +1,21 @@
2011-08-11 Lucas Forschler <[email protected]>
+ Merged 91531
+
+ 2011-07-21 Gavin Peters <[email protected]>
+
+ Extend the protector of a CSS style sheet. Because checkLoaded() can recursively delete
+ parent style elements, the protector should be extended to include the parent call.
+
+ https://bugs.webkit.org/show_bug.cgi?id=64736
+
+ Reviewed by Simon Fraser.
+
+ * fast/css/css-imports-2-expected.txt: Added.
+ * fast/css/css-imports-2.html: Added.
+
+2011-08-11 Lucas Forschler <[email protected]>
+
Merged 91474
2011-07-21 Sam Weinig <[email protected]>
Copied: branches/safari-534.51-branch/LayoutTests/fast/css/css-imports-2-expected.txt (from rev 91531, trunk/LayoutTests/fast/css/css-imports-2-expected.txt) (0 => 92930)
--- branches/safari-534.51-branch/LayoutTests/fast/css/css-imports-2-expected.txt (rev 0)
+++ branches/safari-534.51-branch/LayoutTests/fast/css/css-imports-2-expected.txt 2011-08-12 05:44:04 UTC (rev 92930)
@@ -0,0 +1 @@
+PASS
Copied: branches/safari-534.51-branch/LayoutTests/fast/css/css-imports-2.html (from rev 91531, trunk/LayoutTests/fast/css/css-imports-2.html) (0 => 92930)
--- branches/safari-534.51-branch/LayoutTests/fast/css/css-imports-2.html (rev 0)
+++ branches/safari-534.51-branch/LayoutTests/fast/css/css-imports-2.html 2011-08-12 05:44:04 UTC (rev 92930)
@@ -0,0 +1,9 @@
+<p><style>
+ @import url('resources/css-imports.css');
+</style>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+document.body.innerHTML = "PASS";
+</script>
+
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92929 => 92930)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-12 05:41:56 UTC (rev 92929)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-12 05:44:04 UTC (rev 92930)
@@ -1,5 +1,23 @@
2011-08-11 Lucas Forschler <[email protected]>
+ Merged 91531
+
+ 2011-07-21 Gavin Peters <[email protected]>
+
+ Extend the protector of a CSS style sheet. Because checkLoaded() can recursively delete
+ parent style elements, the protector should be extended to include the parent call.
+
+ https://bugs.webkit.org/show_bug.cgi?id=64736
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/css/css-imports-2.html
+
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::checkLoaded):
+
+2011-08-11 Lucas Forschler <[email protected]>
+
Merged 91474
2011-07-21 Sam Weinig <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/css/CSSStyleSheet.cpp (92929 => 92930)
--- branches/safari-534.51-branch/Source/WebCore/css/CSSStyleSheet.cpp 2011-08-12 05:41:56 UTC (rev 92929)
+++ branches/safari-534.51-branch/Source/WebCore/css/CSSStyleSheet.cpp 2011-08-12 05:44:04 UTC (rev 92930)
@@ -220,13 +220,13 @@
{
if (isLoading())
return;
- if (parent())
- parent()->checkLoaded();
// Avoid |this| being deleted by scripts that run via
// ScriptableDocumentParser::executeScriptsWaitingForStylesheets().
// See <rdar://problem/6622300>.
RefPtr<CSSStyleSheet> protector(this);
+ if (parent())
+ parent()->checkLoaded();
m_loadCompleted = ownerNode() ? ownerNode()->sheetLoaded() : true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
