CSP: Replace 'static_cast' with 'toDocument'.

CSP: Replace 'static_cast' with 'toDocument'.

This patch introduces a 'toDocument' helper that casts ExecutionContextClient
objects to Documents with appropriate checks, and migrates
ContentSecurityPolicy off of direct 'static_cast' usage. No web-visible
change, just refactoring for clarity/safety.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=166714

[Mike West, 2014-02-07 09:51:21]

Mind taking a look at this tiny refactoring, Jochen?

-mike

[jochen (gone - plz use gerrit), 2014-02-07 09:52:22]

lgtm

[Mike West, 2014-02-07 09:59:32]

The CQ bit was checked by mkwst@chromium.org

[commit-bot: I haz the power, 2014-02-07 09:59:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mkwst@chromium.org/134863007/1

[commit-bot: I haz the power, 2014-02-07 12:14:39]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-07 12:14:39]

Failed to apply patch for Source/core/frame/ContentSecurityPolicy.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/frame/ContentSecurityPolicy.cpp
  Hunk #1 FAILED at 1685.
  Hunk #2 succeeded at 1692 (offset -9 lines).
  Hunk #3 succeeded at 1858 (offset -9 lines).
  Hunk #4 succeeded at 2076 (offset 6 lines).
  Hunk #5 succeeded at 2125 (offset 6 lines).
  1 out of 5 hunks FAILED -- saving rejects to file
Source/core/frame/ContentSecurityPolicy.cpp.rej

Patch:       Source/core/frame/ContentSecurityPolicy.cpp
Index: Source/core/frame/ContentSecurityPolicy.cpp
diff --git a/Source/core/frame/ContentSecurityPolicy.cpp
b/Source/core/frame/ContentSecurityPolicy.cpp
index
47d0658d74128a63320d72f947e0333dbda4d804..4bf2a48796e87dba942d5d03e0b09494b11a37c4
100644
--- a/Source/core/frame/ContentSecurityPolicy.cpp
+++ b/Source/core/frame/ContentSecurityPolicy.cpp
@@ -1685,8 +1685,7 @@ void ContentSecurityPolicy::didReceiveHeaders(const
ContentSecurityPolicyRespons
         didReceiveHeader(headers.contentSecurityPolicyReportOnly(),
ContentSecurityPolicy::Report, ContentSecurityPolicy::HeaderSourceHTTP);
 
     // FIXME: Remove this reporting (and the 'xWebKitCSP*' methods) after the
next release branch.
-    if (m_client->isDocument()) {
-        Document* document = static_cast<Document*>(m_client);
+    if (Document* document = this->document()) {
         if (!headers.xWebKitCSP().isEmpty())
             UseCounter::countDeprecation(*document,
UseCounter::PrefixedContentSecurityPolicy);
         if (!headers.xWebKitCSPReportOnly().isEmpty())
@@ -1701,9 +1700,8 @@ void ContentSecurityPolicy::didReceiveHeader(const String&
header, HeaderType ty
 
 void ContentSecurityPolicy::addPolicyFromHeaderValue(const String& header,
HeaderType type, HeaderSource source)
 {
-    Document* document = 0;
-    if (m_client->isDocument()) {
-        document = static_cast<Document*>(m_client);
+    Document* document = this->document();
+    if (document) {
         UseCounter::count(*document, getUseCounterType(type));
 
         // CSP 1.1 defines report-only in a <meta> element as invalid. Measure
for now, disable in experimental mode.
@@ -1868,10 +1866,8 @@ bool ContentSecurityPolicy::allowScriptEval(ScriptState*
state, ContentSecurityP
 bool ContentSecurityPolicy::allowStyleEval(ScriptState* state,
ContentSecurityPolicy::ReportingStatus reportingStatus) const
 {
     if (!experimentalFeaturesEnabled()) {
-        if (m_client->isDocument()) {
-            Document* document = static_cast<Document*>(m_client);
+        if (Document* document = this->document())
             UseCounter::count(*document, UseCounter::UnsafeEvalBlocksCSSOM);
-        }
         return true;
     }
     return
isAllowedByAllWithState<&CSPDirectiveList::allowStyleEval>(m_policies, state,
reportingStatus);
@@ -2073,8 +2069,8 @@ KURL ContentSecurityPolicy::completeURL(const String& url)
const
 
 void ContentSecurityPolicy::enforceSandboxFlags(SandboxFlags mask) const
 {
-    if (m_client->isDocument())
-        static_cast<Document*>(m_client)->enforceSandboxFlags(mask);
+    if (Document* document = this->document())
+        document->enforceSandboxFlags(mask);
 }
 
 static String stripURLForUseInReport(Document* document, const KURL& url)
@@ -2122,7 +2118,7 @@ void ContentSecurityPolicy::reportViolation(const String&
directiveText, const S
     if (!m_client->isDocument())
         return;
 
-    Document* document = static_cast<Document*>(m_client);
+    Document* document = this->document();
     Frame* frame = document->frame();
     if (!frame)
         return;

[Mike West, 2014-02-07 12:47:53]

The CQ bit was checked by mkwst@chromium.org

[commit-bot: I haz the power, 2014-02-07 12:48:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mkwst@chromium.org/134863007/130001

[commit-bot: I haz the power, 2014-02-07 15:04:40]

Change committed as 166714