Changeset 244558 in webkit


Ignore:
Timestamp:
Apr 23, 2019 1:25:59 PM (5 years ago)
Author:
commit-queue@webkit.org
Message:

Remove DeprecatedOptional
​https://bugs.webkit.org/show_bug.cgi?id=197161

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-04-23
Reviewed by Darin Adler.

Source/JavaScriptCore:

  • inspector/InspectorBackendDispatcher.cpp:
  • inspector/InspectorBackendDispatcher.h:

Source/WTF:

This was added in r209326 to be compatible with a shipping version of Safari.
We have released several versions of Safari since then, so do what the comments say and remove it.
The existence of this std::optional makes migrating to C++17 harder, and there's no reason to keep it.

  • WTF.xcodeproj/project.pbxproj:
  • wtf/CMakeLists.txt:
  • wtf/DeprecatedOptional.h: Removed.
Location:
trunk/Source
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r244506 r244558  
     12019-04-23  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove DeprecatedOptional
     4        https://bugs.webkit.org/show_bug.cgi?id=197161
     5
     6        Reviewed by Darin Adler.
     7
     8        * inspector/InspectorBackendDispatcher.cpp:
     9        * inspector/InspectorBackendDispatcher.h:
     10
    1112019-04-22  Yusuke Suzuki  <ysuzuki@apple.com>
    212

  • trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp

    r240557 r244558  
    271271}
    272272
    273 void BackendDispatcher::reportProtocolError(WTF::DeprecatedOptional<long> relatedRequestId, CommonErrorCode errorCode, const String& errorMessage)
    274 {
    275     if (relatedRequestId)
    276         reportProtocolError(relatedRequestId.value(), errorCode, errorMessage);
    277     else
    278         reportProtocolError(WTF::nullopt, errorCode, errorMessage);
    279 }
    280 
    281273template<typename T>
    282274T BackendDispatcher::getPropertyValue(JSON::Object* object, const String& name, bool* out_optionalValueFound, T defaultValue, std::function<bool(JSON::Value&, T&)> asMethod, const char* typeName)

  • trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h

    r239427 r244558  
    3030#include "InspectorProtocolTypes.h"
    3131#include <functional>
    32 #include <wtf/DeprecatedOptional.h>
    3332#include <wtf/Optional.h>
    3433#include <wtf/RefCounted.h>
    … …  
    111110    BackendDispatcher(Ref<FrontendRouter>&&);
    112111
    113     // This is necessary for some versions of Safari. Remove it when those versions of Safari are no longer supported.
    114     void reportProtocolError(WTF::DeprecatedOptional<long> relatedRequestId, CommonErrorCode, const String& errorMessage);
    115 
    116112    Ref<FrontendRouter> m_frontendRouter;
    117113    HashMap<String, SupplementalBackendDispatcher*> m_dispatchers;

  • trunk/Source/WTF/ChangeLog

    r244496 r244558  
     12019-04-23  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove DeprecatedOptional
     4        https://bugs.webkit.org/show_bug.cgi?id=197161
     5
     6        Reviewed by Darin Adler.
     7
     8        This was added in r209326 to be compatible with a shipping version of Safari.
     9        We have released several versions of Safari since then, so do what the comments say and remove it.
     10        The existence of this std::optional makes migrating to C++17 harder, and there's no reason to keep it.
     11
     12        * WTF.xcodeproj/project.pbxproj:
     13        * wtf/CMakeLists.txt:
     14        * wtf/DeprecatedOptional.h: Removed.
     15
    1162019-04-21  Zan Dobersek  <zdobersek@igalia.com>
    217

  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r243639 r244558  
    469469                A5098AFF1C169E0700087797 /* SandboxSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxSPI.h; sourceTree = "<group>"; };
    470470                A5098B011C16A4F900087797 /* SecuritySPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecuritySPI.h; sourceTree = "<group>"; };
    471                 A561F30F1DF2642100FF675D /* DeprecatedOptional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedOptional.h; sourceTree = "<group>"; };
    472471                A5BA15F2182433A900A82E69 /* StringCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringCocoa.mm; sourceTree = "<group>"; };
    473472                A5BA15F41824348000A82E69 /* StringImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringImplCocoa.mm; sourceTree = "<group>"; };
    … …  
    926925                                996B17841EBA441C007E10EB /* DebugUtilities.h */,
    927926                                0F2B66A417B6B4F700A7AE3F /* DeferrableRefCounted.h */,
    928                                 A561F30F1DF2642100FF675D /* DeprecatedOptional.h */,
    929927                                A8A4727E151A825A004123FF /* Deque.h */,
    930928                                A9A4727F151A825A004123FF /* DisallowCType.h */,
    … …  
    15361534                                0F9D3360165DBA73005AD387 /* FilePrintStream.cpp in Sources */,
    15371535                                A331D95B21F24992009F02AA /* FileSystem.cpp in Sources */,
    1538                                 FE1E2C42224187C600F6B729 /* PlatformRegisters.cpp in Sources */,
    15391536                                A331D95D21F249E4009F02AA /* FileSystemCF.cpp in Sources */,
    15401537                                A331D95F21F249F6009F02AA /* FileSystemCocoa.mm in Sources */,
    … …  
    15781575                                51F1752C1F3D486000C74950 /* PersistentDecoder.cpp in Sources */,
    15791576                                51F1752D1F3D486000C74950 /* PersistentEncoder.cpp in Sources */,
     1577                                FE1E2C42224187C600F6B729 /* PlatformRegisters.cpp in Sources */,
    15801578                                0F9D3362165DBA73005AD387 /* PrintStream.cpp in Sources */,
    15811579                                7AF023B52061E17000A8EFD6 /* ProcessPrivilege.cpp in Sources */,
     1580                                FE1E2C3B2240C06600F6B729 /* PtrTag.cpp in Sources */,
    15821581                                143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */,
    15831582                                A3B725EC987446AD93F1A440 /* RandomDevice.cpp in Sources */,
    … …  
    16301629                                1C181C911D307AB800F5FA16 /* UTextProviderLatin1.cpp in Sources */,
    16311630                                1C181C931D307AB800F5FA16 /* UTextProviderUTF16.cpp in Sources */,
    1632                                 FE1E2C3B2240C06600F6B729 /* PtrTag.cpp in Sources */,
    16331631                                A8A47469151A825B004123FF /* UTF8Conversion.cpp in Sources */,
    16341632                                7AFEC6B11EB22B5900DADE36 /* UUID.cpp in Sources */,

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r244349 r244558  
    4848    DebugUtilities.h
    4949    DeferrableRefCounted.h
    50     DeprecatedOptional.h
    5150    Deque.h
    5251    DisallowCType.h
Note: See TracChangeset for help on using the changeset viewer.