Changeset 212424 in webkit


Ignore:
Timestamp:
Feb 15, 2017 11:40:16 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Unreviewed, rolling out r212394.

Fixed iOS WebInspector

Reverted changeset:

"Unreviewed, rolling out r212169."
https://bugs.webkit.org/show_bug.cgi?id=166681
http://trac.webkit.org/changeset/212394

Location:
trunk/Source
Files:
4 deleted
11 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/API/JSRemoteInspector.cpp

    r212394 r212424  
    5151}
    5252
    53 void JSRemoteInspectorSetParentProcessInformation(pid_t pid, const UInt8* auditData, size_t auditLength)
     53void JSRemoteInspectorSetParentProcessInformation(pid_t pid, const uint8_t* auditData, size_t auditLength)
    5454{
    55 #if ENABLE(REMOTE_INSPECTOR)
     55#if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA)
    5656    RetainPtr<CFDataRef> auditDataRef = adoptCF(CFDataCreate(kCFAllocatorDefault, auditData, auditLength));
    5757    RemoteInspector::singleton().setParentProcessInformation(pid, auditDataRef);
  • trunk/Source/JavaScriptCore/ChangeLog

    r212419 r212424  
     12017-02-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212394.
     4
     5        Fixed iOS WebInspector
     6
     7        Reverted changeset:
     8
     9        "Unreviewed, rolling out r212169."
     10        https://bugs.webkit.org/show_bug.cgi?id=166681
     11        http://trac.webkit.org/changeset/212394
     12
    1132017-02-15  Guillaume Emont  <guijemont@igalia.com>
    214
  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r212394 r212424  
    16041604                9928FF3C18AC4AEC00B8CF12 /* JSReplayInputs.h in Headers */ = {isa = PBXBuildFile; fileRef = 9928FF3A18AC4AEC00B8CF12 /* JSReplayInputs.h */; settings = {ATTRIBUTES = (Private, ); }; };
    16051605                992ABCF91BEA9BD2006403A0 /* RemoteAutomationTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 992ABCF51BEA94CA006403A0 /* RemoteAutomationTarget.cpp */; };
     1606                992F56B41E4E84A40035953B /* RemoteConnectionToTargetCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 992F56B31E4E847D0035953B /* RemoteConnectionToTargetCocoa.mm */; };
     1607                992F56B51E4E84A80035953B /* RemoteInspectorCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 992F56B01E4E84790035953B /* RemoteInspectorCocoa.mm */; };
     1608                992F56B61E4E84AB0035953B /* RemoteInspectorXPCConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 992F56B21E4E84790035953B /* RemoteInspectorXPCConnection.mm */; };
     1609                992F56B71E4E84B20035953B /* RemoteInspectorXPCConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 992F56B11E4E84790035953B /* RemoteInspectorXPCConnection.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1610                995566861E4E8B0F00AAE13C /* RemoteInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 995566851E4E8B0700AAE13C /* RemoteInspector.cpp */; };
    16061611                9959E92B1BD17FA4001AA413 /* cssmin.py in Headers */ = {isa = PBXBuildFile; fileRef = 9959E9271BD17FA0001AA413 /* cssmin.py */; settings = {ATTRIBUTES = (Private, ); }; };
    16071612                9959E92D1BD17FA4001AA413 /* jsmin.py in Headers */ = {isa = PBXBuildFile; fileRef = 9959E9291BD17FA0001AA413 /* jsmin.py */; settings = {ATTRIBUTES = (Private, ); }; };
     
    17801785                A5B6A74D18C6DBA600F11E91 /* ConsoleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5B6A74C18C6DBA600F11E91 /* ConsoleClient.cpp */; };
    17811786                A5BA15E8182340B300A82E69 /* RemoteInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E1182340B300A82E69 /* RemoteInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1782                 A5BA15E9182340B300A82E69 /* RemoteInspector.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15E2182340B300A82E69 /* RemoteInspector.mm */; };
    17831787                A5BA15EA182340B400A82E69 /* RemoteInspectorConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17841788                A5BA15EB182340B400A82E69 /* RemoteConnectionToTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E4182340B300A82E69 /* RemoteConnectionToTarget.h */; };
    1785                 A5BA15EC182340B400A82E69 /* RemoteConnectionToTarget.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15E5182340B300A82E69 /* RemoteConnectionToTarget.mm */; };
    1786                 A5BA15ED182340B400A82E69 /* RemoteInspectorXPCConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E6182340B300A82E69 /* RemoteInspectorXPCConnection.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1787                 A5BA15EE182340B400A82E69 /* RemoteInspectorXPCConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5BA15E7182340B300A82E69 /* RemoteInspectorXPCConnection.mm */; };
    17881789                A5BA15F0182345AF00A82E69 /* RemoteInspectionTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17891790                A5C3A1A518C0490200C9593A /* JSGlobalObjectConsoleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5C3A1A318C0490200C9593A /* JSGlobalObjectConsoleClient.cpp */; };
     
    41214122                992ABCF51BEA94CA006403A0 /* RemoteAutomationTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAutomationTarget.cpp; sourceTree = "<group>"; };
    41224123                992ABCF61BEA94CA006403A0 /* RemoteAutomationTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteAutomationTarget.h; sourceTree = "<group>"; };
     4124                992F56B01E4E84790035953B /* RemoteInspectorCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteInspectorCocoa.mm; sourceTree = "<group>"; };
     4125                992F56B11E4E84790035953B /* RemoteInspectorXPCConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectorXPCConnection.h; sourceTree = "<group>"; };
     4126                992F56B21E4E84790035953B /* RemoteInspectorXPCConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteInspectorXPCConnection.mm; sourceTree = "<group>"; };
     4127                992F56B31E4E847D0035953B /* RemoteConnectionToTargetCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteConnectionToTargetCocoa.mm; sourceTree = "<group>"; };
     4128                995566851E4E8B0700AAE13C /* RemoteInspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteInspector.cpp; sourceTree = "<group>"; };
    41234129                9959E9271BD17FA0001AA413 /* cssmin.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = cssmin.py; sourceTree = "<group>"; };
    41244130                9959E9291BD17FA0001AA413 /* jsmin.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = jsmin.py; sourceTree = "<group>"; };
     
    42984304                A5B6A74C18C6DBA600F11E91 /* ConsoleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleClient.cpp; sourceTree = "<group>"; };
    42994305                A5BA15E1182340B300A82E69 /* RemoteInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspector.h; sourceTree = "<group>"; };
    4300                 A5BA15E2182340B300A82E69 /* RemoteInspector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteInspector.mm; sourceTree = "<group>"; };
    43014306                A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectorConstants.h; sourceTree = "<group>"; };
    43024307                A5BA15E4182340B300A82E69 /* RemoteConnectionToTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteConnectionToTarget.h; sourceTree = "<group>"; };
    4303                 A5BA15E5182340B300A82E69 /* RemoteConnectionToTarget.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteConnectionToTarget.mm; sourceTree = "<group>"; };
    4304                 A5BA15E6182340B300A82E69 /* RemoteInspectorXPCConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectorXPCConnection.h; sourceTree = "<group>"; };
    4305                 A5BA15E7182340B300A82E69 /* RemoteInspectorXPCConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteInspectorXPCConnection.mm; sourceTree = "<group>"; };
    43064308                A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectionTarget.h; sourceTree = "<group>"; };
    43074309                A5C3A1A318C0490200C9593A /* JSGlobalObjectConsoleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectConsoleClient.cpp; sourceTree = "<group>"; };
     
    50435045                        children = (
    50445046                                0F9327591C20BCBA00CF6564 /* dynbench */,
     5047                                932F5BE10822A1C700736975 /* jsc */,
    50455048                                0FF922CF14F46B130041A24E /* JSCLLIntOffsetsExtractor */,
    50465049                                141211200A48793C00480255 /* minidom */,
     
    50505053                                6511230514046A4C002B101D /* testRegExp */,
    50515054                                932F5BD90822A1C700736975 /* JavaScriptCore.framework */,
    5052                                 932F5BE10822A1C700736975 /* jsc */,
    50535055                        );
    50545056                        name = Products;
     
    61076109                        name = ARMv7;
    61086110                        path = disassembler/ARMv7;
     6111                        sourceTree = "<group>";
     6112                };
     6113                7ACDDECF1E252ACA0097AFEB /* cocoa */ = {
     6114                        isa = PBXGroup;
     6115                        children = (
     6116                                992F56B31E4E847D0035953B /* RemoteConnectionToTargetCocoa.mm */,
     6117                                992F56B01E4E84790035953B /* RemoteInspectorCocoa.mm */,
     6118                                992F56B11E4E84790035953B /* RemoteInspectorXPCConnection.h */,
     6119                                992F56B21E4E84790035953B /* RemoteInspectorXPCConnection.mm */,
     6120                        );
     6121                        path = cocoa;
    61096122                        sourceTree = "<group>";
    61106123                };
     
    68256838                                FE384EE31ADDB7AD0055DE2C /* JSDollarVMPrototype.cpp */,
    68266839                                FE384EE41ADDB7AD0055DE2C /* JSDollarVMPrototype.h */,
     6840                                86B5822C14D22F5F00A9C306 /* ProfileTreeNode.h */,
    68276841                                FE3022D01E3D739600BAC493 /* SigillCrashAnalyzer.cpp */,
    68286842                                FE3022D11E3D739600BAC493 /* SigillCrashAnalyzer.h */,
    6829                                 86B5822C14D22F5F00A9C306 /* ProfileTreeNode.h */,
    68306843                                86B5826A14D35D5100A9C306 /* TieredMMapArray.h */,
    68316844                                FE3022D41E42856700BAC493 /* VMInspector.cpp */,
     
    71117124                                0F3A1BF71A9ECB7D000DE01A /* DFGPutStackSinkingPhase.cpp */,
    71127125                                0F3A1BF81A9ECB7D000DE01A /* DFGPutStackSinkingPhase.h */,
     7126                                86EC9DC11328DF82002B2AD7 /* DFGRegisterBank.h */,
    71137127                                79FC8A071E32E9F000D88F0E /* DFGRegisteredStructure.h */,
    71147128                                7980C16A1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp */,
    71157129                                7980C16B1E3A940E00B71615 /* DFGRegisteredStructureSet.h */,
    7116                                 86EC9DC11328DF82002B2AD7 /* DFGRegisterBank.h */,
    71177130                                0F2FCCF418A60070001A27F8 /* DFGSafepoint.cpp */,
    71187131                                0F2FCCF518A60070001A27F8 /* DFGSafepoint.h */,
     
    76437656                        isa = PBXGroup;
    76447657                        children = (
     7658                                7ACDDECF1E252ACA0097AFEB /* cocoa */,
    76457659                                992ABCF51BEA94CA006403A0 /* RemoteAutomationTarget.cpp */,
    76467660                                992ABCF61BEA94CA006403A0 /* RemoteAutomationTarget.h */,
    76477661                                A5BA15E4182340B300A82E69 /* RemoteConnectionToTarget.h */,
    7648                                 A5BA15E5182340B300A82E69 /* RemoteConnectionToTarget.mm */,
    76497662                                998ED6721BED659A00DD8017 /* RemoteControllableTarget.cpp */,
    76507663                                998ED6731BED659A00DD8017 /* RemoteControllableTarget.h */,
    76517664                                A594558E18245EDE00CC3843 /* RemoteInspectionTarget.cpp */,
    76527665                                A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */,
     7666                                995566851E4E8B0700AAE13C /* RemoteInspector.cpp */,
    76537667                                A5BA15E1182340B300A82E69 /* RemoteInspector.h */,
    7654                                 A5BA15E2182340B300A82E69 /* RemoteInspector.mm */,
    76557668                                A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */,
    7656                                 A5BA15E6182340B300A82E69 /* RemoteInspectorXPCConnection.h */,
    7657                                 A5BA15E7182340B300A82E69 /* RemoteInspectorXPCConnection.mm */,
    76587669                        );
    76597670                        path = remote;
     
    80988109                                0F0B83A714BCF50700885B4F /* CodeType.h in Headers */,
    80998110                                0FA762051DB9242900B7A2FD /* CollectionScope.h in Headers */,
    8100                                 79FC8A081E32E9F000D88F0E /* DFGRegisteredStructure.h in Headers */,
    81018111                                A53243981856A489002ED692 /* CombinedDomains.json in Headers */,
    81028112                                BC18C3F30E16F5CD00B34460 /* CommonIdentifiers.h in Headers */,
     
    82938303                                0F3A1BFA1A9ECB7D000DE01A /* DFGPutStackSinkingPhase.h in Headers */,
    82948304                                86EC9DD11328DF82002B2AD7 /* DFGRegisterBank.h in Headers */,
     8305                                79FC8A081E32E9F000D88F0E /* DFGRegisteredStructure.h in Headers */,
     8306                                7980C16D1E3A940E00B71615 /* DFGRegisteredStructureSet.h in Headers */,
    82958307                                0F2FCCFC18A60070001A27F8 /* DFGSafepoint.h in Headers */,
    82968308                                A77A424317A0BBFD00A8DB81 /* DFGSafeToExecute.h in Headers */,
     
    84558467                                9959E9311BD18272001AA413 /* generate-combined-inspector-json.py in Headers */,
    84568468                                C4703CC0192844960013FBEA /* generate-inspector-protocol-bindings.py in Headers */,
    8457                                 FE3022D91E43C93400BAC493 /* JSVirtualMachinePrivate.h in Headers */,
    84588469                                99DA00AF1BD5994E00F4575C /* generate-js-builtins.py in Headers */,
    84598470                                A5EA70EC19F5B3EA0098F5EC /* generate_cpp_alternate_backend_dispatcher_header.py in Headers */,
     
    86928703                                A503FA2A188F105900110F14 /* JSGlobalObjectScriptDebugServer.h in Headers */,
    86938704                                A513E5C0185BFACC007E95AD /* JSInjectedScriptHost.h in Headers */,
    8694                                 7980C16D1E3A940E00B71615 /* DFGRegisteredStructureSet.h in Headers */,
    86958705                                A513E5C2185BFACC007E95AD /* JSInjectedScriptHostPrototype.h in Headers */,
    86968706                                C442CB251A6CDB8C005D3D7C /* JSInputs.json in Headers */,
     
    87728782                                86E3C615167BABD7006D760A /* JSVirtualMachine.h in Headers */,
    87738783                                86E3C61D167BABEE006D760A /* JSVirtualMachineInternal.h in Headers */,
     8784                                FE3022D91E43C93400BAC493 /* JSVirtualMachinePrivate.h in Headers */,
    87748785                                A7CA3AE817DA41AE006538AF /* JSWeakMap.h in Headers */,
    87758786                                A7482E93116A7CAD003B0712 /* JSWeakObjectMapRefInternal.h in Headers */,
     
    88098820                                70DE9A091BE7D69E005D89D9 /* LLIntAssembly.h in Headers */,
    88108821                                0F0FC45A14BD15F500B81154 /* LLIntCallLinkInfo.h in Headers */,
    8811                                 FE3022D31E3D73A500BAC493 /* SigillCrashAnalyzer.h in Headers */,
    88128822                                FE20CE9E15F04A9500DF3430 /* LLIntCLoop.h in Headers */,
    88138823                                0F4680CA14BBB16C00BFE272 /* LLIntCommon.h in Headers */,
     
    88698879                                0F1FB3991E1F65FB00A9BE50 /* MutatorScheduler.h in Headers */,
    88708880                                0FA762071DB9243300B7A2FD /* MutatorState.h in Headers */,
    8871                                 FE3022D71E42857300BAC493 /* VMInspector.h in Headers */,
    88728881                                BC02E9110E1839DB000F9297 /* NativeErrorConstructor.h in Headers */,
    88738882                                BC02E9130E1839DB000F9297 /* NativeErrorPrototype.h in Headers */,
     
    89798988                                A5BA15E8182340B300A82E69 /* RemoteInspector.h in Headers */,
    89808989                                A5BA15EA182340B400A82E69 /* RemoteInspectorConstants.h in Headers */,
    8981                                 A5BA15ED182340B400A82E69 /* RemoteInspectorXPCConnection.h in Headers */,
     8990                                992F56B71E4E84B20035953B /* RemoteInspectorXPCConnection.h in Headers */,
    89828991                                0F24E55117EE274900ABB217 /* Repatch.h in Headers */,
    89838992                                869EBCB70E8C6D4A008722CC /* ResultType.h in Headers */,
     
    90099018                                DC17E8181C9C91D9008A6AB3 /* ShadowChicken.h in Headers */,
    90109019                                DC17E8191C9C91DB008A6AB3 /* ShadowChickenInlines.h in Headers */,
     9020                                FE3022D31E3D73A500BAC493 /* SigillCrashAnalyzer.h in Headers */,
    90119021                                0F2B670517B6B5AB00A7AE3F /* SimpleTypedArrayController.h in Headers */,
    90129022                                14BA78F113AAB88F005B7C2C /* SlotVisitor.h in Headers */,
     
    91279137                                FE5932A8183C5A2600A1ECCC /* VMEntryScope.h in Headers */,
    91289138                                0F5AE2C41DF4F2800066EFE1 /* VMInlines.h in Headers */,
     9139                                FE3022D71E42857300BAC493 /* VMInspector.h in Headers */,
    91299140                                53F40E931D5A4AB30099A1B6 /* WasmB3IRGenerator.h in Headers */,
    91309141                                AD4B1DFA1DF244E20071AE32 /* WasmBinding.h in Headers */,
     
    97369747                                147F39BD107EC37600427A48 /* ArgList.cpp in Sources */,
    97379748                                79A228351D35D71E00D8E067 /* ArithProfile.cpp in Sources */,
    9738                                 FE3022D61E42857300BAC493 /* VMInspector.cpp in Sources */,
    97399749                                0F743BAA16B88249009F9277 /* ARM64Disassembler.cpp in Sources */,
    97409750                                86D3B2C310156BDE002865E7 /* ARMAssembler.cpp in Sources */,
     
    1000610016                                0FB17662196B8F9E0091052A /* DFGPureValue.cpp in Sources */,
    1000710017                                0F3A1BF91A9ECB7D000DE01A /* DFGPutStackSinkingPhase.cpp in Sources */,
     10018                                7980C16C1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp in Sources */,
    1000810019                                0F2FCCFB18A60070001A27F8 /* DFGSafepoint.cpp in Sources */,
    1000910020                                86EC9DD21328DF82002B2AD7 /* DFGSpeculativeJIT.cpp in Sources */,
     
    1005910070                                147341E21DC2CE9600AA29BA /* EvalExecutable.cpp in Sources */,
    1006010071                                A54982031891D0B00081E5B8 /* EventLoop.cpp in Sources */,
    10061                                 7980C16C1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp in Sources */,
    1006210072                                FE1C0FFF1B194FD100B53FCA /* Exception.cpp in Sources */,
    1006310073                                FE80C19B1D776A98008510C0 /* ExceptionEventLocation.cpp in Sources */,
     
    1043210442                                79160DBD1C8E3EC8008C085A /* ProxyRevoke.cpp in Sources */,
    1043310443                                0F15CD221BA5F9860031FFD3 /* PutByIdFlags.cpp in Sources */,
    10434                                 FE3022D21E3D73A500BAC493 /* SigillCrashAnalyzer.cpp in Sources */,
    1043510444                                0F9332A314CA7DD70085F3C6 /* PutByIdStatus.cpp in Sources */,
    1043610445                                0F93B4A918B92C4D00178A3F /* PutByIdVariant.cpp in Sources */,
     
    1045010459                                A57D23ED1891B5540031C7FA /* RegularExpression.cpp in Sources */,
    1045110460                                992ABCF91BEA9BD2006403A0 /* RemoteAutomationTarget.cpp in Sources */,
    10452                                 A5BA15EC182340B400A82E69 /* RemoteConnectionToTarget.mm in Sources */,
     10461                                992F56B41E4E84A40035953B /* RemoteConnectionToTargetCocoa.mm in Sources */,
    1045310462                                998ED6741BED70AC00DD8017 /* RemoteControllableTarget.cpp in Sources */,
    1045410463                                A594558F18245EFD00CC3843 /* RemoteInspectionTarget.cpp in Sources */,
    10455                                 A5BA15E9182340B300A82E69 /* RemoteInspector.mm in Sources */,
    10456                                 A5BA15EE182340B400A82E69 /* RemoteInspectorXPCConnection.mm in Sources */,
     10464                                995566861E4E8B0F00AAE13C /* RemoteInspector.cpp in Sources */,
     10465                                992F56B51E4E84A80035953B /* RemoteInspectorCocoa.mm in Sources */,
     10466                                992F56B61E4E84AB0035953B /* RemoteInspectorXPCConnection.mm in Sources */,
    1045710467                                0F24E55017EE274900ABB217 /* Repatch.cpp in Sources */,
    1045810468                                527773DE1AAF83AC00BDE7E8 /* RuntimeType.cpp in Sources */,
     
    1047710487                                0FEE98431A89227500754E93 /* SetupVarargsFrame.cpp in Sources */,
    1047810488                                DC17E8171C9C91D6008A6AB3 /* ShadowChicken.cpp in Sources */,
     10489                                FE3022D21E3D73A500BAC493 /* SigillCrashAnalyzer.cpp in Sources */,
    1047910490                                0F2B670417B6B5AB00A7AE3F /* SimpleTypedArrayController.cpp in Sources */,
    1048010491                                C225494315F7DBAA0065E898 /* SlotVisitor.cpp in Sources */,
     
    1055110562                                E18E3A590DF9278C00D90B34 /* VM.cpp in Sources */,
    1055210563                                FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */,
     10564                                FE3022D61E42857300BAC493 /* VMInspector.cpp in Sources */,
    1055310565                                53F40E8F1D5902820099A1B6 /* WasmB3IRGenerator.cpp in Sources */,
    1055410566                                AD4B1DF91DF244E20071AE32 /* WasmBinding.cpp in Sources */,
  • trunk/Source/JavaScriptCore/PlatformMac.cmake

    r212394 r212424  
    1111
    1212    inspector/remote/RemoteAutomationTarget.cpp
    13     inspector/remote/RemoteConnectionToTarget.mm
    1413    inspector/remote/RemoteControllableTarget.cpp
    1514    inspector/remote/RemoteInspectionTarget.cpp
    16     inspector/remote/RemoteInspector.mm
     15    inspector/remote/RemoteInspector.cpp
     16
     17    inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm
     18    inspector/remote/cocoa/RemoteInspectorCocoa.mm
     19    inspector/remote/cocoa/RemoteInspectorXPCConnection.mm
    1720)
    1821add_definitions(-DSTATICALLY_LINKED_WITH_WTF -D__STDC_WANT_LIB_EXT1__)
     
    2629    ${JAVASCRIPTCORE_DIR}/disassembler/udis86
    2730    ${JAVASCRIPTCORE_DIR}/icu
     31    ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
    2832)
    2933
  • trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h

    r212394 r212424  
    2828#if ENABLE(REMOTE_INSPECTOR)
    2929
    30 #import "InspectorFrontendChannel.h"
    31 #import "RemoteConnectionToTarget.h"
    32 #import "RemoteInspector.h"
    33 #import <mutex>
    34 #import <wtf/BlockPtr.h>
    35 #import <wtf/Lock.h>
    36 #import <wtf/RetainPtr.h>
    37 #import <wtf/ThreadSafeRefCounted.h>
     30#include "InspectorFrontendChannel.h"
     31#include <wtf/Lock.h>
     32#include <wtf/ThreadSafeRefCounted.h>
     33
     34#if PLATFORM(COCOA)
     35#include <wtf/BlockPtr.h>
     36#include <wtf/RetainPtr.h>
    3837
    3938OBJC_CLASS NSString;
     39#endif
    4040
    4141namespace Inspector {
    4242
     43class RemoteControllableTarget;
     44
     45#if PLATFORM(COCOA)
    4346typedef Vector<BlockPtr<void ()>> RemoteTargetQueue;
     47#endif
    4448
    4549class RemoteConnectionToTarget final : public ThreadSafeRefCounted<RemoteConnectionToTarget>, public FrontendChannel {
    4650public:
    47     RemoteConnectionToTarget(RemoteControllableTarget*, NSString *connectionIdentifier, NSString *destination);
     51#if PLATFORM(COCOA)
     52    RemoteConnectionToTarget(RemoteControllableTarget*, NSString* connectionIdentifier, NSString* destination);
     53#endif
    4854    virtual ~RemoteConnectionToTarget();
    4955
    5056    // Main API.
    5157    bool setup(bool isAutomaticInspection = false, bool automaticallyPause = false);
     58#if PLATFORM(COCOA)
    5259    void sendMessageToTarget(NSString *);
     60#else
     61    void sendMessageToTarget(const String&);
     62#endif
    5363    void close();
    5464    void targetClosed();
    5565
    5666    std::optional<unsigned> targetIdentifier() const;
     67#if PLATFORM(COCOA)
    5768    NSString *connectionIdentifier() const;
    5869    NSString *destination() const;
     
    6172    const RemoteTargetQueue& queue() const { return m_queue; }
    6273    void clearQueue() { m_queue.clear(); }
     74#endif
    6375
    6476    // FrontendChannel overrides.
     
    6779
    6880private:
     81#if PLATFORM(COCOA)
    6982    void dispatchAsyncOnTarget(void (^block)());
    7083
     
    7285    void teardownRunLoop();
    7386    void queueTaskOnPrivateRunLoop(void (^block)());
     87#endif
    7488
    7589    // This connection from the RemoteInspector singleton to the InspectionTarget
     
    7892    Lock m_targetMutex;
    7993
     94#if PLATFORM(COCOA)
    8095    // If a target has a specific run loop it wants to evaluate on
    8196    // we setup our run loop sources on that specific run loop.
     
    8499    RemoteTargetQueue m_queue;
    85100    Lock m_queueMutex;
     101#endif
    86102
    87103    RemoteControllableTarget* m_target { nullptr };
     104    bool m_connected { false };
     105
     106#if PLATFORM(COCOA)
    88107    RetainPtr<NSString> m_connectionIdentifier;
    89108    RetainPtr<NSString> m_destination;
    90     bool m_connected { false };
     109#endif
    91110};
    92111
  • trunk/Source/JavaScriptCore/inspector/remote/RemoteControllableTarget.h

    r212394 r212424  
    2828#if ENABLE(REMOTE_INSPECTOR)
    2929
    30 #include <CoreFoundation/CFRunLoop.h>
    3130#include <wtf/TypeCasts.h>
    3231#include <wtf/text/WTFString.h>
     32
     33#if USE(CF)
     34#include <CoreFoundation/CFRunLoop.h>
     35#endif
    3336
    3437namespace Inspector {
     
    5457    virtual void dispatchMessageFromRemote(const String& message) = 0;
    5558
     59#if USE(CF)
    5660    // The dispatch block will be scheduled on a global run loop if null is returned.
    5761    virtual CFRunLoopRef targetRunLoop() { return nullptr; }
     62#endif
    5863private:
    5964    unsigned m_identifier {0};
  • trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectionTarget.h

    r212394 r212424  
    4242    void setRemoteDebuggingAllowed(bool);
    4343
     44#if USE(CF)
    4445    CFRunLoopRef targetRunLoop() override { return m_runLoop.get(); }
    4546    void setTargetRunLoop(CFRunLoopRef runLoop) { m_runLoop = runLoop; }
     47#endif
    4648
    4749    virtual String name() const { return String(); } // JavaScript and Web
     
    6062private:
    6163    bool m_allowed {false};
     64#if USE(CF)
    6265    RetainPtr<CFRunLoopRef> m_runLoop;
     66#endif
    6367};
    6468
  • trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h

    r212394 r212424  
    2828#if ENABLE(REMOTE_INSPECTOR)
    2929
    30 #import "RemoteInspectorXPCConnection.h"
    31 #import <wtf/Forward.h>
    32 #import <wtf/HashMap.h>
    33 #import <wtf/Lock.h>
    34 #import <wtf/RetainPtr.h>
     30#include <wtf/Forward.h>
     31#include <wtf/HashMap.h>
     32#include <wtf/Lock.h>
     33
     34#if PLATFORM(COCOA)
     35#include "RemoteInspectorXPCConnection.h"
     36#include <wtf/RetainPtr.h>
    3537
    3638OBJC_CLASS NSDictionary;
    3739OBJC_CLASS NSString;
     40typedef RetainPtr<NSDictionary> TargetListing;
     41#endif
    3842
    3943namespace Inspector {
     
    4549class RemoteInspectorClient;
    4650
    47 class JS_EXPORT_PRIVATE RemoteInspector final : public RemoteInspectorXPCConnection::Client {
     51class JS_EXPORT_PRIVATE RemoteInspector final
     52#if PLATFORM(COCOA)
     53    : public RemoteInspectorXPCConnection::Client
     54#endif
     55{
    4856public:
    4957    class Client {
     
    8189    void stop();
    8290
     91#if PLATFORM(COCOA)
    8392    bool hasParentProcessInformation() const { return m_parentProcessIdentifier != 0; }
    8493    pid_t parentProcessIdentifier() const { return m_parentProcessIdentifier; }
     
    8695    void setParentProcessInformation(pid_t, RetainPtr<CFDataRef> auditData);
    8796    void setParentProcessInfomationIsDelayed();
     97#endif
    8898
    8999private:
     
    95105    void stopInternal(StopSource);
    96106
     107#if PLATFORM(COCOA)
    97108    void setupXPCConnectionIfNeeded();
     109#endif
    98110
    99     RetainPtr<NSDictionary> listingForTarget(const RemoteControllableTarget&) const;
    100     RetainPtr<NSDictionary> listingForInspectionTarget(const RemoteInspectionTarget&) const;
    101     RetainPtr<NSDictionary> listingForAutomationTarget(const RemoteAutomationTarget&) const;
     111    TargetListing listingForTarget(const RemoteControllableTarget&) const;
     112    TargetListing listingForInspectionTarget(const RemoteInspectionTarget&) const;
     113    TargetListing listingForAutomationTarget(const RemoteAutomationTarget&) const;
     114
    102115    void pushListingsNow();
    103116    void pushListingsSoon();
     
    111124    void sendAutomaticInspectionCandidateMessage();
    112125
     126#if PLATFORM(COCOA)
    113127    void xpcConnectionReceivedMessage(RemoteInspectorXPCConnection*, NSString *messageName, NSDictionary *userInfo) override;
    114128    void xpcConnectionFailed(RemoteInspectorXPCConnection*) override;
     
    125139    void receivedAutomaticInspectionRejectMessage(NSDictionary *userInfo);
    126140    void receivedAutomationSessionRequestMessage(NSDictionary *userInfo);
     141#endif
    127142
    128143    static bool startEnabled;
     
    135150
    136151    HashMap<unsigned, RemoteControllableTarget*> m_targetMap;
    137     HashMap<unsigned, RetainPtr<NSDictionary>> m_targetListingMap;
    138152    HashMap<unsigned, RefPtr<RemoteConnectionToTarget>> m_targetConnectionMap;
     153    HashMap<unsigned, TargetListing> m_targetListingMap;
    139154
     155#if PLATFORM(COCOA)
    140156    RefPtr<RemoteInspectorXPCConnection> m_relayConnection;
     157#endif
    141158
    142159    RemoteInspector::Client* m_client { nullptr };
    143160    std::optional<RemoteInspector::Client::Capabilities> m_clientCapabilities;
    144161
     162#if PLATFORM(COCOA)
    145163    dispatch_queue_t m_xpcQueue;
     164#endif
    146165    unsigned m_nextAvailableTargetIdentifier { 1 };
    147166    int m_notifyToken { 0 };
     
    151170
    152171    pid_t m_parentProcessIdentifier { 0 };
     172#if PLATFORM(COCOA)
    153173    RetainPtr<CFDataRef> m_parentProcessAuditData;
     174#endif
    154175    bool m_shouldSendParentProcessInformation { false };
    155176    bool m_automaticInspectionEnabled { false };
  • trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm

    r212169 r212424  
    211211}
    212212
    213 void RemoteConnectionToTarget::sendMessageToTarget(const String& message)
     213void RemoteConnectionToTarget::sendMessageToTarget(NSString *message)
    214214{
    215215    ref();
  • trunk/Source/WebKit2/ChangeLog

    r212418 r212424  
     12017-02-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212394.
     4
     5        Fixed iOS WebInspector
     6
     7        Reverted changeset:
     8
     9        "Unreviewed, rolling out r212169."
     10        https://bugs.webkit.org/show_bug.cgi?id=166681
     11        http://trac.webkit.org/changeset/212394
     12
    1132017-02-15  Eric Carlson  <eric.carlson@apple.com>
    214
  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r212394 r212424  
    371371#endif
    372372
    373 #if ENABLE(REMOTE_INSPECTOR)
     373#if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA)
    374374    audit_token_t auditToken;
    375375    if (parentProcessConnection()->getAuditToken(auditToken)) {
Note: See TracChangeset for help on using the changeset viewer.