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

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

Issue 768533004: Make getComputedStyle optimization work for adjacent combinators. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Redistribution might change computed style. Created 6 years 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
« no previous file with comments | « Source/core/dom/ContainerNode.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after
1888 } 1888 }
1889 1889
1890 ASSERT(!needsStyleRecalc()); 1890 ASSERT(!needsStyleRecalc());
1891 ASSERT(!childNeedsStyleRecalc()); 1891 ASSERT(!childNeedsStyleRecalc());
1892 ASSERT(inStyleRecalc()); 1892 ASSERT(inStyleRecalc());
1893 m_lifecycle.advanceTo(DocumentLifecycle::StyleClean); 1893 m_lifecycle.advanceTo(DocumentLifecycle::StyleClean);
1894 } 1894 }
1895 1895
1896 void Document::updateRenderTreeForNodeIfNeeded(Node* node) 1896 void Document::updateRenderTreeForNodeIfNeeded(Node* node)
1897 { 1897 {
1898 ASSERT(node);
1898 if (!node->canParticipateInComposedTree()) 1899 if (!node->canParticipateInComposedTree())
1899 return; 1900 return;
1900 bool needsRecalc = needsFullRenderTreeUpdate();
1901 1901
1902 for (const Node* ancestor = node; ancestor && !needsRecalc; ancestor = NodeR enderingTraversal::parent(*ancestor)) 1902 bool needsRecalc = needsFullRenderTreeUpdate() || childNeedsDistributionReca lc() || node->needsStyleRecalc() || node->needsStyleInvalidation();
1903 needsRecalc = ancestor->needsStyleRecalc() || ancestor->needsStyleInvali dation(); 1903
1904 if (!needsRecalc) {
1905 for (const ContainerNode* ancestor = NodeRenderingTraversal::parent(*nod e); ancestor && !needsRecalc; ancestor = NodeRenderingTraversal::parent(*ancesto r))
1906 needsRecalc = ancestor->needsStyleRecalc() || ancestor->needsStyleIn validation() || ancestor->needsAdjacentStyleRecalc();
1907 }
1904 1908
1905 if (needsRecalc) 1909 if (needsRecalc)
1906 updateRenderTreeIfNeeded(); 1910 updateRenderTreeIfNeeded();
1907 } 1911 }
1908 1912
1909 void Document::updateLayout() 1913 void Document::updateLayout()
1910 { 1914 {
1911 ASSERT(isMainThread()); 1915 ASSERT(isMainThread());
1912 1916
1913 ScriptForbiddenScope forbidScript; 1917 ScriptForbiddenScope forbidScript;
(...skipping 3921 matching lines...) Expand 10 before | Expand all | Expand 10 after
5835 #ifndef NDEBUG 5839 #ifndef NDEBUG
5836 using namespace blink; 5840 using namespace blink;
5837 void showLiveDocumentInstances() 5841 void showLiveDocumentInstances()
5838 { 5842 {
5839 WeakDocumentSet& set = liveDocumentSet(); 5843 WeakDocumentSet& set = liveDocumentSet();
5840 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5844 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5841 for (Document* document : set) 5845 for (Document* document : set)
5842 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5846 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5843 } 5847 }
5844 #endif 5848 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/ContainerNode.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698