Attachment 194487 Details for Bug 113033 – Patch

[patch] Patch

bug-113033-20130322104446.patch (text/plain), 9.62 KB, created by Mike West on 2013-03-22 02:48:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mike West

Created: 2013-03-22 02:48:59 PDT

Size: 9.62 KB

patch

obsolete

>Subversion Revision: 146573
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 86131955407dcb646e5d196bf346ee2bbf337c12..4469d84333348c2d99ab66df86cf133a4da1ea48 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,27 @@
>+2013-03-22  Mike West  <mkwst@chromium.org>
>+
>+        CSP 1.1: Rename SecurityPolicyViolationEvent::sourceURL to ::sourceFile.
>+        https://bugs.webkit.org/show_bug.cgi?id=113033
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Bringing our experimental implementation into line with the spec, which
>+        has landed on the de facto standard name Gecko has been sending out for
>+        years and years.
>+
>+        Spec: https://dvcs.w3.org/hg/content-security-policy/rev/e44f4003e158
>+        Thread: http://lists.w3.org/Archives/Public/public-webappsec/2013Mar/0087.html
>+
>+        * dom/SecurityPolicyViolationEvent.h:
>+        (SecurityPolicyViolationEventInit):
>+        (WebCore::SecurityPolicyViolationEvent::sourceFile):
>+        (WebCore::SecurityPolicyViolationEvent::SecurityPolicyViolationEvent):
>+        (SecurityPolicyViolationEvent):
>+        * dom/SecurityPolicyViolationEvent.idl:
>+        * page/ContentSecurityPolicy.cpp:
>+        (WebCore::gatherSecurityPolicyViolationEventData):
>+            s/sourceURL/sourceFile/gi
>+
> 2013-03-22  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r146534 and r146565.
>diff --git a/Source/WebCore/dom/SecurityPolicyViolationEvent.h b/Source/WebCore/dom/SecurityPolicyViolationEvent.h
>index 29e1b2739ac573c87be1ee68ddeff8d8d170ef69..35a1b5f19537479d6b1e1c5ea623b53d73c3aa56 100644
>--- a/Source/WebCore/dom/SecurityPolicyViolationEvent.h
>+++ b/Source/WebCore/dom/SecurityPolicyViolationEvent.h
>@@ -43,7 +43,7 @@ struct SecurityPolicyViolationEventInit : public EventInit {
>     String violatedDirective;
>     String effectiveDirective;
>     String originalPolicy;
>-    String sourceURL;
>+    String sourceFile;
>     int lineNumber;
> };
> 
>@@ -65,7 +65,7 @@ public:
>     const String& violatedDirective() const { return m_violatedDirective; }
>     const String& effectiveDirective() const { return m_effectiveDirective; }
>     const String& originalPolicy() const { return m_originalPolicy; }
>-    const String& sourceURL() const { return m_sourceURL; }
>+    const String& sourceFile() const { return m_sourceFile; }
>     int lineNumber() const { return m_lineNumber; }
> 
>     virtual const AtomicString& interfaceName() const { return eventNames().interfaceForSecurityPolicyViolationEvent; }
>@@ -83,7 +83,7 @@ private:
>         , m_violatedDirective(initializer.violatedDirective)
>         , m_effectiveDirective(initializer.effectiveDirective)
>         , m_originalPolicy(initializer.originalPolicy)
>-        , m_sourceURL(initializer.sourceURL)
>+        , m_sourceFile(initializer.sourceFile)
>         , m_lineNumber(initializer.lineNumber)
>     {
>     }
>@@ -94,7 +94,7 @@ private:
>     String m_violatedDirective;
>     String m_effectiveDirective;
>     String m_originalPolicy;
>-    String m_sourceURL;
>+    String m_sourceFile;
>     int m_lineNumber;
> };
> 
>diff --git a/Source/WebCore/dom/SecurityPolicyViolationEvent.idl b/Source/WebCore/dom/SecurityPolicyViolationEvent.idl
>index a9eeb3eaac1233c27e07f0b87b907f40b1ab8a6b..435707fce5b2af19894eb0a729a1262657342bcf 100644
>--- a/Source/WebCore/dom/SecurityPolicyViolationEvent.idl
>+++ b/Source/WebCore/dom/SecurityPolicyViolationEvent.idl
>@@ -32,6 +32,6 @@
>     [InitializedByEventConstructor] readonly attribute DOMString violatedDirective;
>     [InitializedByEventConstructor] readonly attribute DOMString effectiveDirective;
>     [InitializedByEventConstructor] readonly attribute DOMString originalPolicy;
>-    [InitializedByEventConstructor] readonly attribute DOMString sourceURL;
>+    [InitializedByEventConstructor] readonly attribute DOMString sourceFile;
>     [InitializedByEventConstructor] readonly attribute long      lineNumber;
> };
>diff --git a/Source/WebCore/page/ContentSecurityPolicy.cpp b/Source/WebCore/page/ContentSecurityPolicy.cpp
>index c9cd406c880407f37cdaab34972a654cb41bfcd4..73d144531e81c6a880cb1afeba8665505bd0925d 100644
>--- a/Source/WebCore/page/ContentSecurityPolicy.cpp
>+++ b/Source/WebCore/page/ContentSecurityPolicy.cpp
>@@ -1681,7 +1681,7 @@ static void gatherSecurityPolicyViolationEventData(SecurityPolicyViolationEventI
>     init.violatedDirective = directiveText;
>     init.effectiveDirective = effectiveDirective;
>     init.originalPolicy = header;
>-    init.sourceURL = String();
>+    init.sourceFile = String();
>     init.lineNumber = 0;
> 
>     RefPtr<ScriptCallStack> stack = createScriptCallStack(2, false);
>@@ -1692,7 +1692,7 @@ static void gatherSecurityPolicyViolationEventData(SecurityPolicyViolationEventI
> 
>     if (callFrame.lineNumber()) {
>         KURL source = KURL(KURL(), callFrame.sourceURL());
>-        init.sourceURL = source.string();
>+        init.sourceFile = source.string();
>         init.lineNumber = callFrame.lineNumber();
>     }
> }
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index ec3159bcf67ea934a448cf1afed9a1658693962e..5d39603209612b95bbd95d367bd7b06103be5a65 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2013-03-22  Mike West  <mkwst@chromium.org>
>+
>+        CSP 1.1: Rename SecurityPolicyViolationEvent::sourceURL to ::sourceFile.
>+        https://bugs.webkit.org/show_bug.cgi?id=113033
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt:
>+        * http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html:
>+
> 2013-03-22  Zan Dobersek  <zdobersek@igalia.com>
> 
>         Unreviewed GTK gardening.
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt
>index 95581f2903af867ec64531f7c97cf9910c17a071..c0f2ae4fc85987596f61991773772b37bebe06d6 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics-expected.txt
>@@ -12,7 +12,7 @@ PASS window.e.blockedURI is "blockedURIValue"
> PASS window.e.violatedDirective is "violatedDirectiveValue"
> PASS window.e.effectiveDirective is "effectiveDirectiveValue"
> PASS window.e.originalPolicy is "originalPolicyValue"
>-PASS window.e.sourceURL is "sourceURLValue"
>+PASS window.e.sourceFile is "sourceFileValue"
> PASS window.e.lineNumber is 1
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html
>index cb80dd51fa9390cd5f44ce0a9aac8ad2b6e06977..404ce62975ccdf519ead29803fbf2f108a3f3fac 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-basics.html
>@@ -15,7 +15,7 @@
>                 'violatedDirective': 'violatedDirectiveValue',
>                 'effectiveDirective': 'effectiveDirectiveValue',
>                 'originalPolicy': 'originalPolicyValue',
>-                'sourceURL': 'sourceURLValue',
>+                'sourceFile': 'sourceFileValue',
>                 'lineNumber': 1
>             };
>             window.e = new SecurityPolicyViolationEvent('SecurityPolicyViolation', data);
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt
>index 8ebb0fa15282ddefd7affcf050514c8a8a49e144..8ea9a1222f7300135543d89c48fb4e4eb29bd589 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image-expected.txt
>@@ -11,7 +11,7 @@ PASS window.e.blockedURI is "http://127.0.0.1:8000/security/resources/abe.png"
> PASS window.e.violatedDirective is "img-src 'none'"
> PASS window.e.effectiveDirective is "img-src"
> PASS window.e.originalPolicy is "img-src 'none'"
>-PASS window.e.sourceURL is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html"
>+PASS window.e.sourceFile is "http://127.0.0.1:8000/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html"
> PASS window.e.lineNumber is 30
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html
>index 2f9ba7b38e8c2d58a4e9351d2f63d075504f4905..54988a00c634fc764beae6121dc209caa164dc81 100644
>--- a/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html
>+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-block-image.html
>@@ -16,7 +16,7 @@
>                 'violatedDirective': 'img-src \'none\'',
>                 'effectiveDirective': 'img-src',
>                 'originalPolicy': 'img-src \'none\'',
>-                'sourceURL': document.location.toString(),
>+                'sourceFile': document.location.toString(),
>                 'lineNumber': 30
>             };
>             window.e = e;

Actions: View | Formatted Diff | Diff

Attachments on bug 113033: 194487 | 194505 | 194825