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

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

Issue 2346663004: Moving platform tracing things into platform/tracing. (Closed)
Patch Set: Created 4 years, 3 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
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "core/dom/ShadowTreeStyleSheetCollection.h" 43 #include "core/dom/ShadowTreeStyleSheetCollection.h"
44 #include "core/dom/StyleChangeReason.h" 44 #include "core/dom/StyleChangeReason.h"
45 #include "core/dom/shadow/ShadowRoot.h" 45 #include "core/dom/shadow/ShadowRoot.h"
46 #include "core/frame/Settings.h" 46 #include "core/frame/Settings.h"
47 #include "core/html/HTMLIFrameElement.h" 47 #include "core/html/HTMLIFrameElement.h"
48 #include "core/html/HTMLLinkElement.h" 48 #include "core/html/HTMLLinkElement.h"
49 #include "core/html/imports/HTMLImportsController.h" 49 #include "core/html/imports/HTMLImportsController.h"
50 #include "core/inspector/InspectorInstrumentation.h" 50 #include "core/inspector/InspectorInstrumentation.h"
51 #include "core/page/Page.h" 51 #include "core/page/Page.h"
52 #include "core/svg/SVGStyleElement.h" 52 #include "core/svg/SVGStyleElement.h"
53 #include "platform/TraceEvent.h"
54 #include "platform/fonts/FontCache.h" 53 #include "platform/fonts/FontCache.h"
54 #include "platform/tracing/TraceEvent.h"
55 55
56 namespace blink { 56 namespace blink {
57 57
58 using namespace HTMLNames; 58 using namespace HTMLNames;
59 59
60 StyleEngine::StyleEngine(Document& document) 60 StyleEngine::StyleEngine(Document& document)
61 : m_document(&document) 61 : m_document(&document)
62 , m_isMaster(!document.importsController() || document.importsController()-> master() == &document) 62 , m_isMaster(!document.importsController() || document.importsController()-> master() == &document)
63 , m_documentStyleSheetCollection(DocumentStyleSheetCollection::create(docume nt)) 63 , m_documentStyleSheetCollection(DocumentStyleSheetCollection::create(docume nt))
64 { 64 {
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 832
833 DEFINE_TRACE_WRAPPERS(StyleEngine) 833 DEFINE_TRACE_WRAPPERS(StyleEngine)
834 { 834 {
835 for (auto sheet : m_injectedAuthorStyleSheets) { 835 for (auto sheet : m_injectedAuthorStyleSheets) {
836 visitor->traceWrappers(sheet); 836 visitor->traceWrappers(sheet);
837 } 837 }
838 visitor->traceWrappers(m_documentStyleSheetCollection); 838 visitor->traceWrappers(m_documentStyleSheetCollection);
839 } 839 }
840 840
841 } // namespace blink 841 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698