Diff
Modified: trunk/Source/WebCore/ChangeLog (222282 => 222283)
--- trunk/Source/WebCore/ChangeLog 2017-09-20 20:38:18 UTC (rev 222282)
+++ trunk/Source/WebCore/ChangeLog 2017-09-20 20:46:18 UTC (rev 222283)
@@ -1,3 +1,27 @@
+2017-09-20 Alex Christensen <achristen...@webkit.org>
+
+ Remove ActionType::InvalidAction
+ https://bugs.webkit.org/show_bug.cgi?id=177262
+
+ Reviewed by Tim Horton.
+
+ This was needed before r213322 because we needed to have a default constructor.
+ With all these cool new C++14/17 types, we don't need this any more.
+
+ No change in behaviour.
+
+ * contentextensions/ContentExtensionActions.h:
+ * contentextensions/ContentExtensionCompiler.cpp:
+ (WebCore::ContentExtensions::serializeActions):
+ * contentextensions/ContentExtensionRule.cpp:
+ (WebCore::ContentExtensions::Action::deserialize):
+ (WebCore::ContentExtensions::Action::deserializeType):
+ (WebCore::ContentExtensions::Action::serializedLength):
+ * contentextensions/ContentExtensionRule.h:
+ * contentextensions/ContentExtensionsBackend.cpp:
+ (WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
+ (WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForPingLoad):
+
2017-09-20 Daniel Bates <daba...@apple.com>
RenderedDocumentMarker.h should include DocumentMarker.h
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionActions.h (222282 => 222283)
--- trunk/Source/WebCore/contentextensions/ContentExtensionActions.h 2017-09-20 20:38:18 UTC (rev 222282)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionActions.h 2017-09-20 20:46:18 UTC (rev 222283)
@@ -42,7 +42,6 @@
CSSDisplayNoneStyleSheet,
IgnorePreviousRules,
MakeHTTPS,
- InvalidAction,
};
struct BlockedStatus {
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (222282 => 222283)
--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2017-09-20 20:38:18 UTC (rev 222282)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2017-09-20 20:46:18 UTC (rev 222283)
@@ -152,7 +152,6 @@
switch (actionType) {
case ActionType::CSSDisplayNoneStyleSheet:
- case ActionType::InvalidAction:
RELEASE_ASSERT_NOT_REACHED();
case ActionType::CSSDisplayNoneSelector: {
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionRule.cpp (222282 => 222283)
--- trunk/Source/WebCore/contentextensions/ContentExtensionRule.cpp 2017-09-20 20:38:18 UTC (rev 222282)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionRule.cpp 2017-09-20 20:46:18 UTC (rev 222283)
@@ -68,7 +68,6 @@
case ActionType::CSSDisplayNoneSelector:
return Action(actionType, deserializeString(actions, actionsLength, location + sizeof(ActionType)), location);
case ActionType::CSSDisplayNoneStyleSheet:
- case ActionType::InvalidAction:
break;
}
RELEASE_ASSERT_NOT_REACHED();
@@ -86,7 +85,6 @@
case ActionType::MakeHTTPS:
return type;
case ActionType::CSSDisplayNoneStyleSheet:
- case ActionType::InvalidAction:
break;
}
RELEASE_ASSERT_NOT_REACHED();
@@ -113,7 +111,6 @@
return prefixLength + stringLength * sizeof(LChar);
}
case ActionType::CSSDisplayNoneStyleSheet:
- case ActionType::InvalidAction:
break;
}
RELEASE_ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionRule.h (222282 => 222283)
--- trunk/Source/WebCore/contentextensions/ContentExtensionRule.h 2017-09-20 20:38:18 UTC (rev 222282)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionRule.h 2017-09-20 20:46:18 UTC (rev 222283)
@@ -130,12 +130,6 @@
};
struct Action {
- Action()
- : m_type(ActionType::InvalidAction)
- , m_actionID(std::numeric_limits<uint32_t>::max())
- {
- }
-
Action(ActionType type, const String& stringArgument, uint32_t actionID = std::numeric_limits<uint32_t>::max())
: m_type(type)
, m_actionID(actionID)
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (222282 => 222283)
--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2017-09-20 20:38:18 UTC (rev 222282)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2017-09-20 20:46:18 UTC (rev 222283)
@@ -202,7 +202,6 @@
break;
}
case ContentExtensions::ActionType::IgnorePreviousRules:
- case ContentExtensions::ActionType::InvalidAction:
RELEASE_ASSERT_NOT_REACHED();
}
}
@@ -246,7 +245,6 @@
case ContentExtensions::ActionType::CSSDisplayNoneStyleSheet:
break;
case ContentExtensions::ActionType::IgnorePreviousRules:
- case ContentExtensions::ActionType::InvalidAction:
RELEASE_ASSERT_NOT_REACHED();
}
}
Modified: trunk/Tools/ChangeLog (222282 => 222283)
--- trunk/Tools/ChangeLog 2017-09-20 20:38:18 UTC (rev 222282)
+++ trunk/Tools/ChangeLog 2017-09-20 20:46:18 UTC (rev 222283)
@@ -1,3 +1,13 @@
+2017-09-20 Alex Christensen <achristen...@webkit.org>
+
+ Remove ActionType::InvalidAction
+ https://bugs.webkit.org/show_bug.cgi?id=177262
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (WebCore::ContentExtensions::operator<<):
+
2017-09-20 Myles C. Maxfield <mmaxfi...@apple.com>
Make a playground where people can try WSL
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (222282 => 222283)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2017-09-20 20:38:18 UTC (rev 222282)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2017-09-20 20:46:18 UTC (rev 222283)
@@ -62,8 +62,6 @@
return os << "ActionType::IgnorePreviousRules";
case ActionType::MakeHTTPS:
return os << "ActionType::MakeHTTPS";
- case ActionType::InvalidAction:
- return os << "ActionType::InvalidAction";
}
}
}
