Warn developers about deprecated features only once per page-load.

Source/core/page/ContentSecurityPolicy.cpp

 /*
  * Copyright (C) 2011 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 18 matching lines @@
 #include "Console.h"
 #include "DOMStringList.h"
 #include "Document.h"
 #include "UseCounter.h"
 #include "FormData.h"
 #include "FormDataList.h"
 #include "Frame.h"
 #include "InspectorInstrumentation.h"
 #include "InspectorValues.h"
 #include "KURL.h"
+#include "PageConsole.h"
 #include "PingLoader.h"
 #include "RuntimeEnabledFeatures.h"
 #include "SchemeRegistry.h"
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
 #include "ScriptState.h"
 #include "SecurityOrigin.h"
 #include "SecurityPolicyViolationEvent.h"
 #include "TextEncoding.h"
 #include <wtf/HashSet.h>
@@ skipping 1401 matching lines @@
 {
     ASSERT(m_policies.isEmpty());
     for (CSPDirectiveListVector::const_iterator iter = other->m_policies.begin(); iter != other->m_policies.end(); ++iter)
         didReceiveHeader((*iter)->header(), (*iter)->headerType());
 }
 
 void ContentSecurityPolicy::didReceiveHeader(const String& header, HeaderType type)
 {
     if (m_scriptExecutionContext->isDocument()) {
         Document* document = toDocument(m_scriptExecutionContext);
-        if (document->domWindow())
-            UseCounter::observe(document->domWindow(), getUseCounterType(type));
+        UseCounter::observe(document, getUseCounterType(type));
+
+        if (type == PrefixedReport || type == PrefixedEnforce)
+            PageConsole::reportDeprecation(document, PageConsole::PrefixedContentSecurityPolicyHeader);
     }
 
-    if (type == PrefixedReport || type == PrefixedEnforce)
-        reportDeprecatedHeader(type);
-
     // RFC2616, section 4.2 specifies that headers appearing multiple times can
     // be combined with a comma. Walk the header string, and parse each comma
     // separated chunk as a separate header.
     const UChar* begin = header.characters();
     const UChar* position = begin;
     const UChar* end = begin + header.length();
     while (position < end) {
         skipUntil(position, end, ',');
 
         // header1,header2 OR header1
@@ skipping 320 matching lines @@
     if (equalIgnoringCase(name, allow))
         message = allowMessage;
     else if (equalIgnoringCase(name, options))
         message = optionsMessage;
     else if (equalIgnoringCase(name, policyURI))
         message = policyURIMessage;
 
     logToConsole(message);
 }
 
-void ContentSecurityPolicy::reportDeprecatedHeader(HeaderType type) const
-{
-    ASSERT(type == PrefixedEnforce || type == PrefixedReport);
-    logToConsole(makeString("The '", type == PrefixedEnforce ? "X-WebKit-CSP" : "X-WebKit-CSP-Report-Only", "' header is deprecated. Please consider using the unprefixed '", type == PrefixedEnforce ? "Content-Security-Policy" : "Content-Security-Policy-Report-Only", "' header instead."));
-}
-
 void ContentSecurityPolicy::reportDirectiveAsSourceExpression(const String& directiveName, const String& sourceExpression) const
 {
     String message = "The Content Security Policy directive '" + directiveName + "' contains '" + sourceExpression + "' as a source expression. Did you mean '" + directiveName + " ...; " + sourceExpression + "...' (note the semicolon)?";
     logToConsole(message);
 }
 
 void ContentSecurityPolicy::reportDuplicateDirective(const String& name) const
 {
     String message = makeString("Ignoring duplicate Content-Security-Policy directive '", name, "'.\n");
     logToConsole(message);
@@ skipping 64 matching lines @@
 {
     InspectorInstrumentation::scriptExecutionBlockedByCSP(m_scriptExecutionContext, directiveText);
 }
 
 bool ContentSecurityPolicy::experimentalFeaturesEnabled() const
 {
     return RuntimeEnabledFeatures::experimentalContentSecurityPolicyFeaturesEnabled();
 }
 
 }