Changeset 222283 in webkit


Ignore:
Timestamp:
Sep 20, 2017 1:46:18 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Remove ActionType::InvalidAction
​https://bugs.webkit.org/show_bug.cgi?id=177262

Reviewed by Tim Horton.

Source/WebCore:

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):

Tools:

  • TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:

(WebCore::ContentExtensions::operator<<):

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r222282 r222283  
     12017-09-20  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove ActionType::InvalidAction
     4        https://bugs.webkit.org/show_bug.cgi?id=177262
     5
     6        Reviewed by Tim Horton.
     7
     8        This was needed before r213322 because we needed to have a default constructor.
     9        With all these cool new C++14/17 types, we don't need this any more.
     10
     11        No change in behaviour.
     12
     13        * contentextensions/ContentExtensionActions.h:
     14        * contentextensions/ContentExtensionCompiler.cpp:
     15        (WebCore::ContentExtensions::serializeActions):
     16        * contentextensions/ContentExtensionRule.cpp:
     17        (WebCore::ContentExtensions::Action::deserialize):
     18        (WebCore::ContentExtensions::Action::deserializeType):
     19        (WebCore::ContentExtensions::Action::serializedLength):
     20        * contentextensions/ContentExtensionRule.h:
     21        * contentextensions/ContentExtensionsBackend.cpp:
     22        (WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForLoad):
     23        (WebCore::ContentExtensions::ContentExtensionsBackend::processContentExtensionRulesForPingLoad):
     24
    1252017-09-20  Daniel Bates  <dabates@apple.com>
    226

  • trunk/Source/WebCore/contentextensions/ContentExtensionActions.h

    r220996 r222283  
    4343    IgnorePreviousRules,
    4444    MakeHTTPS,
    45     InvalidAction,
    4645};
    4746

  • trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp

    r222277 r222283  
    153153        switch (actionType) {
    154154        case ActionType::CSSDisplayNoneStyleSheet:
    155         case ActionType::InvalidAction:
    156155            RELEASE_ASSERT_NOT_REACHED();
    157156

  • trunk/Source/WebCore/contentextensions/ContentExtensionRule.cpp

    r222277 r222283  
    6969        return Action(actionType, deserializeString(actions, actionsLength, location + sizeof(ActionType)), location);
    7070    case ActionType::CSSDisplayNoneStyleSheet:
    71     case ActionType::InvalidAction:
    7271        break;
    7372    }
    … …  
    8786        return type;
    8887    case ActionType::CSSDisplayNoneStyleSheet:
    89     case ActionType::InvalidAction:
    9088        break;
    9189    }
    … …  
    114112    }
    115113    case ActionType::CSSDisplayNoneStyleSheet:
    116     case ActionType::InvalidAction:
    117114        break;
    118115    }

  • trunk/Source/WebCore/contentextensions/ContentExtensionRule.h

    r222277 r222283  
    131131
    132132struct Action {
    133     Action()
    134         : m_type(ActionType::InvalidAction)
    135         , m_actionID(std::numeric_limits<uint32_t>::max())
    136     {
    137     }
    138 
    139133    Action(ActionType type, const String& stringArgument, uint32_t actionID = std::numeric_limits<uint32_t>::max())
    140134        : m_type(type)

  • trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp

    r220996 r222283  
    203203        }
    204204        case ContentExtensions::ActionType::IgnorePreviousRules:
    205         case ContentExtensions::ActionType::InvalidAction:
    206205            RELEASE_ASSERT_NOT_REACHED();
    207206        }
    … …  
    247246            break;
    248247        case ContentExtensions::ActionType::IgnorePreviousRules:
    249         case ContentExtensions::ActionType::InvalidAction:
    250248            RELEASE_ASSERT_NOT_REACHED();
    251249        }

  • trunk/Tools/ChangeLog

    r222280 r222283  
     12017-09-20  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove ActionType::InvalidAction
     4        https://bugs.webkit.org/show_bug.cgi?id=177262
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
     9        (WebCore::ContentExtensions::operator<<):
     10
    1112017-09-20  Myles C. Maxfield  <mmaxfield@apple.com>
    212

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp

    r219573 r222283  
    6363    case ActionType::MakeHTTPS:
    6464        return os << "ActionType::MakeHTTPS";
    65     case ActionType::InvalidAction:
    66         return os << "ActionType::InvalidAction";
    6765    }
    6866}
Note: See TracChangeset for help on using the changeset viewer.