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

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

Issue 18298016: updateStyleForNodeIfNeeded should be Shadow DOM aware (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Var names Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/dom/shadow/offsetWidth-host-style-change-expected.txt ('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 1680 matching lines...) Expand 10 before | Expand all | Expand 10 after
1691 AnimationUpdateBlock animationUpdateBlock(m_frame ? m_frame->animation() : 0 ); 1691 AnimationUpdateBlock animationUpdateBlock(m_frame ? m_frame->animation() : 0 );
1692 recalcStyle(NoChange); 1692 recalcStyle(NoChange);
1693 } 1693 }
1694 1694
1695 void Document::updateStyleForNodeIfNeeded(Node* node) 1695 void Document::updateStyleForNodeIfNeeded(Node* node)
1696 { 1696 {
1697 if (!hasPendingForcedStyleRecalc() && !childNeedsStyleRecalc() && !needsStyl eRecalc()) 1697 if (!hasPendingForcedStyleRecalc() && !childNeedsStyleRecalc() && !needsStyl eRecalc())
1698 return; 1698 return;
1699 1699
1700 bool needsStyleRecalc = hasPendingForcedStyleRecalc(); 1700 bool needsStyleRecalc = hasPendingForcedStyleRecalc();
1701 for (Node* n = node; n && !needsStyleRecalc; n = n->parentNode()) 1701 for (Node* ancestor = node; ancestor && !needsStyleRecalc; ancestor = ancest or->parentOrShadowHostNode())
1702 needsStyleRecalc = n->needsStyleRecalc(); 1702 needsStyleRecalc = ancestor->needsStyleRecalc();
1703 if (needsStyleRecalc) 1703 if (needsStyleRecalc)
1704 updateStyleIfNeeded(); 1704 updateStyleIfNeeded();
1705 } 1705 }
1706 1706
1707 void Document::updateLayout() 1707 void Document::updateLayout()
1708 { 1708 {
1709 ASSERT(isMainThread()); 1709 ASSERT(isMainThread());
1710 1710
1711 FrameView* frameView = view(); 1711 FrameView* frameView = view();
1712 if (frameView && frameView->isInLayout()) { 1712 if (frameView && frameView->isInLayout()) {
(...skipping 3448 matching lines...) Expand 10 before | Expand all | Expand 10 after
5161 { 5161 {
5162 return DocumentLifecycleNotifier::create(this); 5162 return DocumentLifecycleNotifier::create(this);
5163 } 5163 }
5164 5164
5165 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5165 DocumentLifecycleNotifier* Document::lifecycleNotifier()
5166 { 5166 {
5167 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier()); 5167 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier());
5168 } 5168 }
5169 5169
5170 } // namespace WebCore 5170 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/shadow/offsetWidth-host-style-change-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698