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

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

Issue 1318153009: CSP: Loosen restrictions on inline style and event attributes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | 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 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 3420 matching lines...) Expand 10 before | Expand all | Expand 10 after
3431 3431
3432 void Element::styleAttributeChanged(const AtomicString& newStyleString, Attribut eModificationReason modificationReason) 3432 void Element::styleAttributeChanged(const AtomicString& newStyleString, Attribut eModificationReason modificationReason)
3433 { 3433 {
3434 ASSERT(isStyledElement()); 3434 ASSERT(isStyledElement());
3435 WTF::OrdinalNumber startLineNumber = WTF::OrdinalNumber::beforeFirst(); 3435 WTF::OrdinalNumber startLineNumber = WTF::OrdinalNumber::beforeFirst();
3436 if (document().scriptableDocumentParser() && !document().isInDocumentWrite() ) 3436 if (document().scriptableDocumentParser() && !document().isInDocumentWrite() )
3437 startLineNumber = document().scriptableDocumentParser()->lineNumber(); 3437 startLineNumber = document().scriptableDocumentParser()->lineNumber();
3438 3438
3439 if (newStyleString.isNull()) { 3439 if (newStyleString.isNull()) {
3440 ensureUniqueElementData().m_inlineStyle.clear(); 3440 ensureUniqueElementData().m_inlineStyle.clear();
3441 } else if (modificationReason == ModifiedByCloning || document().contentSecu rityPolicy()->allowInlineStyle(document().url(), startLineNumber, newStyleString )) { 3441 } else if (modificationReason == ModifiedByCloning || ContentSecurityPolicy: :shouldBypassMainWorld(&document()) || document().contentSecurityPolicy()->allow InlineStyle(document().url(), startLineNumber, newStyleString)) {
3442 setInlineStyleFromString(newStyleString); 3442 setInlineStyleFromString(newStyleString);
3443 } 3443 }
3444 3444
3445 elementData()->m_styleAttributeIsDirty = false; 3445 elementData()->m_styleAttributeIsDirty = false;
3446 3446
3447 setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(St yleChangeReason::StyleSheetChange)); 3447 setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(St yleChangeReason::StyleSheetChange));
3448 InspectorInstrumentation::didInvalidateStyleAttr(this); 3448 InspectorInstrumentation::didInvalidateStyleAttr(this);
3449 } 3449 }
3450 3450
3451 void Element::inlineStyleChanged() 3451 void Element::inlineStyleChanged()
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
3568 { 3568 {
3569 #if ENABLE(OILPAN) 3569 #if ENABLE(OILPAN)
3570 if (hasRareData()) 3570 if (hasRareData())
3571 visitor->trace(elementRareData()); 3571 visitor->trace(elementRareData());
3572 visitor->trace(m_elementData); 3572 visitor->trace(m_elementData);
3573 #endif 3573 #endif
3574 ContainerNode::trace(visitor); 3574 ContainerNode::trace(visitor);
3575 } 3575 }
3576 3576
3577 } // namespace blink 3577 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698