Diff
Modified: trunk/LayoutTests/ChangeLog (185713 => 185714)
--- trunk/LayoutTests/ChangeLog 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/ChangeLog 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,20 @@
+2015-06-17 Alex Christensen <[email protected]>
+
+ [Content Extensions] Log blocked loads to the WebInspector console
+ https://bugs.webkit.org/show_bug.cgi?id=146089
+
+ Reviewed by Joseph Pecoraro.
+
+ * http/tests/contentextensions/basic-filter-expected.txt:
+ * http/tests/contentextensions/character-set-basic-support-expected.txt:
+ * http/tests/contentextensions/domain-rules-expected.txt:
+ * http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt:
+ * http/tests/contentextensions/main-resource-redirect-blocked-expected.txt:
+ * http/tests/contentextensions/media-filtered-expected.txt:
+ * http/tests/contentextensions/subresource-redirect-blocked-expected.txt:
+ * http/tests/contentextensions/text-track-blocked-expected.txt:
+ Add new logs.
+
2015-06-18 Alexey Proskuryakov <[email protected]>
Mark mathml/very-large-stretchy-operators.html as Slow on newer OS X versions.
Modified: trunk/LayoutTests/http/tests/contentextensions/basic-filter-expected.txt (185713 => 185714)
--- trunk/LayoutTests/http/tests/contentextensions/basic-filter-expected.txt 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/http/tests/contentextensions/basic-filter-expected.txt 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,6 @@
+CONSOLE MESSAGE: line 7: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/basic-filter.html from loading a resource from http://localhost:8000/resources/square100.png
+CONSOLE MESSAGE: line 8: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/basic-filter.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?localhost_not_at_end
+CONSOLE MESSAGE: line 9: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/basic-filter.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?ends_with_localhost
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
Modified: trunk/LayoutTests/http/tests/contentextensions/character-set-basic-support-expected.txt (185713 => 185714)
--- trunk/LayoutTests/http/tests/contentextensions/character-set-basic-support-expected.txt 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/http/tests/contentextensions/character-set-basic-support-expected.txt 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,7 @@
+CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?BaSiC-TeSt-cAsE
+CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?any-scheme-matcher
+CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?casesensitive
+CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/character-set-basic-support.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?caseSeNsitive
Test basic cases of filter using a character set (e.g. [a-z]).
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: trunk/LayoutTests/http/tests/contentextensions/domain-rules-expected.txt (185713 => 185714)
--- trunk/LayoutTests/http/tests/contentextensions/domain-rules-expected.txt 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/http/tests/contentextensions/domain-rules-expected.txt 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,6 @@
+CONSOLE MESSAGE: line 6: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/domain-rules.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?should_be_blocked_1
+CONSOLE MESSAGE: line 7: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/domain-rules.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?should_be_blocked_2
+CONSOLE MESSAGE: line 8: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/domain-rules.html from loading a resource from http://127.0.0.1:8000/resources/square100.png?should_be_blocked_3
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
Modified: trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt (185713 => 185714)
--- trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/http/tests/contentextensions/filters-with-quantifiers-combined-expected.txt 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,15 @@
+CONSOLE MESSAGE: line 14: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?abcabc
+CONSOLE MESSAGE: line 15: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?abccabc
+CONSOLE MESSAGE: line 16: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?defghi
+CONSOLE MESSAGE: line 17: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?defgghi
+CONSOLE MESSAGE: line 18: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?jklmno
+CONSOLE MESSAGE: line 19: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?jkljklmno
+CONSOLE MESSAGE: line 20: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?pqrstv
+CONSOLE MESSAGE: line 21: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?pqrabcstv
+CONSOLE MESSAGE: line 22: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?wxyabc
+CONSOLE MESSAGE: line 23: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?wxydefabc
+CONSOLE MESSAGE: line 24: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?acbwxy
+CONSOLE MESSAGE: line 25: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/filters-with-quantifiers-combined.html from loading a resource from http://localhost:8000/resources/square100.png?abcacbdefabcdjklwhitelistwxy
layer at (0,0) size 785x952
RenderView at (0,0) size 785x600
layer at (0,0) size 785x952
Modified: trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt (185713 => 185714)
--- trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFailProvisionalLoadWithError
-main frame - (kWKErrorCodeCannotShowURL)
+CONSOLE MESSAGE: Content blocker prevented frame displaying about:blank from loading a resource from http://127.0.0.1:8000/contentextensions/resources/main-resource-redirect-blocked-target.html
Modified: trunk/LayoutTests/http/tests/contentextensions/media-filtered-expected.txt (185713 => 185714)
--- trunk/LayoutTests/http/tests/contentextensions/media-filtered-expected.txt 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/http/tests/contentextensions/media-filtered-expected.txt 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/media-filtered.html from loading a resource from http://localhost:8000/media/resources/test.mp4
CONSOLE MESSAGE: line 14: Video error
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
Modified: trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked-expected.txt (185713 => 185714)
--- trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked-expected.txt 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/http/tests/contentextensions/subresource-redirect-blocked-expected.txt 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/subresource-redirect-blocked.html from loading a resource from http://127.0.0.1:8000/resources/square128.png
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
Modified: trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt (185713 => 185714)
--- trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,4 +1,5 @@
CONSOLE MESSAGE: line 21: video loaded
+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/text-track-blocked.html from loading a resource from http://127.0.0.1:8000/media-resources/track/captions-webvtt/captions-fast.vtt
CONSOLE MESSAGE: line 14: vttError
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
Modified: trunk/Source/_javascript_Core/ChangeLog (185713 => 185714)
--- trunk/Source/_javascript_Core/ChangeLog 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,16 @@
+2015-06-17 Alex Christensen <[email protected]>
+
+ [Content Extensions] Log blocked loads to the WebInspector console
+ https://bugs.webkit.org/show_bug.cgi?id=146089
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/ConsoleMessage.cpp:
+ (Inspector::messageSourceValue):
+ * inspector/protocol/Console.json:
+ * runtime/ConsoleTypes.h:
+ Add content blocker message source.
+
2015-06-18 Saam Barati <[email protected]>
[ES6] support default values in deconstruction parameter nodes
Modified: trunk/Source/_javascript_Core/inspector/ConsoleMessage.cpp (185713 => 185714)
--- trunk/Source/_javascript_Core/inspector/ConsoleMessage.cpp 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/Source/_javascript_Core/inspector/ConsoleMessage.cpp 2015-06-18 18:38:13 UTC (rev 185714)
@@ -141,6 +141,7 @@
case MessageSource::Rendering: return Inspector::Protocol::Console::ConsoleMessage::Source::Rendering;
case MessageSource::CSS: return Inspector::Protocol::Console::ConsoleMessage::Source::CSS;
case MessageSource::Security: return Inspector::Protocol::Console::ConsoleMessage::Source::Security;
+ case MessageSource::ContentBlocker: return Inspector::Protocol::Console::ConsoleMessage::Source::ContentBlocker;
case MessageSource::Other: return Inspector::Protocol::Console::ConsoleMessage::Source::Other;
}
return Inspector::Protocol::Console::ConsoleMessage::Source::Other;
Modified: trunk/Source/_javascript_Core/inspector/protocol/Console.json (185713 => 185714)
--- trunk/Source/_javascript_Core/inspector/protocol/Console.json 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/Source/_javascript_Core/inspector/protocol/Console.json 2015-06-18 18:38:13 UTC (rev 185714)
@@ -7,7 +7,7 @@
"type": "object",
"description": "Console message.",
"properties": [
- { "name": "source", "type": "string", "enum": ["xml", "_javascript_", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "other"], "description": "Message source." },
+ { "name": "source", "type": "string", "enum": ["xml", "_javascript_", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "content-blocker", "other"], "description": "Message source." },
{ "name": "level", "type": "string", "enum": ["log", "info", "warning", "error", "debug"], "description": "Message severity." },
{ "name": "text", "type": "string", "description": "Message text." },
{ "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "timing", "profile", "profileEnd"], "description": "Console message type." },
Modified: trunk/Source/_javascript_Core/runtime/ConsoleTypes.h (185713 => 185714)
--- trunk/Source/_javascript_Core/runtime/ConsoleTypes.h 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/Source/_javascript_Core/runtime/ConsoleTypes.h 2015-06-18 18:38:13 UTC (rev 185714)
@@ -38,6 +38,7 @@
Rendering,
CSS,
Security,
+ ContentBlocker,
Other,
};
Modified: trunk/Source/WebCore/ChangeLog (185713 => 185714)
--- trunk/Source/WebCore/ChangeLog 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/Source/WebCore/ChangeLog 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,15 @@
+2015-06-17 Alex Christensen <[email protected]>
+
+ [Content Extensions] Log blocked loads to the WebInspector console
+ https://bugs.webkit.org/show_bug.cgi?id=146089
+
+ Reviewed by Joseph Pecoraro.
+
+ * contentextensions/ContentExtensionsBackend.cpp:
+ (WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
+ (WebCore::ContentExtensions::ContentExtensionsBackend::displayNoneCSSRule):
+ Log which URLs are blocked and the URL of the page they are blocked from.
+
2015-06-18 Joseph Pecoraro <[email protected]>
Crash under WebCore::DOMWindow::dispatchMessageEventWithOriginCheck attempting to log console message
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (185713 => 185714)
--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-06-18 18:38:13 UTC (rev 185714)
@@ -210,8 +210,11 @@
}
}
- if (willBlockLoad)
+ if (willBlockLoad) {
+ if (currentDocument)
+ currentDocument->addConsoleMessage(MessageSource::ContentBlocker, MessageLevel::Info, makeString("Content blocker prevented frame displaying ", mainDocumentURL.string(), " from loading a resource from ", request.url().string()));
request = ResourceRequest();
+ }
}
const String& ContentExtensionsBackend::displayNoneCSSRule()
Modified: trunk/Source/WebKit/mac/ChangeLog (185713 => 185714)
--- trunk/Source/WebKit/mac/ChangeLog 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-18 18:38:13 UTC (rev 185714)
@@ -1,3 +1,14 @@
+2015-06-17 Alex Christensen <[email protected]>
+
+ [Content Extensions] Log blocked loads to the WebInspector console
+ https://bugs.webkit.org/show_bug.cgi?id=146089
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCoreSupport/WebChromeClient.mm:
+ (stringForMessageSource):
+ Added content blocker message source.
+
2015-06-17 Dan Bernstein <[email protected]>
<rdar://problem/19034131> Cleaned up the WebDownload.h framework header.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (185713 => 185714)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-06-18 18:34:28 UTC (rev 185713)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-06-18 18:38:13 UTC (rev 185714)
@@ -109,6 +109,7 @@
NSString *WebConsoleMessageRenderingMessageSource = @"RenderingMessageSource";
NSString *WebConsoleMessageCSSMessageSource = @"CSSMessageSource";
NSString *WebConsoleMessageSecurityMessageSource = @"SecurityMessageSource";
+NSString *WebConsoleMessageContentBlockerMessageSource = @"ContentBlockerMessageSource";
NSString *WebConsoleMessageOtherMessageSource = @"OtherMessageSource";
NSString *WebConsoleMessageDebugMessageLevel = @"DebugMessageLevel";
@@ -387,6 +388,8 @@
return WebConsoleMessageCSSMessageSource;
case MessageSource::Security:
return WebConsoleMessageSecurityMessageSource;
+ case MessageSource::ContentBlocker:
+ return WebConsoleMessageContentBlockerMessageSource;
case MessageSource::Other:
return WebConsoleMessageOtherMessageSource;
}
