| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007 Rob Buis | 2 * Copyright (C) 2006, 2007 Rob Buis |
| 3 * Copyright (C) 2008 Apple, Inc. All rights reserved. | 3 * Copyright (C) 2008 Apple, Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 | 156 |
| 157 static bool shouldBypassMainWorldCSP(Element* element) | 157 static bool shouldBypassMainWorldCSP(Element* element) |
| 158 { | 158 { |
| 159 // Main world CSP is bypassed within an isolated world. | 159 // Main world CSP is bypassed within an isolated world. |
| 160 LocalFrame* frame = element->document().frame(); | 160 LocalFrame* frame = element->document().frame(); |
| 161 if (frame && frame->script().shouldBypassMainWorldCSP()) | 161 if (frame && frame->script().shouldBypassMainWorldCSP()) |
| 162 return true; | 162 return true; |
| 163 | 163 |
| 164 // Main world CSP is bypassed for style elements in user agent shadow DOM. | 164 // Main world CSP is bypassed for style elements in user agent shadow DOM. |
| 165 ShadowRoot* root = element->containingShadowRoot(); | 165 ShadowRoot* root = element->containingShadowRoot(); |
| 166 if (root && root->type() == ShadowRoot::UserAgentShadowRoot) | 166 if (root && root->type() == ShadowRoot::ClosedShadowRoot) |
| 167 return true; | 167 return true; |
| 168 | 168 |
| 169 return false; | 169 return false; |
| 170 } | 170 } |
| 171 | 171 |
| 172 void StyleElement::createSheet(Element* e, const String& text) | 172 void StyleElement::createSheet(Element* e, const String& text) |
| 173 { | 173 { |
| 174 ASSERT(e); | 174 ASSERT(e); |
| 175 ASSERT(e->inDocument()); | 175 ASSERT(e->inDocument()); |
| 176 Document& document = e->document(); | 176 Document& document = e->document(); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 { | 223 { |
| 224 document.styleEngine()->addPendingSheet(); | 224 document.styleEngine()->addPendingSheet(); |
| 225 } | 225 } |
| 226 | 226 |
| 227 void StyleElement::trace(Visitor* visitor) | 227 void StyleElement::trace(Visitor* visitor) |
| 228 { | 228 { |
| 229 visitor->trace(m_sheet); | 229 visitor->trace(m_sheet); |
| 230 } | 230 } |
| 231 | 231 |
| 232 } | 232 } |
| OLD | NEW |