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

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

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reset when Settings is changed Created 7 years 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
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 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 StyleResolver& Document::ensureStyleResolver() const 1933 StyleResolver& Document::ensureStyleResolver() const
1934 { 1934 {
1935 return m_styleEngine->ensureResolver(); 1935 return m_styleEngine->ensureResolver();
1936 } 1936 }
1937 1937
1938 void Document::clearStyleResolver() 1938 void Document::clearStyleResolver()
1939 { 1939 {
1940 m_styleEngine->clearResolver(); 1940 m_styleEngine->clearResolver();
1941 } 1941 }
1942 1942
1943 CSSFontSelector* Document::fontSelector() const
1944 {
1945 return m_styleEngine->fontSelector();
1946 }
1947
1943 void Document::attach(const AttachContext& context) 1948 void Document::attach(const AttachContext& context)
1944 { 1949 {
1945 ASSERT(m_lifecyle.state() == DocumentLifecycle::Inactive); 1950 ASSERT(m_lifecyle.state() == DocumentLifecycle::Inactive);
1946 ASSERT(!m_axObjectCache || this != topDocument()); 1951 ASSERT(!m_axObjectCache || this != topDocument());
1947 1952
1948 m_renderView = new RenderView(this); 1953 m_renderView = new RenderView(this);
1949 setRenderer(m_renderView); 1954 setRenderer(m_renderView);
1950 1955
1951 m_renderView->setIsInWindow(true); 1956 m_renderView->setIsInWindow(true);
1952 m_renderView->setStyle(StyleResolver::styleForDocument(*this)); 1957 m_renderView->setStyle(StyleResolver::styleForDocument(*this));
(...skipping 3251 matching lines...) Expand 10 before | Expand all | Expand 10 after
5204 } 5209 }
5205 5210
5206 FastTextAutosizer* Document::fastTextAutosizer() 5211 FastTextAutosizer* Document::fastTextAutosizer()
5207 { 5212 {
5208 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d()) 5213 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d())
5209 m_fastTextAutosizer = FastTextAutosizer::create(this); 5214 m_fastTextAutosizer = FastTextAutosizer::create(this);
5210 return m_fastTextAutosizer.get(); 5215 return m_fastTextAutosizer.get();
5211 } 5216 }
5212 5217
5213 } // namespace WebCore 5218 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698