Source/core/dom/Document.cpp - Issue 82583005: Use removeFontFace to avoid resetting fontSelector.

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: Modified resetFontSelector 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

OLD	NEW
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 1968 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1979 StyleResolver& Document::ensureStyleResolver() const	1979 StyleResolver& Document::ensureStyleResolver() const

1980 {	1980 {

1981 return m_styleEngine->ensureResolver();	1981 return m_styleEngine->ensureResolver();

1982 }	1982 }

1983	1983

1984 void Document::clearStyleResolver()	1984 void Document::clearStyleResolver()

1985 {	1985 {

1986 m_styleEngine->clearResolver();	1986 m_styleEngine->clearResolver();

1987 }	1987 }

1988	1988

	1989 CSSFontSelector* Document::fontSelector() const

	1990 {

	1991 return m_styleEngine->fontSelector();

	1992 }

	1993

1989 void Document::attach(const AttachContext& context)	1994 void Document::attach(const AttachContext& context)

1990 {	1995 {

1991 ASSERT(m_lifecyle.state() == DocumentLifecycle::Inactive);	1996 ASSERT(m_lifecyle.state() == DocumentLifecycle::Inactive);

1992 ASSERT(!m_axObjectCache \|\| this != topDocument());	1997 ASSERT(!m_axObjectCache \|\| this != topDocument());

1993	1998

1994 m_renderView = new RenderView(this);	1999 m_renderView = new RenderView(this);

1995 setRenderer(m_renderView);	2000 setRenderer(m_renderView);

1996	2001

1997 m_renderView->setIsInWindow(true);	2002 m_renderView->setIsInWindow(true);

1998 m_renderView->setStyle(StyleResolver::styleForDocument(*this));	2003 m_renderView->setStyle(StyleResolver::styleForDocument(*this));

(...skipping 3356 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
5355 if (!page->focusController().isActive() \|\| !page->focusController().isFocuse d())	5360 if (!page->focusController().isActive() \|\| !page->focusController().isFocuse d())

5356 return false;	5361 return false;

5357 if (Frame* focusedFrame = page->focusController().focusedFrame()) {	5362 if (Frame* focusedFrame = page->focusController().focusedFrame()) {

5358 if (focusedFrame->tree().isDescendantOf(frame()))	5363 if (focusedFrame->tree().isDescendantOf(frame()))

5359 return true;	5364 return true;

5360 }	5365 }

5361 return false;	5366 return false;

5362 }	5367 }

5363	5368

5364 } // namespace WebCore	5369 } // namespace WebCore

OLD	NEW

« Source/core/dom/Document.h ('K') | « Source/core/dom/Document.h ('k') | Source/core/dom/DocumentStyleSheetCollection.cpp » ('j') | Source/core/dom/StyleEngine.cpp » ('J')