Changeset 244574 in webkit


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

Unreviewed, rolling out r244558.
https://bugs.webkit.org/show_bug.cgi?id=197219

Causing crashes on iOS Sim Release and Debug (Requested by
ShawnRoberts on #webkit).

Reverted changeset:

"Remove DeprecatedOptional"
https://bugs.webkit.org/show_bug.cgi?id=197161
https://trac.webkit.org/changeset/244558

Location:
trunk/Source
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r244566 r244574  
     12019-04-23  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r244558.
     4        https://bugs.webkit.org/show_bug.cgi?id=197219
     5
     6        Causing crashes on iOS Sim Release and Debug (Requested by
     7        ShawnRoberts on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Remove DeprecatedOptional"
     12        https://bugs.webkit.org/show_bug.cgi?id=197161
     13        https://trac.webkit.org/changeset/244558
     14
    1152019-04-23  Devin Rousso  <drousso@apple.com>
    216
  • trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp

    r244558 r244574  
    271271}
    272272
     273void 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
    273281template<typename T>
    274282T 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

    r244558 r244574  
    3030#include "InspectorProtocolTypes.h"
    3131#include <functional>
     32#include <wtf/DeprecatedOptional.h>
    3233#include <wtf/Optional.h>
    3334#include <wtf/RefCounted.h>
     
    110111    BackendDispatcher(Ref<FrontendRouter>&&);
    111112
     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
    112116    Ref<FrontendRouter> m_frontendRouter;
    113117    HashMap<String, SupplementalBackendDispatcher*> m_dispatchers;
  • trunk/Source/WTF/ChangeLog

    r244558 r244574  
     12019-04-23  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r244558.
     4        https://bugs.webkit.org/show_bug.cgi?id=197219
     5
     6        Causing crashes on iOS Sim Release and Debug (Requested by
     7        ShawnRoberts on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Remove DeprecatedOptional"
     12        https://bugs.webkit.org/show_bug.cgi?id=197161
     13        https://trac.webkit.org/changeset/244558
     14
    1152019-04-23  Alex Christensen  <achristensen@webkit.org>
    216
  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r244558 r244574  
    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>"; };
    471472                A5BA15F2182433A900A82E69 /* StringCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringCocoa.mm; sourceTree = "<group>"; };
    472473                A5BA15F41824348000A82E69 /* StringImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringImplCocoa.mm; sourceTree = "<group>"; };
     
    925926                                996B17841EBA441C007E10EB /* DebugUtilities.h */,
    926927                                0F2B66A417B6B4F700A7AE3F /* DeferrableRefCounted.h */,
     928                                A561F30F1DF2642100FF675D /* DeprecatedOptional.h */,
    927929                                A8A4727E151A825A004123FF /* Deque.h */,
    928930                                A9A4727F151A825A004123FF /* DisallowCType.h */,
     
    15341536                                0F9D3360165DBA73005AD387 /* FilePrintStream.cpp in Sources */,
    15351537                                A331D95B21F24992009F02AA /* FileSystem.cpp in Sources */,
     1538                                FE1E2C42224187C600F6B729 /* PlatformRegisters.cpp in Sources */,
    15361539                                A331D95D21F249E4009F02AA /* FileSystemCF.cpp in Sources */,
    15371540                                A331D95F21F249F6009F02AA /* FileSystemCocoa.mm in Sources */,
     
    15751578                                51F1752C1F3D486000C74950 /* PersistentDecoder.cpp in Sources */,
    15761579                                51F1752D1F3D486000C74950 /* PersistentEncoder.cpp in Sources */,
    1577                                 FE1E2C42224187C600F6B729 /* PlatformRegisters.cpp in Sources */,
    15781580                                0F9D3362165DBA73005AD387 /* PrintStream.cpp in Sources */,
    15791581                                7AF023B52061E17000A8EFD6 /* ProcessPrivilege.cpp in Sources */,
    1580                                 FE1E2C3B2240C06600F6B729 /* PtrTag.cpp in Sources */,
    15811582                                143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */,
    15821583                                A3B725EC987446AD93F1A440 /* RandomDevice.cpp in Sources */,
     
    16291630                                1C181C911D307AB800F5FA16 /* UTextProviderLatin1.cpp in Sources */,
    16301631                                1C181C931D307AB800F5FA16 /* UTextProviderUTF16.cpp in Sources */,
     1632                                FE1E2C3B2240C06600F6B729 /* PtrTag.cpp in Sources */,
    16311633                                A8A47469151A825B004123FF /* UTF8Conversion.cpp in Sources */,
    16321634                                7AFEC6B11EB22B5900DADE36 /* UUID.cpp in Sources */,
  • trunk/Source/WTF/wtf/CMakeLists.txt

    r244558 r244574  
    4848    DebugUtilities.h
    4949    DeferrableRefCounted.h
     50    DeprecatedOptional.h
    5051    Deque.h
    5152    DisallowCType.h
Note: See TracChangeset for help on using the changeset viewer.