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

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

Issue 2266353004: Make Document::styleForElementIgnoringPendingStyleSheets() be aware of a flat tree structure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update the test Created 4 years, 3 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 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 1974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1985 updateStyleAndLayout(); 1985 updateStyleAndLayout();
1986 1986
1987 if (runPostLayoutTasks == RunPostLayoutTasksSynchronously && view()) 1987 if (runPostLayoutTasks == RunPostLayoutTasksSynchronously && view())
1988 view()->flushAnyPendingPostLayoutTasks(); 1988 view()->flushAnyPendingPostLayoutTasks();
1989 } 1989 }
1990 1990
1991 PassRefPtr<ComputedStyle> Document::styleForElementIgnoringPendingStylesheets(El ement* element) 1991 PassRefPtr<ComputedStyle> Document::styleForElementIgnoringPendingStylesheets(El ement* element)
1992 { 1992 {
1993 DCHECK_EQ(element->document(), this); 1993 DCHECK_EQ(element->document(), this);
1994 StyleEngine::IgnoringPendingStylesheet ignoring(styleEngine()); 1994 StyleEngine::IgnoringPendingStylesheet ignoring(styleEngine());
1995 return ensureStyleResolver().styleForElement(element, element->parentNode() ? element->parentNode()->ensureComputedStyle() : 0); 1995 if (!element->canParticipateInFlatTree())
1996 return ensureStyleResolver().styleForElement(element, nullptr);
1997 ContainerNode* parent = LayoutTreeBuilderTraversal::parent(*element);
1998 return ensureStyleResolver().styleForElement(element, parent ? parent->ensur eComputedStyle() : nullptr);
1999
1996 } 2000 }
1997 2001
1998 PassRefPtr<ComputedStyle> Document::styleForPage(int pageIndex) 2002 PassRefPtr<ComputedStyle> Document::styleForPage(int pageIndex)
1999 { 2003 {
2000 updateDistribution(); 2004 updateDistribution();
2001 return ensureStyleResolver().styleForPage(pageIndex); 2005 return ensureStyleResolver().styleForPage(pageIndex);
2002 } 2006 }
2003 2007
2004 bool Document::isPageBoxVisible(int pageIndex) 2008 bool Document::isPageBoxVisible(int pageIndex)
2005 { 2009 {
(...skipping 4034 matching lines...) Expand 10 before | Expand all | Expand 10 after
6040 } 6044 }
6041 6045
6042 void showLiveDocumentInstances() 6046 void showLiveDocumentInstances()
6043 { 6047 {
6044 WeakDocumentSet& set = liveDocumentSet(); 6048 WeakDocumentSet& set = liveDocumentSet();
6045 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6049 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6046 for (Document* document : set) 6050 for (Document* document : set)
6047 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data()); 6051 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data());
6048 } 6052 }
6049 #endif 6053 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698