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

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 2473743003: Call Element::rebuildLayoutTree from Document::updateStyle directly (Closed)
Patch Set: Fix failures due to information not being retained correctly for detachLayoutTree() in Text::reatta… Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
7 * rights reserved. 7 * rights reserved.
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
(...skipping 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after
2048 StyleResolver& resolver = ensureStyleResolver(); 2048 StyleResolver& resolver = ensureStyleResolver();
2049 2049
2050 bool shouldRecordStats; 2050 bool shouldRecordStats;
2051 TRACE_EVENT_CATEGORY_GROUP_ENABLED("blink,blink_style", &shouldRecordStats); 2051 TRACE_EVENT_CATEGORY_GROUP_ENABLED("blink,blink_style", &shouldRecordStats);
2052 styleEngine().setStatsEnabled(shouldRecordStats); 2052 styleEngine().setStatsEnabled(shouldRecordStats);
2053 2053
2054 if (Element* documentElement = this->documentElement()) { 2054 if (Element* documentElement = this->documentElement()) {
2055 inheritHtmlAndBodyElementStyles(change); 2055 inheritHtmlAndBodyElementStyles(change);
2056 if (documentElement->shouldCallRecalcStyle(change)) 2056 if (documentElement->shouldCallRecalcStyle(change))
2057 documentElement->recalcStyle(change); 2057 documentElement->recalcStyle(change);
2058 if (documentElement->needsReattachLayoutTree() ||
2059 documentElement->childNeedsReattachLayoutTree())
2060 documentElement->rebuildLayoutTree();
2058 } 2061 }
2059 2062
2060 view()->recalcOverflowAfterStyleChange(); 2063 view()->recalcOverflowAfterStyleChange();
2061 2064
2062 // Only retain the HashMap for the duration of StyleRecalc and 2065 // Only retain the HashMap for the duration of StyleRecalc and
2063 // LayoutTreeConstruction. 2066 // LayoutTreeConstruction.
2064 m_styleReattachDataMap.clear(); 2067 m_styleReattachDataMap.clear();
2065 clearChildNeedsStyleRecalc(); 2068 clearChildNeedsStyleRecalc();
2066 clearChildNeedsReattachLayoutTree(); 2069 clearChildNeedsReattachLayoutTree();
2067 2070
(...skipping 4519 matching lines...) Expand 10 before | Expand all | Expand 10 after
6587 } 6590 }
6588 6591
6589 void showLiveDocumentInstances() { 6592 void showLiveDocumentInstances() {
6590 WeakDocumentSet& set = liveDocumentSet(); 6593 WeakDocumentSet& set = liveDocumentSet();
6591 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6594 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6592 for (blink::Document* document : set) 6595 for (blink::Document* document : set)
6593 fprintf(stderr, "- Document %p URL: %s\n", document, 6596 fprintf(stderr, "- Document %p URL: %s\n", document,
6594 document->url().getString().utf8().data()); 6597 document->url().getString().utf8().data());
6595 } 6598 }
6596 #endif 6599 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698