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

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

Issue 287053003: Let updateLayout do style recalc instead of styleResolverChanged. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed unnecessary mime type. Created 6 years, 7 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/http/tests/css/pending-stylesheet-offset-width-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 1990 matching lines...) Expand 10 before | Expand all | Expand 10 after
2001 // FIXME: We are willing to attempt to suppress painting with outdated s tyle info only once. 2001 // FIXME: We are willing to attempt to suppress painting with outdated s tyle info only once.
2002 // Our assumption is that it would be dangerous to try to stop it a seco nd time, after page 2002 // Our assumption is that it would be dangerous to try to stop it a seco nd time, after page
2003 // content has already been loaded and displayed with accurate style inf ormation. (Our 2003 // content has already been loaded and displayed with accurate style inf ormation. (Our
2004 // suppression involves blanking the whole page at the moment. If it wer e more refined, we 2004 // suppression involves blanking the whole page at the moment. If it wer e more refined, we
2005 // might be able to do something better.) It's worth noting though that this entire method 2005 // might be able to do something better.) It's worth noting though that this entire method
2006 // is a hack, since what we really want to do is suspend JS instead of d oing a layout with 2006 // is a hack, since what we really want to do is suspend JS instead of d oing a layout with
2007 // inaccurate information. 2007 // inaccurate information.
2008 HTMLElement* bodyElement = body(); 2008 HTMLElement* bodyElement = body();
2009 if (bodyElement && !bodyElement->renderer() && m_pendingSheetLayout == N oLayoutWithPendingSheets) { 2009 if (bodyElement && !bodyElement->renderer() && m_pendingSheetLayout == N oLayoutWithPendingSheets) {
2010 m_pendingSheetLayout = DidLayoutWithPendingSheets; 2010 m_pendingSheetLayout = DidLayoutWithPendingSheets;
2011 styleResolverChanged(RecalcStyleImmediately); 2011 styleResolverChanged(RecalcStyleDeferred);
2012 } else if (m_hasNodesWithPlaceholderStyle) { 2012 } else if (m_hasNodesWithPlaceholderStyle) {
2013 // If new nodes have been added or style recalc has been done with s tyle sheets still 2013 // If new nodes have been added or style recalc has been done with s tyle sheets still
2014 // pending, some nodes may not have had their real style calculated yet. Normally this 2014 // pending, some nodes may not have had their real style calculated yet. Normally this
2015 // gets cleaned when style sheets arrive but here we need up-to-date style immediately. 2015 // gets cleaned when style sheets arrive but here we need up-to-date style immediately.
2016 updateRenderTree(Force); 2016 updateRenderTree(Force);
2017 } 2017 }
2018 } 2018 }
2019 2019
2020 updateLayout(); 2020 updateLayout();
2021 2021
(...skipping 3704 matching lines...) Expand 10 before | Expand all | Expand 10 after
5726 visitor->trace(m_timeline); 5726 visitor->trace(m_timeline);
5727 visitor->trace(m_compositorPendingAnimations); 5727 visitor->trace(m_compositorPendingAnimations);
5728 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this); 5728 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this);
5729 DocumentSupplementable::trace(visitor); 5729 DocumentSupplementable::trace(visitor);
5730 TreeScope::trace(visitor); 5730 TreeScope::trace(visitor);
5731 ContainerNode::trace(visitor); 5731 ContainerNode::trace(visitor);
5732 ExecutionContext::trace(visitor); 5732 ExecutionContext::trace(visitor);
5733 } 5733 }
5734 5734
5735 } // namespace WebCore 5735 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/css/pending-stylesheet-offset-width-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698