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

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

Issue 305743003: HTMLImportsController does not need to hold Document ptr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 6 years, 6 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/DocumentInit.cpp ('k') | Source/core/fetch/ResourceFetcher.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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "core/frame/Settings.h" 48 #include "core/frame/Settings.h"
49 #include "core/svg/SVGStyleElement.h" 49 #include "core/svg/SVGStyleElement.h"
50 #include "platform/URLPatternMatcher.h" 50 #include "platform/URLPatternMatcher.h"
51 51
52 namespace WebCore { 52 namespace WebCore {
53 53
54 using namespace HTMLNames; 54 using namespace HTMLNames;
55 55
56 StyleEngine::StyleEngine(Document& document) 56 StyleEngine::StyleEngine(Document& document)
57 : m_document(&document) 57 : m_document(&document)
58 , m_isMaster(!document.importsController() || document.importsController()-> isMaster(document) ) 58 , m_isMaster(!document.importsController() || document.importsController()-> master() == &document)
59 , m_pendingStylesheets(0) 59 , m_pendingStylesheets(0)
60 , m_injectedStyleSheetCacheValid(false) 60 , m_injectedStyleSheetCacheValid(false)
61 #if ENABLE(OILPAN) 61 #if ENABLE(OILPAN)
62 , m_documentStyleSheetCollection(new DocumentStyleSheetCollection(document)) 62 , m_documentStyleSheetCollection(new DocumentStyleSheetCollection(document))
63 #else 63 #else
64 , m_documentStyleSheetCollection(document) 64 , m_documentStyleSheetCollection(document)
65 #endif 65 #endif
66 , m_documentScopeDirty(true) 66 , m_documentScopeDirty(true)
67 , m_usesSiblingRules(false) 67 , m_usesSiblingRules(false)
68 , m_usesSiblingRulesOverride(false) 68 , m_usesSiblingRulesOverride(false)
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 visitor->trace(m_authorStyleSheets); 641 visitor->trace(m_authorStyleSheets);
642 visitor->trace(m_documentStyleSheetCollection); 642 visitor->trace(m_documentStyleSheetCollection);
643 visitor->trace(m_styleSheetCollectionMap); 643 visitor->trace(m_styleSheetCollectionMap);
644 visitor->trace(m_resolver); 644 visitor->trace(m_resolver);
645 visitor->trace(m_fontSelector); 645 visitor->trace(m_fontSelector);
646 visitor->trace(m_textToSheetCache); 646 visitor->trace(m_textToSheetCache);
647 visitor->trace(m_sheetToTextCache); 647 visitor->trace(m_sheetToTextCache);
648 } 648 }
649 649
650 } 650 }
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentInit.cpp ('k') | Source/core/fetch/ResourceFetcher.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698