| 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 | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All |
| 7 * rights reserved. | 7 * rights reserved. |
| 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
| 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. | 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 m_injectedAuthorStyleSheets.push_back(TraceWrapperMember<CSSStyleSheet>( | 140 m_injectedAuthorStyleSheets.push_back(TraceWrapperMember<CSSStyleSheet>( |
| 141 this, CSSStyleSheet::create(authorSheet, *m_document))); | 141 this, CSSStyleSheet::create(authorSheet, *m_document))); |
| 142 markDocumentDirty(); | 142 markDocumentDirty(); |
| 143 } | 143 } |
| 144 | 144 |
| 145 CSSStyleSheet& StyleEngine::ensureInspectorStyleSheet() { | 145 CSSStyleSheet& StyleEngine::ensureInspectorStyleSheet() { |
| 146 if (m_inspectorStyleSheet) | 146 if (m_inspectorStyleSheet) |
| 147 return *m_inspectorStyleSheet; | 147 return *m_inspectorStyleSheet; |
| 148 | 148 |
| 149 StyleSheetContents* contents = | 149 StyleSheetContents* contents = |
| 150 StyleSheetContents::create(CSSParserContext(*m_document, nullptr)); | 150 StyleSheetContents::create(CSSParserContext::create(*m_document)); |
| 151 m_inspectorStyleSheet = CSSStyleSheet::create(contents, *m_document); | 151 m_inspectorStyleSheet = CSSStyleSheet::create(contents, *m_document); |
| 152 markDocumentDirty(); | 152 markDocumentDirty(); |
| 153 // TODO(rune@opera.com): Making the active stylesheets up-to-date here is | 153 // TODO(rune@opera.com): Making the active stylesheets up-to-date here is |
| 154 // required by some inspector tests, at least. I theory this should not be | 154 // required by some inspector tests, at least. I theory this should not be |
| 155 // necessary. Need to investigate to figure out if/why. | 155 // necessary. Need to investigate to figure out if/why. |
| 156 updateActiveStyle(); | 156 updateActiveStyle(); |
| 157 return *m_inspectorStyleSheet; | 157 return *m_inspectorStyleSheet; |
| 158 } | 158 } |
| 159 | 159 |
| 160 void StyleEngine::addPendingSheet(StyleEngineContext& context) { | 160 void StyleEngine::addPendingSheet(StyleEngineContext& context) { |
| (...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1137 } | 1137 } |
| 1138 | 1138 |
| 1139 DEFINE_TRACE_WRAPPERS(StyleEngine) { | 1139 DEFINE_TRACE_WRAPPERS(StyleEngine) { |
| 1140 for (auto sheet : m_injectedAuthorStyleSheets) { | 1140 for (auto sheet : m_injectedAuthorStyleSheets) { |
| 1141 visitor->traceWrappers(sheet); | 1141 visitor->traceWrappers(sheet); |
| 1142 } | 1142 } |
| 1143 visitor->traceWrappers(m_documentStyleSheetCollection); | 1143 visitor->traceWrappers(m_documentStyleSheetCollection); |
| 1144 } | 1144 } |
| 1145 | 1145 |
| 1146 } // namespace blink | 1146 } // namespace blink |
| OLD | NEW |