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

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

Issue 131403008: Revert of Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | « Source/core/dom/Document.h ('k') | Source/core/dom/DocumentStyleSheetCollection.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 1930 matching lines...) Expand 10 before | Expand all | Expand 10 after
1941 StyleResolver& Document::ensureStyleResolver() const 1941 StyleResolver& Document::ensureStyleResolver() const
1942 { 1942 {
1943 return m_styleEngine->ensureResolver(); 1943 return m_styleEngine->ensureResolver();
1944 } 1944 }
1945 1945
1946 void Document::clearStyleResolver() 1946 void Document::clearStyleResolver()
1947 { 1947 {
1948 m_styleEngine->clearResolver(); 1948 m_styleEngine->clearResolver();
1949 } 1949 }
1950 1950
1951 CSSFontSelector* Document::fontSelector() const
1952 {
1953 return m_styleEngine->fontSelector();
1954 }
1955
1956 void Document::attach(const AttachContext& context) 1951 void Document::attach(const AttachContext& context)
1957 { 1952 {
1958 ASSERT(m_lifecyle.state() == DocumentLifecycle::Inactive); 1953 ASSERT(m_lifecyle.state() == DocumentLifecycle::Inactive);
1959 ASSERT(!m_axObjectCache || this != topDocument()); 1954 ASSERT(!m_axObjectCache || this != topDocument());
1960 1955
1961 m_renderView = new RenderView(this); 1956 m_renderView = new RenderView(this);
1962 setRenderer(m_renderView); 1957 setRenderer(m_renderView);
1963 1958
1964 m_renderView->setIsInWindow(true); 1959 m_renderView->setIsInWindow(true);
1965 m_renderView->setStyle(StyleResolver::styleForDocument(*this)); 1960 m_renderView->setStyle(StyleResolver::styleForDocument(*this));
(...skipping 3303 matching lines...) Expand 10 before | Expand all | Expand 10 after
5269 } 5264 }
5270 5265
5271 FastTextAutosizer* Document::fastTextAutosizer() 5266 FastTextAutosizer* Document::fastTextAutosizer()
5272 { 5267 {
5273 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d()) 5268 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d())
5274 m_fastTextAutosizer = FastTextAutosizer::create(this); 5269 m_fastTextAutosizer = FastTextAutosizer::create(this);
5275 return m_fastTextAutosizer.get(); 5270 return m_fastTextAutosizer.get();
5276 } 5271 }
5277 5272
5278 } // namespace WebCore 5273 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/dom/DocumentStyleSheetCollection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698