Changeset 146763 in webkit
- Timestamp:
- Mar 25, 2013 6:39:41 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r146762 r146763 1 2013-03-25 Mike West <mkwst@chromium.org> 2 3 CSP 1.1: Rename SecurityPolicyViolationEvent::sourceURL to ::sourceFile. 4 https://bugs.webkit.org/show_bug.cgi?id=113033 5 6 Reviewed by Jochen Eisinger. 7 8 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt: 9 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html: 10 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt: 11 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt: 12 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html: 13 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html: 14 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt: 15 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt: 16 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html: 17 * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html: 18 1 19 2013-03-25 Michelangelo De Simone <michelangelo@webkit.org> 2 20 -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt
r146305 r146763 13 13 PASS window.e.effectiveDirective is "effectiveDirectiveValue" 14 14 PASS window.e.originalPolicy is "originalPolicyValue" 15 PASS window.e.source URL is "sourceURLValue"15 PASS window.e.sourceFile is "sourceFileValue" 16 16 PASS window.e.lineNumber is 1 17 17 PASS successfullyParsed is true -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html
r146305 r146763 16 16 'effectiveDirective': 'effectiveDirectiveValue', 17 17 'originalPolicy': 'originalPolicyValue', 18 'source URL': 'sourceURLValue',18 'sourceFile': 'sourceFileValue', 19 19 'lineNumber': 1 20 20 }; -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-expected.txt
r146758 r146763 13 13 PASS window.e.effectiveDirective is "img-src" 14 14 PASS window.e.originalPolicy is "img-src 'none'" 15 PASS window.e.source URLis "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html"15 PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html" 16 16 PASS window.e.lineNumber is 23 17 17 PASS successfullyParsed is true -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script-expected.txt
r146758 r146763 13 13 PASS window.e.effectiveDirective is "img-src" 14 14 PASS window.e.originalPolicy is "img-src 'none'" 15 PASS window.e.source URLis "http://localhost:8000"15 PASS window.e.sourceFile is "http://localhost:8000" 16 16 PASS window.e.lineNumber is 3 17 17 PASS successfullyParsed is true -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image-from-script.html
r146758 r146763 15 15 'effectiveDirective': 'img-src', 16 16 'originalPolicy': 'img-src \'none\'', 17 'source URL': 'http://localhost:8000',17 'sourceFile': 'http://localhost:8000', 18 18 'lineNumber': 3 19 19 }; -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-cross-origin-image.html
r146758 r146763 15 15 'effectiveDirective': 'img-src', 16 16 'originalPolicy': 'img-src \'none\'', 17 'source URL': document.location.toString(),17 'sourceFile': document.location.toString(), 18 18 'lineNumber': 23 19 19 }; -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt
r146758 r146763 13 13 PASS window.e.effectiveDirective is "img-src" 14 14 PASS window.e.originalPolicy is "img-src 'none'" 15 PASS window.e.source URLis "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html"15 PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html" 16 16 PASS window.e.lineNumber is 23 17 17 PASS successfullyParsed is true -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script-expected.txt
r146758 r146763 13 13 PASS window.e.effectiveDirective is "img-src" 14 14 PASS window.e.originalPolicy is "img-src 'none'" 15 PASS window.e.source URLis "http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js"15 PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js" 16 16 PASS window.e.lineNumber is 3 17 17 PASS successfullyParsed is true -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-from-script.html
r146758 r146763 15 15 'effectiveDirective': 'img-src', 16 16 'originalPolicy': 'img-src \'none\'', 17 'source URL': 'http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js',17 'sourceFile': 'http://127.0.0.1:8000/security/contentSecurityPolicy/resources/inject-image.js', 18 18 'lineNumber': 3 19 19 }; -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html
r146758 r146763 15 15 'effectiveDirective': 'img-src', 16 16 'originalPolicy': 'img-src \'none\'', 17 'source URL': document.location.toString(),17 'sourceFile': document.location.toString(), 18 18 'lineNumber': 23 19 19 }; -
trunk/Source/WebCore/ChangeLog
r146762 r146763 1 2013-03-25 Mike West <mkwst@chromium.org> 2 3 CSP 1.1: Rename SecurityPolicyViolationEvent::sourceURL to ::sourceFile. 4 https://bugs.webkit.org/show_bug.cgi?id=113033 5 6 Reviewed by Jochen Eisinger. 7 8 Bringing our experimental implementation into line with the spec, which 9 has landed on the de facto standard name Gecko has been sending out for 10 years and years. 11 12 Spec: https://dvcs.w3.org/hg/content-security-policy/rev/e44f4003e158 13 Thread: http://lists.w3.org/Archives/Public/public-webappsec/2013Mar/0087.html 14 15 * dom/SecurityPolicyViolationEvent.h: 16 (SecurityPolicyViolationEventInit): 17 (WebCore::SecurityPolicyViolationEvent::sourceFile): 18 (WebCore::SecurityPolicyViolationEvent::SecurityPolicyViolationEvent): 19 (SecurityPolicyViolationEvent): 20 * dom/SecurityPolicyViolationEvent.idl: 21 * page/ContentSecurityPolicy.cpp: 22 (WebCore::gatherSecurityPolicyViolationEventData): 23 s/sourceURL/sourceFile/ 24 1 25 2013-03-25 Michelangelo De Simone <michelangelo@webkit.org> 2 26 -
trunk/Source/WebCore/dom/SecurityPolicyViolationEvent.h
r146305 r146763 44 44 String effectiveDirective; 45 45 String originalPolicy; 46 String source URL;46 String sourceFile; 47 47 int lineNumber; 48 48 }; … … 66 66 const String& effectiveDirective() const { return m_effectiveDirective; } 67 67 const String& originalPolicy() const { return m_originalPolicy; } 68 const String& source URL() const { return m_sourceURL; }68 const String& sourceFile() const { return m_sourceFile; } 69 69 int lineNumber() const { return m_lineNumber; } 70 70 … … 84 84 , m_effectiveDirective(initializer.effectiveDirective) 85 85 , m_originalPolicy(initializer.originalPolicy) 86 , m_source URL(initializer.sourceURL)86 , m_sourceFile(initializer.sourceFile) 87 87 , m_lineNumber(initializer.lineNumber) 88 88 { … … 95 95 String m_effectiveDirective; 96 96 String m_originalPolicy; 97 String m_source URL;97 String m_sourceFile; 98 98 int m_lineNumber; 99 99 }; -
trunk/Source/WebCore/dom/SecurityPolicyViolationEvent.idl
r146305 r146763 33 33 [InitializedByEventConstructor] readonly attribute DOMString effectiveDirective; 34 34 [InitializedByEventConstructor] readonly attribute DOMString originalPolicy; 35 [InitializedByEventConstructor] readonly attribute DOMString source URL;35 [InitializedByEventConstructor] readonly attribute DOMString sourceFile; 36 36 [InitializedByEventConstructor] readonly attribute long lineNumber; 37 37 }; -
trunk/Source/WebCore/page/ContentSecurityPolicy.cpp
r146758 r146763 1691 1691 init.effectiveDirective = effectiveDirective; 1692 1692 init.originalPolicy = header; 1693 init.source URL= String();1693 init.sourceFile = String(); 1694 1694 init.lineNumber = 0; 1695 1695 … … 1702 1702 if (callFrame.lineNumber()) { 1703 1703 KURL source = KURL(ParsedURLString, callFrame.sourceURL()); 1704 init.source URL= stripURLForUseInReport(document, source);1704 init.sourceFile = stripURLForUseInReport(document, source); 1705 1705 init.lineNumber = callFrame.lineNumber(); 1706 1706 }
Note: See TracChangeset
for help on using the changeset viewer.