Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Unified Diff: Source/WebCore/html/HTMLLinkElement.cpp

Issue 10165023: Merge 113229 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/html/pending-stylesheet-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/HTMLLinkElement.cpp
===================================================================
--- Source/WebCore/html/HTMLLinkElement.cpp (revision 114851)
+++ Source/WebCore/html/HTMLLinkElement.cpp (working copy)
@@ -82,10 +82,8 @@
if (m_sheet)
m_sheet->clearOwnerNode();
- if (m_cachedSheet) {
+ if (m_cachedSheet)
m_cachedSheet->removeClient(this);
- removePendingSheet();
- }
if (inDocument())
document()->removeStyleSheetCandidateNode(this);
@@ -266,6 +264,9 @@
m_sheet = 0;
}
+ if (styleSheetIsLoading())
+ removePendingSheet();
+
if (document()->renderer())
document()->styleSelectorChanged(DeferRecalcStyle);
}
« no previous file with comments | « LayoutTests/fast/html/pending-stylesheet-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698