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

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

Issue 212163006: Revert of Preserve autosizing multiplier on style recalc. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reverting auto-sizing three patches Created 6 years, 9 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
« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | 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 2051 matching lines...) Expand 10 before | Expand all | Expand 10 after
2062 2062
2063 m_renderView = new RenderView(this); 2063 m_renderView = new RenderView(this);
2064 setRenderer(m_renderView); 2064 setRenderer(m_renderView);
2065 2065
2066 m_renderView->setIsInWindow(true); 2066 m_renderView->setIsInWindow(true);
2067 m_renderView->setStyle(StyleResolver::styleForDocument(*this)); 2067 m_renderView->setStyle(StyleResolver::styleForDocument(*this));
2068 view()->updateCompositingLayersAfterStyleChange(); 2068 view()->updateCompositingLayersAfterStyleChange();
2069 2069
2070 ContainerNode::attach(context); 2070 ContainerNode::attach(context);
2071 2071
2072 // FTA can't update render view info while the Document is detached, so upda te now in case anything changed.
2073 if (FastTextAutosizer* textAutosizer = fastTextAutosizer())
2074 textAutosizer->updatePageInfo();
2075
2076 m_lifecycle.advanceTo(DocumentLifecycle::StyleClean); 2072 m_lifecycle.advanceTo(DocumentLifecycle::StyleClean);
2077 } 2073 }
2078 2074
2079 void Document::detach(const AttachContext& context) 2075 void Document::detach(const AttachContext& context)
2080 { 2076 {
2081 ASSERT(isActive()); 2077 ASSERT(isActive());
2082 m_lifecycle.advanceTo(DocumentLifecycle::Stopping); 2078 m_lifecycle.advanceTo(DocumentLifecycle::Stopping);
2083 2079
2084 if (page()) 2080 if (page())
2085 page()->documentDetached(this); 2081 page()->documentDetached(this);
(...skipping 3409 matching lines...) Expand 10 before | Expand all | Expand 10 after
5495 } 5491 }
5496 5492
5497 void Document::invalidateNodeListCaches(const QualifiedName* attrName) 5493 void Document::invalidateNodeListCaches(const QualifiedName* attrName)
5498 { 5494 {
5499 HashSet<LiveNodeListBase*>::iterator end = m_listsInvalidatedAtDocument.end( ); 5495 HashSet<LiveNodeListBase*>::iterator end = m_listsInvalidatedAtDocument.end( );
5500 for (HashSet<LiveNodeListBase*>::iterator it = m_listsInvalidatedAtDocument. begin(); it != end; ++it) 5496 for (HashSet<LiveNodeListBase*>::iterator it = m_listsInvalidatedAtDocument. begin(); it != end; ++it)
5501 (*it)->invalidateCache(attrName); 5497 (*it)->invalidateCache(attrName);
5502 } 5498 }
5503 5499
5504 } // namespace WebCore 5500 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698