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

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: Added 2 layout tests 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 1924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1935 StyleResolver& Document::ensureStyleResolver() const 1935 StyleResolver& Document::ensureStyleResolver() const
1936 { 1936 {
1937 return m_styleEngine->ensureResolver(); 1937 return m_styleEngine->ensureResolver();
1938 } 1938 }
1939 1939
1940 void Document::clearStyleResolver() 1940 void Document::clearStyleResolver()
1941 { 1941 {
1942 m_styleEngine->clearResolver(); 1942 m_styleEngine->clearResolver();
1943 } 1943 }
1944 1944
1945 CSSFontSelector* Document::fontSelector() const
1946 {
1947 return m_styleEngine->fontSelector();
1948 }
1949
1945 void Document::attach(const AttachContext& context) 1950 void Document::attach(const AttachContext& context)
1946 { 1951 {
1947 ASSERT(m_lifecyle.state() == DocumentLifecycle::Inactive); 1952 ASSERT(m_lifecyle.state() == DocumentLifecycle::Inactive);
1948 ASSERT(!m_axObjectCache || this != topDocument()); 1953 ASSERT(!m_axObjectCache || this != topDocument());
1949 1954
1950 m_renderView = new RenderView(this); 1955 m_renderView = new RenderView(this);
1951 setRenderer(m_renderView); 1956 setRenderer(m_renderView);
1952 1957
1953 m_renderView->setIsInWindow(true); 1958 m_renderView->setIsInWindow(true);
1954 m_renderView->setStyle(StyleResolver::styleForDocument(*this)); 1959 m_renderView->setStyle(StyleResolver::styleForDocument(*this));
(...skipping 3277 matching lines...) Expand 10 before | Expand all | Expand 10 after
5232 } 5237 }
5233 5238
5234 FastTextAutosizer* Document::fastTextAutosizer() 5239 FastTextAutosizer* Document::fastTextAutosizer()
5235 { 5240 {
5236 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d()) 5241 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable d())
5237 m_fastTextAutosizer = FastTextAutosizer::create(this); 5242 m_fastTextAutosizer = FastTextAutosizer::create(this);
5238 return m_fastTextAutosizer.get(); 5243 return m_fastTextAutosizer.get();
5239 } 5244 }
5240 5245
5241 } // namespace WebCore 5246 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698