| OLD | NEW |
| 1 /* | 1 /* |
| 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2006, 2007, 2012 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2006, 2007, 2012 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, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 */ | 19 */ |
| 20 | 20 |
| 21 #include "config.h" | 21 #include "config.h" |
| 22 #include "core/css/StyleSheetContents.h" | 22 #include "core/css/StyleSheetContents.h" |
| 23 | 23 |
| 24 #include "core/css/CSSParser.h" | 24 #include "core/css/parser/BisonCSSParser.h" |
| 25 #include "core/css/CSSStyleSheet.h" | 25 #include "core/css/CSSStyleSheet.h" |
| 26 #include "core/css/MediaList.h" | 26 #include "core/css/MediaList.h" |
| 27 #include "core/css/StylePropertySet.h" | 27 #include "core/css/StylePropertySet.h" |
| 28 #include "core/css/StyleRule.h" | 28 #include "core/css/StyleRule.h" |
| 29 #include "core/css/StyleRuleImport.h" | 29 #include "core/css/StyleRuleImport.h" |
| 30 #include "core/css/resolver/StyleResolver.h" | 30 #include "core/css/resolver/StyleResolver.h" |
| 31 #include "core/dom/Node.h" | 31 #include "core/dom/Node.h" |
| 32 #include "core/dom/StyleEngine.h" | 32 #include "core/dom/StyleEngine.h" |
| 33 #include "core/fetch/CSSStyleSheetResource.h" | 33 #include "core/fetch/CSSStyleSheetResource.h" |
| 34 #include "core/frame/UseCounter.h" | 34 #include "core/frame/UseCounter.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 void StyleSheetContents::parseAuthorStyleSheet(const CSSStyleSheetResource* cach
edStyleSheet, const SecurityOrigin* securityOrigin) | 294 void StyleSheetContents::parseAuthorStyleSheet(const CSSStyleSheetResource* cach
edStyleSheet, const SecurityOrigin* securityOrigin) |
| 295 { | 295 { |
| 296 TRACE_EVENT0("webkit", "StyleSheetContents::parseAuthorStyleSheet"); | 296 TRACE_EVENT0("webkit", "StyleSheetContents::parseAuthorStyleSheet"); |
| 297 | 297 |
| 298 bool quirksMode = isQuirksModeBehavior(m_parserContext.mode()); | 298 bool quirksMode = isQuirksModeBehavior(m_parserContext.mode()); |
| 299 | 299 |
| 300 bool enforceMIMEType = !quirksMode; | 300 bool enforceMIMEType = !quirksMode; |
| 301 bool hasValidMIMEType = false; | 301 bool hasValidMIMEType = false; |
| 302 String sheetText = cachedStyleSheet->sheetText(enforceMIMEType, &hasValidMIM
EType); | 302 String sheetText = cachedStyleSheet->sheetText(enforceMIMEType, &hasValidMIM
EType); |
| 303 | 303 |
| 304 CSSParser p(parserContext(), UseCounter::getFrom(this)); | 304 BisonCSSParser p(parserContext(), UseCounter::getFrom(this)); |
| 305 p.parseSheet(this, sheetText, TextPosition::minimumPosition(), 0, true); | 305 p.parseSheet(this, sheetText, TextPosition::minimumPosition(), 0, true); |
| 306 | 306 |
| 307 // If we're loading a stylesheet cross-origin, and the MIME type is not stan
dard, require the CSS | 307 // If we're loading a stylesheet cross-origin, and the MIME type is not stan
dard, require the CSS |
| 308 // to at least start with a syntactically valid CSS rule. | 308 // to at least start with a syntactically valid CSS rule. |
| 309 // This prevents an attacker playing games by injecting CSS strings into HTM
L, XML, JSON, etc. etc. | 309 // This prevents an attacker playing games by injecting CSS strings into HTM
L, XML, JSON, etc. etc. |
| 310 if (!hasValidMIMEType && !hasSyntacticallyValidCSSHeader()) { | 310 if (!hasValidMIMEType && !hasSyntacticallyValidCSSHeader()) { |
| 311 bool isCrossOriginCSS = !securityOrigin || !securityOrigin->canRequest(b
aseURL()); | 311 bool isCrossOriginCSS = !securityOrigin || !securityOrigin->canRequest(b
aseURL()); |
| 312 if (isCrossOriginCSS) { | 312 if (isCrossOriginCSS) { |
| 313 clearRules(); | 313 clearRules(); |
| 314 return; | 314 return; |
| 315 } | 315 } |
| 316 } | 316 } |
| 317 } | 317 } |
| 318 | 318 |
| 319 bool StyleSheetContents::parseString(const String& sheetText) | 319 bool StyleSheetContents::parseString(const String& sheetText) |
| 320 { | 320 { |
| 321 return parseStringAtPosition(sheetText, TextPosition::minimumPosition(), fal
se); | 321 return parseStringAtPosition(sheetText, TextPosition::minimumPosition(), fal
se); |
| 322 } | 322 } |
| 323 | 323 |
| 324 bool StyleSheetContents::parseStringAtPosition(const String& sheetText, const Te
xtPosition& startPosition, bool createdByParser) | 324 bool StyleSheetContents::parseStringAtPosition(const String& sheetText, const Te
xtPosition& startPosition, bool createdByParser) |
| 325 { | 325 { |
| 326 CSSParser p(parserContext(), UseCounter::getFrom(this)); | 326 BisonCSSParser p(parserContext(), UseCounter::getFrom(this)); |
| 327 p.parseSheet(this, sheetText, startPosition, 0, createdByParser); | 327 p.parseSheet(this, sheetText, startPosition, 0, createdByParser); |
| 328 | 328 |
| 329 return true; | 329 return true; |
| 330 } | 330 } |
| 331 | 331 |
| 332 bool StyleSheetContents::isLoading() const | 332 bool StyleSheetContents::isLoading() const |
| 333 { | 333 { |
| 334 for (unsigned i = 0; i < m_importRules.size(); ++i) { | 334 for (unsigned i = 0; i < m_importRules.size(); ++i) { |
| 335 if (m_importRules[i]->isLoading()) | 335 if (m_importRules[i]->isLoading()) |
| 336 return true; | 336 return true; |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 // See the StyleResolver calls in ScopedStyleResolver::addRulesFromSheet. | 522 // See the StyleResolver calls in ScopedStyleResolver::addRulesFromSheet. |
| 523 for (size_t i = 0; i < m_clients.size(); ++i) { | 523 for (size_t i = 0; i < m_clients.size(); ++i) { |
| 524 if (Document* document = m_clients[i]->ownerDocument()) | 524 if (Document* document = m_clients[i]->ownerDocument()) |
| 525 document->styleEngine()->clearResolver(); | 525 document->styleEngine()->clearResolver(); |
| 526 } | 526 } |
| 527 m_ruleSet.clear(); | 527 m_ruleSet.clear(); |
| 528 } | 528 } |
| 529 | 529 |
| 530 | 530 |
| 531 } | 531 } |
| OLD | NEW |