<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181754] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181754">181754</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-03-19 12:36:22 -0700 (Thu, 19 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Part of content extensions should apply css selectors
https://bugs.webkit.org/show_bug.cgi?id=142604
Reviewed by Alex Christensen.
Source/WebCore:
Add a new action for applying the cached global stylesheet.
* contentextensions/CompiledContentExtension.cpp:
(WebCore::ContentExtensions::CompiledContentExtension::globalDisplayNoneSelectors):
* contentextensions/ContentExtensionActions.h:
* contentextensions/ContentExtensionCompiler.cpp:
(WebCore::ContentExtensions::serializeActions):
* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::loadAction):
* contentextensions/ContentExtensionRule.cpp:
(WebCore::ContentExtensions::Action::deserialize):
* contentextensions/ContentExtensionRule.h:
(WebCore::ContentExtensions::Action::Action):
(WebCore::ContentExtensions::Action::operator==):
(WebCore::ContentExtensions::Action::stringArgument):
(WebCore::ContentExtensions::Action::cssSelector): Deleted.
* contentextensions/ContentExtensionsBackend.cpp:
(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
Tools:
* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(WebCore::ContentExtensions::operator<<):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsCompiledContentExtensioncpp">trunk/Source/WebCore/contentextensions/CompiledContentExtension.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionActionsh">trunk/Source/WebCore/contentextensions/ContentExtensionActions.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionCompilercpp">trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionParsercpp">trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionRulecpp">trunk/Source/WebCore/contentextensions/ContentExtensionRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionRuleh">trunk/Source/WebCore/contentextensions/ContentExtensionRule.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp">trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/ChangeLog 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-03-19 Brady Eidson <beidson@apple.com>
+
+ Part of content extensions should apply css selectors
+ https://bugs.webkit.org/show_bug.cgi?id=142604
+
+ Reviewed by Alex Christensen.
+
+ Add a new action for applying the cached global stylesheet.
+
+ * contentextensions/CompiledContentExtension.cpp:
+ (WebCore::ContentExtensions::CompiledContentExtension::globalDisplayNoneSelectors):
+
+ * contentextensions/ContentExtensionActions.h:
+
+ * contentextensions/ContentExtensionCompiler.cpp:
+ (WebCore::ContentExtensions::serializeActions):
+
+ * contentextensions/ContentExtensionParser.cpp:
+ (WebCore::ContentExtensions::loadAction):
+
+ * contentextensions/ContentExtensionRule.cpp:
+ (WebCore::ContentExtensions::Action::deserialize):
+ * contentextensions/ContentExtensionRule.h:
+ (WebCore::ContentExtensions::Action::Action):
+ (WebCore::ContentExtensions::Action::operator==):
+ (WebCore::ContentExtensions::Action::stringArgument):
+ (WebCore::ContentExtensions::Action::cssSelector): Deleted.
+
+ * contentextensions/ContentExtensionsBackend.cpp:
+ (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+
</ins><span class="cx"> 2015-03-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up DOMTimer related settings
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsCompiledContentExtensioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/CompiledContentExtension.cpp (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/CompiledContentExtension.cpp 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/contentextensions/CompiledContentExtension.cpp 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -47,8 +47,9 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> selectors;
</span><span class="cx"> for (Action& action : globalActions) {
</span><del>- if (action.cssSelector().length())
- selectors.append(action.cssSelector());
</del><ins>+ ASSERT(action.type() == ActionType::CSSDisplayNoneSelector);
+ if (action.stringArgument().length())
+ selectors.append(action.stringArgument());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return selectors;
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionActionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionActions.h (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionActions.h 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionActions.h 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -37,7 +37,8 @@
</span><span class="cx"> enum class ActionType : uint8_t {
</span><span class="cx"> BlockLoad,
</span><span class="cx"> BlockCookies,
</span><del>- CSSDisplayNone,
</del><ins>+ CSSDisplayNoneSelector,
+ CSSDisplayNoneStyleSheet,
</ins><span class="cx"> IgnorePreviousRules,
</span><span class="cx"> InvalidAction,
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> actionLocations.append(actions.size());
</span><span class="cx">
</span><span class="cx"> switch (rule.action().type()) {
</span><ins>+ case ActionType::CSSDisplayNoneStyleSheet:
</ins><span class="cx"> case ActionType::InvalidAction:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx">
</span><span class="lines">@@ -70,10 +71,10 @@
</span><span class="cx"> actions.append(static_cast<SerializedActionByte>(rule.action().type()));
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case ActionType::CSSDisplayNone: {
- const String& selector = rule.action().cssSelector();
</del><ins>+ case ActionType::CSSDisplayNoneSelector: {
+ const String& selector = rule.action().stringArgument();
</ins><span class="cx"> // Append action type (1 byte).
</span><del>- actions.append(static_cast<SerializedActionByte>(ActionType::CSSDisplayNone));
</del><ins>+ actions.append(static_cast<SerializedActionByte>(ActionType::CSSDisplayNoneSelector));
</ins><span class="cx"> // Append Selector length (4 bytes).
</span><span class="cx"> unsigned selectorLength = selector.length();
</span><span class="cx"> actions.resize(actions.size() + sizeof(unsigned));
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> WTFLogAlways("css-display-none action type requires a selector");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- action = Action(ActionType::CSSDisplayNone, selector.toWTFString(&exec));
</del><ins>+ action = Action(ActionType::CSSDisplayNoneSelector, selector.toWTFString(&exec));
</ins><span class="cx"> } else {
</span><span class="cx"> WTFLogAlways("Unrecognized action: \"%s\"", actionType.utf8().data());
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionRule.cpp (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionRule.cpp 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionRule.cpp 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -48,9 +48,7 @@
</span><span class="cx"> return ActionType::BlockLoad;
</span><span class="cx"> case ActionType::IgnorePreviousRules:
</span><span class="cx"> return ActionType::IgnorePreviousRules;
</span><del>- case ActionType::InvalidAction:
- RELEASE_ASSERT_NOT_REACHED();
- case ActionType::CSSDisplayNone: {
</del><ins>+ case ActionType::CSSDisplayNoneSelector: {
</ins><span class="cx"> unsigned stringStartIndex = location + sizeof(ActionType) + sizeof(unsigned) + sizeof(bool);
</span><span class="cx"> RELEASE_ASSERT(actionsLength >= stringStartIndex);
</span><span class="cx"> unsigned selectorLength = *reinterpret_cast<const unsigned*>(&actions[location + sizeof(ActionType)]);
</span><span class="lines">@@ -58,11 +56,14 @@
</span><span class="cx">
</span><span class="cx"> if (wideCharacters) {
</span><span class="cx"> RELEASE_ASSERT(actionsLength >= stringStartIndex + selectorLength * sizeof(UChar));
</span><del>- return Action(ActionType::CSSDisplayNone, String(reinterpret_cast<const UChar*>(&actions[stringStartIndex]), selectorLength));
</del><ins>+ return Action(ActionType::CSSDisplayNoneSelector, String(reinterpret_cast<const UChar*>(&actions[stringStartIndex]), selectorLength));
</ins><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT(actionsLength >= stringStartIndex + selectorLength * sizeof(LChar));
</span><del>- return Action(ActionType::CSSDisplayNone, String(reinterpret_cast<const LChar*>(&actions[stringStartIndex]), selectorLength));
</del><ins>+ return Action(ActionType::CSSDisplayNoneSelector, String(reinterpret_cast<const LChar*>(&actions[stringStartIndex]), selectorLength));
</ins><span class="cx"> }
</span><ins>+ case ActionType::CSSDisplayNoneStyleSheet:
+ case ActionType::InvalidAction:
+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionRule.h (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionRule.h 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionRule.h 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -52,30 +52,34 @@
</span><span class="cx"> : m_type(ActionType::InvalidAction)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>- Action(ActionType type, const String& cssSelector)
</del><ins>+
+ Action(ActionType type, const String& stringArgument)
</ins><span class="cx"> : m_type(type)
</span><del>- , m_cssSelector(cssSelector)
</del><ins>+ , m_stringArgument(stringArgument)
</ins><span class="cx"> {
</span><del>- ASSERT(type == ActionType::CSSDisplayNone);
</del><ins>+ ASSERT(type == ActionType::CSSDisplayNoneSelector || type == ActionType::CSSDisplayNoneStyleSheet);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> Action(ActionType type)
</span><span class="cx"> : m_type(type)
</span><span class="cx"> {
</span><del>- ASSERT(type != ActionType::CSSDisplayNone);
</del><ins>+ ASSERT(type != ActionType::CSSDisplayNoneSelector && type != ActionType::CSSDisplayNoneStyleSheet);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> bool operator==(const Action& other) const
</span><span class="cx"> {
</span><span class="cx"> return m_type == other.m_type
</span><del>- && m_cssSelector == other.m_cssSelector;
</del><ins>+ && m_stringArgument == other.m_stringArgument;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> static Action deserialize(const SerializedActionByte* actions, const unsigned actionsLength, unsigned location);
</span><span class="cx">
</span><span class="cx"> ActionType type() const { return m_type; }
</span><del>- const String& cssSelector() const { return m_cssSelector; }
</del><ins>+ const String& stringArgument() const { return m_stringArgument; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ActionType m_type;
</span><del>- String m_cssSelector;
</del><ins>+ String m_stringArgument;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ContentExtensionRule {
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -70,12 +70,12 @@
</span><span class="cx">
</span><span class="cx"> Vector<Action> finalActions;
</span><span class="cx"> ResourceFlags flags = resourceLoadInfo.getResourceFlags();
</span><del>- for (auto& compiledContentExtension : m_contentExtensions.values()) {
- DFABytecodeInterpreter interpreter(compiledContentExtension->bytecode(), compiledContentExtension->bytecodeLength());
</del><ins>+ for (auto& compiledContentExtension : m_contentExtensions) {
+ DFABytecodeInterpreter interpreter(compiledContentExtension.value->bytecode(), compiledContentExtension.value->bytecodeLength());
</ins><span class="cx"> DFABytecodeInterpreter::Actions triggeredActions = interpreter.interpret(urlCString, flags);
</span><span class="cx">
</span><del>- const SerializedActionByte* actions = compiledContentExtension->actions();
- const unsigned actionsLength = compiledContentExtension->actionsLength();
</del><ins>+ const SerializedActionByte* actions = compiledContentExtension.value->actions();
+ const unsigned actionsLength = compiledContentExtension.value->actionsLength();
</ins><span class="cx">
</span><span class="cx"> if (!triggeredActions.isEmpty()) {
</span><span class="cx"> Vector<unsigned> actionLocations;
</span><span class="lines">@@ -83,14 +83,21 @@
</span><span class="cx"> for (auto actionLocation : triggeredActions)
</span><span class="cx"> actionLocations.append(static_cast<unsigned>(actionLocation));
</span><span class="cx"> std::sort(actionLocations.begin(), actionLocations.end());
</span><del>-
</del><ins>+
+ bool sawIgnorePreviousRules = false;
+
</ins><span class="cx"> // Add actions in reverse order to properly deal with IgnorePreviousRules.
</span><span class="cx"> for (unsigned i = actionLocations.size(); i; i--) {
</span><span class="cx"> Action action = Action::deserialize(actions, actionsLength, actionLocations[i - 1]);
</span><del>- if (action.type() == ActionType::IgnorePreviousRules)
</del><ins>+ if (action.type() == ActionType::IgnorePreviousRules) {
+ sawIgnorePreviousRules = true;
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> finalActions.append(action);
</span><span class="cx"> }
</span><ins>+
+ if (!sawIgnorePreviousRules)
+ finalActions.append(Action(ActionType::CSSDisplayNoneStyleSheet, compiledContentExtension.key));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return finalActions;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -519,15 +519,24 @@
</span><span class="cx">
</span><span class="cx"> bool willBlockLoad = false;
</span><span class="cx"> for (const auto& action : actions) {
</span><del>- if (action.type() == ContentExtensions::ActionType::BlockLoad)
</del><ins>+ switch (action.type()) {
+ case ContentExtensions::ActionType::BlockLoad:
</ins><span class="cx"> willBlockLoad = true;
</span><del>- else if (action.type() == ContentExtensions::ActionType::BlockCookies)
</del><ins>+ break;
+ case ContentExtensions::ActionType::BlockCookies:
</ins><span class="cx"> request.mutableResourceRequest().setAllowCookies(false);
</span><del>- else if (action.type() == ContentExtensions::ActionType::CSSDisplayNone) {
</del><ins>+ break;
+ case ContentExtensions::ActionType::CSSDisplayNoneSelector:
</ins><span class="cx"> // action.cssSelector() is the css to use here.
</span><span class="cx"> // FIXME: That css selector should be used to apply display:none.
</span><del>- } else
</del><ins>+ break;
+ case ContentExtensions::ActionType::CSSDisplayNoneStyleSheet:
+ // FIXME: Apply cached stylesheet here
+ break;
+ case ContentExtensions::ActionType::IgnorePreviousRules:
+ case ContentExtensions::ActionType::InvalidAction:
</ins><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> if (willBlockLoad)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Tools/ChangeLog 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-19 Brady Eidson <beidson@apple.com>
+
+ Part of content extensions should apply css selectors
+ https://bugs.webkit.org/show_bug.cgi?id=142604
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (WebCore::ContentExtensions::operator<<):
+
</ins><span class="cx"> 2015-03-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Activate tests on EWS
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (181753 => 181754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-03-19 19:22:22 UTC (rev 181753)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-03-19 19:36:22 UTC (rev 181754)
</span><span class="lines">@@ -46,8 +46,10 @@
</span><span class="cx"> return os << "ContentFilterAction::BlockLoad";
</span><span class="cx"> case ActionType::BlockCookies:
</span><span class="cx"> return os << "ContentFilterAction::BlockCookies";
</span><del>- case ActionType::CSSDisplayNone:
</del><ins>+ case ActionType::CSSDisplayNoneSelector:
</ins><span class="cx"> return os << "ContentFilterAction::CSSDisplayNone";
</span><ins>+ case ActionType::CSSDisplayNoneStyleSheet:
+ return os << "ContentFilterAction::CSSDisplayNoneStyleSheet";
</ins><span class="cx"> case ActionType::IgnorePreviousRules:
</span><span class="cx"> return os << "ContentFilterAction::IgnorePreviousRules";
</span><span class="cx"> case ActionType::InvalidAction:
</span></span></pre>
</div>
</div>
</body>
</html>