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

Unified Diff: Source/WebCore/dom/Document.cpp

Issue 9212063: Merge 104845 - REGRESSION(r104060): Setting user stylesheet may leave CSSStyleSelector with stale... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 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/css/user-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/dom/Document.cpp
===================================================================
--- Source/WebCore/dom/Document.cpp (revision 105785)
+++ Source/WebCore/dom/Document.cpp (working copy)
@@ -2958,8 +2958,10 @@
{
// Don't bother updating, since we haven't loaded all our style info yet
// and haven't calculated the style selector for the first time.
- if (!attached() || (!m_didCalculateStyleSelector && !haveStylesheetsLoaded()))
+ if (!attached() || (!m_didCalculateStyleSelector && !haveStylesheetsLoaded())) {
+ m_styleSelector.clear();
return;
+ }
#ifdef INSTRUMENT_LAYOUT_SCHEDULING
if (!ownerElement())
« no previous file with comments | « LayoutTests/fast/css/user-stylesheet-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698