Title: [92521] branches/chromium/782
- Revision
- 92521
- Author
- cev...@google.com
- Date
- 2011-08-05 15:15:45 -0700 (Fri, 05 Aug 2011)
Log Message
Merge 91531
BUG=89552
Review URL: http://codereview.chromium.org/7585022
Modified Paths
Added Paths
Diff
Copied: branches/chromium/782/LayoutTests/fast/css/css-imports-2-expected.txt (from rev 91531, trunk/LayoutTests/fast/css/css-imports-2-expected.txt) (0 => 92521)
--- branches/chromium/782/LayoutTests/fast/css/css-imports-2-expected.txt (rev 0)
+++ branches/chromium/782/LayoutTests/fast/css/css-imports-2-expected.txt 2011-08-05 22:15:45 UTC (rev 92521)
@@ -0,0 +1 @@
+PASS
Copied: branches/chromium/782/LayoutTests/fast/css/css-imports-2.html (from rev 91531, trunk/LayoutTests/fast/css/css-imports-2.html) (0 => 92521)
--- branches/chromium/782/LayoutTests/fast/css/css-imports-2.html (rev 0)
+++ branches/chromium/782/LayoutTests/fast/css/css-imports-2.html 2011-08-05 22:15:45 UTC (rev 92521)
@@ -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/chromium/782/Source/WebCore/css/CSSStyleSheet.cpp (92520 => 92521)
--- branches/chromium/782/Source/WebCore/css/CSSStyleSheet.cpp 2011-08-05 22:14:37 UTC (rev 92520)
+++ branches/chromium/782/Source/WebCore/css/CSSStyleSheet.cpp 2011-08-05 22:15:45 UTC (rev 92521)
@@ -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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
