Changeset 212394 in webkit


Ignore:
Timestamp:
Feb 15, 2017 2:31:07 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Unreviewed, rolling out r212169.

Broke iOS WebInspector

Reverted changeset:

"WebInspector: refactor RemoteInspector to move cocoa specific
code to their own files"
​https://bugs.webkit.org/show_bug.cgi?id=166681
​http://trac.webkit.org/changeset/212169

Location:
trunk
Files:
2 deleted
12 edited
4 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/JSRemoteInspector.cpp

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

  • trunk/Source/JavaScriptCore/ChangeLog

    r212378 r212394  
     12017-02-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212169.
     4
     5        Broke iOS WebInspector
     6
     7        Reverted changeset:
     8
     9        "WebInspector: refactor RemoteInspector to move cocoa specific
     10        code to their own files"
     11        https://bugs.webkit.org/show_bug.cgi?id=166681
     12        http://trac.webkit.org/changeset/212169
     13
    1142017-02-15  Chris Dumez  <cdumez@apple.com>
    215

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

    r212169 r212394  
    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 */; };
    16111606                9959E92B1BD17FA4001AA413 /* cssmin.py in Headers */ = {isa = PBXBuildFile; fileRef = 9959E9271BD17FA0001AA413 /* cssmin.py */; settings = {ATTRIBUTES = (Private, ); }; };
    16121607                9959E92D1BD17FA4001AA413 /* jsmin.py in Headers */ = {isa = PBXBuildFile; fileRef = 9959E9291BD17FA0001AA413 /* jsmin.py */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    17851780                A5B6A74D18C6DBA600F11E91 /* ConsoleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5B6A74C18C6DBA600F11E91 /* ConsoleClient.cpp */; };
    17861781                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 */; };
    17871783                A5BA15EA182340B400A82E69 /* RemoteInspectorConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17881784                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 */; };
    17891788                A5BA15F0182345AF00A82E69 /* RemoteInspectionTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17901789                A5C3A1A518C0490200C9593A /* JSGlobalObjectConsoleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5C3A1A318C0490200C9593A /* JSGlobalObjectConsoleClient.cpp */; };
    … …  
    41224121                992ABCF51BEA94CA006403A0 /* RemoteAutomationTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAutomationTarget.cpp; sourceTree = "<group>"; };
    41234122                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>"; };
    41294123                9959E9271BD17FA0001AA413 /* cssmin.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = cssmin.py; sourceTree = "<group>"; };
    41304124                9959E9291BD17FA0001AA413 /* jsmin.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = jsmin.py; sourceTree = "<group>"; };
    … …  
    43044298                A5B6A74C18C6DBA600F11E91 /* ConsoleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleClient.cpp; sourceTree = "<group>"; };
    43054299                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>"; };
    43064301                A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectorConstants.h; sourceTree = "<group>"; };
    43074302                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>"; };
    43084306                A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectionTarget.h; sourceTree = "<group>"; };
    43094307                A5C3A1A318C0490200C9593A /* JSGlobalObjectConsoleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectConsoleClient.cpp; sourceTree = "<group>"; };
    … …  
    50455043                        children = (
    50465044                                0F9327591C20BCBA00CF6564 /* dynbench */,
    5047                                 932F5BE10822A1C700736975 /* jsc */,
    50485045                                0FF922CF14F46B130041A24E /* JSCLLIntOffsetsExtractor */,
    50495046                                141211200A48793C00480255 /* minidom */,
    … …  
    50535050                                6511230514046A4C002B101D /* testRegExp */,
    50545051                                932F5BD90822A1C700736975 /* JavaScriptCore.framework */,
     5052                                932F5BE10822A1C700736975 /* jsc */,
    50555053                        );
    50565054                        name = Products;
    … …  
    61096107                        name = ARMv7;
    61106108                        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;
    61226109                        sourceTree = "<group>";
    61236110                };
    … …  
    68386825                                FE384EE31ADDB7AD0055DE2C /* JSDollarVMPrototype.cpp */,
    68396826                                FE384EE41ADDB7AD0055DE2C /* JSDollarVMPrototype.h */,
    6840                                 86B5822C14D22F5F00A9C306 /* ProfileTreeNode.h */,
    68416827                                FE3022D01E3D739600BAC493 /* SigillCrashAnalyzer.cpp */,
    68426828                                FE3022D11E3D739600BAC493 /* SigillCrashAnalyzer.h */,
     6829                                86B5822C14D22F5F00A9C306 /* ProfileTreeNode.h */,
    68436830                                86B5826A14D35D5100A9C306 /* TieredMMapArray.h */,
    68446831                                FE3022D41E42856700BAC493 /* VMInspector.cpp */,
    … …  
    71247111                                0F3A1BF71A9ECB7D000DE01A /* DFGPutStackSinkingPhase.cpp */,
    71257112                                0F3A1BF81A9ECB7D000DE01A /* DFGPutStackSinkingPhase.h */,
    7126                                 86EC9DC11328DF82002B2AD7 /* DFGRegisterBank.h */,
    71277113                                79FC8A071E32E9F000D88F0E /* DFGRegisteredStructure.h */,
    71287114                                7980C16A1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp */,
    71297115                                7980C16B1E3A940E00B71615 /* DFGRegisteredStructureSet.h */,
     7116                                86EC9DC11328DF82002B2AD7 /* DFGRegisterBank.h */,
    71307117                                0F2FCCF418A60070001A27F8 /* DFGSafepoint.cpp */,
    71317118                                0F2FCCF518A60070001A27F8 /* DFGSafepoint.h */,
    … …  
    76567643                        isa = PBXGroup;
    76577644                        children = (
    7658                                 7ACDDECF1E252ACA0097AFEB /* cocoa */,
    76597645                                992ABCF51BEA94CA006403A0 /* RemoteAutomationTarget.cpp */,
    76607646                                992ABCF61BEA94CA006403A0 /* RemoteAutomationTarget.h */,
    76617647                                A5BA15E4182340B300A82E69 /* RemoteConnectionToTarget.h */,
     7648                                A5BA15E5182340B300A82E69 /* RemoteConnectionToTarget.mm */,
    76627649                                998ED6721BED659A00DD8017 /* RemoteControllableTarget.cpp */,
    76637650                                998ED6731BED659A00DD8017 /* RemoteControllableTarget.h */,
    76647651                                A594558E18245EDE00CC3843 /* RemoteInspectionTarget.cpp */,
    76657652                                A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */,
    7666                                 995566851E4E8B0700AAE13C /* RemoteInspector.cpp */,
    76677653                                A5BA15E1182340B300A82E69 /* RemoteInspector.h */,
     7654                                A5BA15E2182340B300A82E69 /* RemoteInspector.mm */,
    76687655                                A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */,
     7656                                A5BA15E6182340B300A82E69 /* RemoteInspectorXPCConnection.h */,
     7657                                A5BA15E7182340B300A82E69 /* RemoteInspectorXPCConnection.mm */,
    76697658                        );
    76707659                        path = remote;
    … …  
    81098098                                0F0B83A714BCF50700885B4F /* CodeType.h in Headers */,
    81108099                                0FA762051DB9242900B7A2FD /* CollectionScope.h in Headers */,
     8100                                79FC8A081E32E9F000D88F0E /* DFGRegisteredStructure.h in Headers */,
    81118101                                A53243981856A489002ED692 /* CombinedDomains.json in Headers */,
    81128102                                BC18C3F30E16F5CD00B34460 /* CommonIdentifiers.h in Headers */,
    … …  
    83038293                                0F3A1BFA1A9ECB7D000DE01A /* DFGPutStackSinkingPhase.h in Headers */,
    83048294                                86EC9DD11328DF82002B2AD7 /* DFGRegisterBank.h in Headers */,
    8305                                 79FC8A081E32E9F000D88F0E /* DFGRegisteredStructure.h in Headers */,
    8306                                 7980C16D1E3A940E00B71615 /* DFGRegisteredStructureSet.h in Headers */,
    83078295                                0F2FCCFC18A60070001A27F8 /* DFGSafepoint.h in Headers */,
    83088296                                A77A424317A0BBFD00A8DB81 /* DFGSafeToExecute.h in Headers */,
    … …  
    84678455                                9959E9311BD18272001AA413 /* generate-combined-inspector-json.py in Headers */,
    84688456                                C4703CC0192844960013FBEA /* generate-inspector-protocol-bindings.py in Headers */,
     8457                                FE3022D91E43C93400BAC493 /* JSVirtualMachinePrivate.h in Headers */,
    84698458                                99DA00AF1BD5994E00F4575C /* generate-js-builtins.py in Headers */,
    84708459                                A5EA70EC19F5B3EA0098F5EC /* generate_cpp_alternate_backend_dispatcher_header.py in Headers */,
    … …  
    87038692                                A503FA2A188F105900110F14 /* JSGlobalObjectScriptDebugServer.h in Headers */,
    87048693                                A513E5C0185BFACC007E95AD /* JSInjectedScriptHost.h in Headers */,
     8694                                7980C16D1E3A940E00B71615 /* DFGRegisteredStructureSet.h in Headers */,
    87058695                                A513E5C2185BFACC007E95AD /* JSInjectedScriptHostPrototype.h in Headers */,
    87068696                                C442CB251A6CDB8C005D3D7C /* JSInputs.json in Headers */,
    … …  
    87828772                                86E3C615167BABD7006D760A /* JSVirtualMachine.h in Headers */,
    87838773                                86E3C61D167BABEE006D760A /* JSVirtualMachineInternal.h in Headers */,
    8784                                 FE3022D91E43C93400BAC493 /* JSVirtualMachinePrivate.h in Headers */,
    87858774                                A7CA3AE817DA41AE006538AF /* JSWeakMap.h in Headers */,
    87868775                                A7482E93116A7CAD003B0712 /* JSWeakObjectMapRefInternal.h in Headers */,
    … …  
    88208809                                70DE9A091BE7D69E005D89D9 /* LLIntAssembly.h in Headers */,
    88218810                                0F0FC45A14BD15F500B81154 /* LLIntCallLinkInfo.h in Headers */,
     8811                                FE3022D31E3D73A500BAC493 /* SigillCrashAnalyzer.h in Headers */,
    88228812                                FE20CE9E15F04A9500DF3430 /* LLIntCLoop.h in Headers */,
    88238813                                0F4680CA14BBB16C00BFE272 /* LLIntCommon.h in Headers */,
    … …  
    88798869                                0F1FB3991E1F65FB00A9BE50 /* MutatorScheduler.h in Headers */,
    88808870                                0FA762071DB9243300B7A2FD /* MutatorState.h in Headers */,
     8871                                FE3022D71E42857300BAC493 /* VMInspector.h in Headers */,
    88818872                                BC02E9110E1839DB000F9297 /* NativeErrorConstructor.h in Headers */,
    88828873                                BC02E9130E1839DB000F9297 /* NativeErrorPrototype.h in Headers */,
    … …  
    89888979                                A5BA15E8182340B300A82E69 /* RemoteInspector.h in Headers */,
    89898980                                A5BA15EA182340B400A82E69 /* RemoteInspectorConstants.h in Headers */,
    8990                                 992F56B71E4E84B20035953B /* RemoteInspectorXPCConnection.h in Headers */,
     8981                                A5BA15ED182340B400A82E69 /* RemoteInspectorXPCConnection.h in Headers */,
    89918982                                0F24E55117EE274900ABB217 /* Repatch.h in Headers */,
    89928983                                869EBCB70E8C6D4A008722CC /* ResultType.h in Headers */,
    … …  
    90189009                                DC17E8181C9C91D9008A6AB3 /* ShadowChicken.h in Headers */,
    90199010                                DC17E8191C9C91DB008A6AB3 /* ShadowChickenInlines.h in Headers */,
    9020                                 FE3022D31E3D73A500BAC493 /* SigillCrashAnalyzer.h in Headers */,
    90219011                                0F2B670517B6B5AB00A7AE3F /* SimpleTypedArrayController.h in Headers */,
    90229012                                14BA78F113AAB88F005B7C2C /* SlotVisitor.h in Headers */,
    … …  
    91379127                                FE5932A8183C5A2600A1ECCC /* VMEntryScope.h in Headers */,
    91389128                                0F5AE2C41DF4F2800066EFE1 /* VMInlines.h in Headers */,
    9139                                 FE3022D71E42857300BAC493 /* VMInspector.h in Headers */,
    91409129                                53F40E931D5A4AB30099A1B6 /* WasmB3IRGenerator.h in Headers */,
    91419130                                AD4B1DFA1DF244E20071AE32 /* WasmBinding.h in Headers */,
    … …  
    97479736                                147F39BD107EC37600427A48 /* ArgList.cpp in Sources */,
    97489737                                79A228351D35D71E00D8E067 /* ArithProfile.cpp in Sources */,
     9738                                FE3022D61E42857300BAC493 /* VMInspector.cpp in Sources */,
    97499739                                0F743BAA16B88249009F9277 /* ARM64Disassembler.cpp in Sources */,
    97509740                                86D3B2C310156BDE002865E7 /* ARMAssembler.cpp in Sources */,
    … …  
    1001610006                                0FB17662196B8F9E0091052A /* DFGPureValue.cpp in Sources */,
    1001710007                                0F3A1BF91A9ECB7D000DE01A /* DFGPutStackSinkingPhase.cpp in Sources */,
    10018                                 7980C16C1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp in Sources */,
    1001910008                                0F2FCCFB18A60070001A27F8 /* DFGSafepoint.cpp in Sources */,
    1002010009                                86EC9DD21328DF82002B2AD7 /* DFGSpeculativeJIT.cpp in Sources */,
    … …  
    1007010059                                147341E21DC2CE9600AA29BA /* EvalExecutable.cpp in Sources */,
    1007110060                                A54982031891D0B00081E5B8 /* EventLoop.cpp in Sources */,
     10061                                7980C16C1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp in Sources */,
    1007210062                                FE1C0FFF1B194FD100B53FCA /* Exception.cpp in Sources */,
    1007310063                                FE80C19B1D776A98008510C0 /* ExceptionEventLocation.cpp in Sources */,
    … …  
    1044210432                                79160DBD1C8E3EC8008C085A /* ProxyRevoke.cpp in Sources */,
    1044310433                                0F15CD221BA5F9860031FFD3 /* PutByIdFlags.cpp in Sources */,
     10434                                FE3022D21E3D73A500BAC493 /* SigillCrashAnalyzer.cpp in Sources */,
    1044410435                                0F9332A314CA7DD70085F3C6 /* PutByIdStatus.cpp in Sources */,
    1044510436                                0F93B4A918B92C4D00178A3F /* PutByIdVariant.cpp in Sources */,
    … …  
    1045910450                                A57D23ED1891B5540031C7FA /* RegularExpression.cpp in Sources */,
    1046010451                                992ABCF91BEA9BD2006403A0 /* RemoteAutomationTarget.cpp in Sources */,
    10461                                 992F56B41E4E84A40035953B /* RemoteConnectionToTargetCocoa.mm in Sources */,
     10452                                A5BA15EC182340B400A82E69 /* RemoteConnectionToTarget.mm in Sources */,
    1046210453                                998ED6741BED70AC00DD8017 /* RemoteControllableTarget.cpp in Sources */,
    1046310454                                A594558F18245EFD00CC3843 /* RemoteInspectionTarget.cpp in Sources */,
    10464                                 995566861E4E8B0F00AAE13C /* RemoteInspector.cpp in Sources */,
    10465                                 992F56B51E4E84A80035953B /* RemoteInspectorCocoa.mm in Sources */,
    10466                                 992F56B61E4E84AB0035953B /* RemoteInspectorXPCConnection.mm in Sources */,
     10455                                A5BA15E9182340B300A82E69 /* RemoteInspector.mm in Sources */,
     10456                                A5BA15EE182340B400A82E69 /* RemoteInspectorXPCConnection.mm in Sources */,
    1046710457                                0F24E55017EE274900ABB217 /* Repatch.cpp in Sources */,
    1046810458                                527773DE1AAF83AC00BDE7E8 /* RuntimeType.cpp in Sources */,
    … …  
    1048710477                                0FEE98431A89227500754E93 /* SetupVarargsFrame.cpp in Sources */,
    1048810478                                DC17E8171C9C91D6008A6AB3 /* ShadowChicken.cpp in Sources */,
    10489                                 FE3022D21E3D73A500BAC493 /* SigillCrashAnalyzer.cpp in Sources */,
    1049010479                                0F2B670417B6B5AB00A7AE3F /* SimpleTypedArrayController.cpp in Sources */,
    1049110480                                C225494315F7DBAA0065E898 /* SlotVisitor.cpp in Sources */,
    … …  
    1056210551                                E18E3A590DF9278C00D90B34 /* VM.cpp in Sources */,
    1056310552                                FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */,
    10564                                 FE3022D61E42857300BAC493 /* VMInspector.cpp in Sources */,
    1056510553                                53F40E8F1D5902820099A1B6 /* WasmB3IRGenerator.cpp in Sources */,
    1056610554                                AD4B1DF91DF244E20071AE32 /* WasmBinding.cpp in Sources */,

  • trunk/Source/JavaScriptCore/PlatformMac.cmake

    r212363 r212394  
    1111
    1212    inspector/remote/RemoteAutomationTarget.cpp
     13    inspector/remote/RemoteConnectionToTarget.mm
    1314    inspector/remote/RemoteControllableTarget.cpp
    1415    inspector/remote/RemoteInspectionTarget.cpp
    15     inspector/remote/RemoteInspector.cpp
    16 
    17     inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm
    18     inspector/remote/cocoa/RemoteInspectorCocoa.mm
    19     inspector/remote/cocoa/RemoteInspectorXPCConnection.mm
     16    inspector/remote/RemoteInspector.mm
    2017)
    2118add_definitions(-DSTATICALLY_LINKED_WITH_WTF -D__STDC_WANT_LIB_EXT1__)
    … …  
    2926    ${JAVASCRIPTCORE_DIR}/disassembler/udis86
    3027    ${JAVASCRIPTCORE_DIR}/icu
    31     ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
    3228)
    3329

  • trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h

    r212169 r212394  
    2828#if ENABLE(REMOTE_INSPECTOR)
    2929
    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>
     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>
    3738
    3839OBJC_CLASS NSString;
    39 #endif
    4040
    4141namespace Inspector {
    4242
    43 class RemoteControllableTarget;
    44 
    45 #if PLATFORM(COCOA)
    4643typedef Vector<BlockPtr<void ()>> RemoteTargetQueue;
    47 #endif
    4844
    4945class RemoteConnectionToTarget final : public ThreadSafeRefCounted<RemoteConnectionToTarget>, public FrontendChannel {
    5046public:
    51 #if PLATFORM(COCOA)
    52     RemoteConnectionToTarget(RemoteControllableTarget*, NSString* connectionIdentifier, NSString* destination);
    53 #endif
     47    RemoteConnectionToTarget(RemoteControllableTarget*, NSString *connectionIdentifier, NSString *destination);
    5448    virtual ~RemoteConnectionToTarget();
    5549
    5650    // Main API.
    5751    bool setup(bool isAutomaticInspection = false, bool automaticallyPause = false);
    58     void sendMessageToTarget(const String&);
     52    void sendMessageToTarget(NSString *);
    5953    void close();
    6054    void targetClosed();
    6155
    6256    std::optional<unsigned> targetIdentifier() const;
    63 #if PLATFORM(COCOA)
    6457    NSString *connectionIdentifier() const;
    6558    NSString *destination() const;
    … …  
    6861    const RemoteTargetQueue& queue() const { return m_queue; }
    6962    void clearQueue() { m_queue.clear(); }
    70 #endif
    7163
    7264    // FrontendChannel overrides.
    … …  
    7567
    7668private:
    77 #if PLATFORM(COCOA)
    7869    void dispatchAsyncOnTarget(void (^block)());
    7970
    … …  
    8172    void teardownRunLoop();
    8273    void queueTaskOnPrivateRunLoop(void (^block)());
    83 #endif
    8474
    8575    // This connection from the RemoteInspector singleton to the InspectionTarget
    … …  
    8878    Lock m_targetMutex;
    8979
    90 #if PLATFORM(COCOA)
    9180    // If a target has a specific run loop it wants to evaluate on
    9281    // we setup our run loop sources on that specific run loop.
    … …  
    9584    RemoteTargetQueue m_queue;
    9685    Lock m_queueMutex;
    97 #endif
    9886
    9987    RemoteControllableTarget* m_target { nullptr };
    100     bool m_connected { false };
    101 
    102 #if PLATFORM(COCOA)
    10388    RetainPtr<NSString> m_connectionIdentifier;
    10489    RetainPtr<NSString> m_destination;
    105 #endif
     90    bool m_connected { false };
    10691};
    10792

  • trunk/Source/JavaScriptCore/inspector/remote/RemoteControllableTarget.h

    r212169 r212394  
    2828#if ENABLE(REMOTE_INSPECTOR)
    2929
     30#include <CoreFoundation/CFRunLoop.h>
    3031#include <wtf/TypeCasts.h>
    3132#include <wtf/text/WTFString.h>
    32 
    33 #if USE(CF)
    34 #include <CoreFoundation/CFRunLoop.h>
    35 #endif
    3633
    3734namespace Inspector {
    … …  
    5754    virtual void dispatchMessageFromRemote(const String& message) = 0;
    5855
    59 #if USE(CF)
    6056    // The dispatch block will be scheduled on a global run loop if null is returned.
    6157    virtual CFRunLoopRef targetRunLoop() { return nullptr; }
    62 #endif
    6358private:
    6459    unsigned m_identifier {0};

  • trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectionTarget.h

    r212169 r212394  
    4242    void setRemoteDebuggingAllowed(bool);
    4343
    44 #if USE(CF)
    4544    CFRunLoopRef targetRunLoop() override { return m_runLoop.get(); }
    4645    void setTargetRunLoop(CFRunLoopRef runLoop) { m_runLoop = runLoop; }
    47 #endif
    4846
    4947    virtual String name() const { return String(); } // JavaScript and Web
    … …  
    6260private:
    6361    bool m_allowed {false};
    64 #if USE(CF)
    6562    RetainPtr<CFRunLoopRef> m_runLoop;
    66 #endif
    6763};
    6864

  • trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h

    r212169 r212394  
    2828#if ENABLE(REMOTE_INSPECTOR)
    2929
    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>
     30#import "RemoteInspectorXPCConnection.h"
     31#import <wtf/Forward.h>
     32#import <wtf/HashMap.h>
     33#import <wtf/Lock.h>
     34#import <wtf/RetainPtr.h>
    3735
    3836OBJC_CLASS NSDictionary;
    3937OBJC_CLASS NSString;
    40 typedef RetainPtr<NSDictionary> TargetListing;
    41 #endif
    4238
    4339namespace Inspector {
    … …  
    4945class RemoteInspectorClient;
    5046
    51 class JS_EXPORT_PRIVATE RemoteInspector final
    52 #if PLATFORM(COCOA)
    53     : public RemoteInspectorXPCConnection::Client
    54 #endif
    55 {
     47class JS_EXPORT_PRIVATE RemoteInspector final : public RemoteInspectorXPCConnection::Client {
    5648public:
    5749    class Client {
    … …  
    8981    void stop();
    9082
    91 #if PLATFORM(COCOA)
    9283    bool hasParentProcessInformation() const { return m_parentProcessIdentifier != 0; }
    9384    pid_t parentProcessIdentifier() const { return m_parentProcessIdentifier; }
    … …  
    9586    void setParentProcessInformation(pid_t, RetainPtr<CFDataRef> auditData);
    9687    void setParentProcessInfomationIsDelayed();
    97 #endif
    9888
    9989private:
    … …  
    10595    void stopInternal(StopSource);
    10696
    107 #if PLATFORM(COCOA)
    10897    void setupXPCConnectionIfNeeded();
    109 #endif
    11098
    111     TargetListing listingForTarget(const RemoteControllableTarget&) const;
    112     TargetListing listingForInspectionTarget(const RemoteInspectionTarget&) const;
    113     TargetListing listingForAutomationTarget(const RemoteAutomationTarget&) const;
    114 
     99    RetainPtr<NSDictionary> listingForTarget(const RemoteControllableTarget&) const;
     100    RetainPtr<NSDictionary> listingForInspectionTarget(const RemoteInspectionTarget&) const;
     101    RetainPtr<NSDictionary> listingForAutomationTarget(const RemoteAutomationTarget&) const;
    115102    void pushListingsNow();
    116103    void pushListingsSoon();
    … …  
    124111    void sendAutomaticInspectionCandidateMessage();
    125112
    126 #if PLATFORM(COCOA)
    127113    void xpcConnectionReceivedMessage(RemoteInspectorXPCConnection*, NSString *messageName, NSDictionary *userInfo) override;
    128114    void xpcConnectionFailed(RemoteInspectorXPCConnection*) override;
    … …  
    139125    void receivedAutomaticInspectionRejectMessage(NSDictionary *userInfo);
    140126    void receivedAutomationSessionRequestMessage(NSDictionary *userInfo);
    141 #endif
    142127
    143128    static bool startEnabled;
    … …  
    150135
    151136    HashMap<unsigned, RemoteControllableTarget*> m_targetMap;
     137    HashMap<unsigned, RetainPtr<NSDictionary>> m_targetListingMap;
    152138    HashMap<unsigned, RefPtr<RemoteConnectionToTarget>> m_targetConnectionMap;
    153     HashMap<unsigned, TargetListing> m_targetListingMap;
    154139
    155 #if PLATFORM(COCOA)
    156140    RefPtr<RemoteInspectorXPCConnection> m_relayConnection;
    157 #endif
    158141
    159142    RemoteInspector::Client* m_client { nullptr };
    160143    std::optional<RemoteInspector::Client::Capabilities> m_clientCapabilities;
    161144
    162 #if PLATFORM(COCOA)
    163145    dispatch_queue_t m_xpcQueue;
    164 #endif
    165146    unsigned m_nextAvailableTargetIdentifier { 1 };
    166147    int m_notifyToken { 0 };
    … …  
    170151
    171152    pid_t m_parentProcessIdentifier { 0 };
    172 #if PLATFORM(COCOA)
    173153    RetainPtr<CFDataRef> m_parentProcessAuditData;
    174 #endif
    175154    bool m_shouldSendParentProcessInformation { false };
    176155    bool m_automaticInspectionEnabled { false };

  • trunk/Source/WebKit2/ChangeLog

    r212379 r212394  
     12017-02-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212169.
     4
     5        Broke iOS WebInspector
     6
     7        Reverted changeset:
     8
     9        "WebInspector: refactor RemoteInspector to move cocoa specific
     10        code to their own files"
     11        https://bugs.webkit.org/show_bug.cgi?id=166681
     12        http://trac.webkit.org/changeset/212169
     13
    1142017-02-15  Anders Carlsson  <andersca@apple.com>
    215

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r212260 r212394  
    371371#endif
    372372
    373 #if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA)
     373#if ENABLE(REMOTE_INSPECTOR)
    374374    audit_token_t auditToken;
    375375    if (parentProcessConnection()->getAuditToken(auditToken)) {

  • trunk/Tools/ChangeLog

    r212387 r212394  
     12017-02-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r212169.
     4
     5        Broke iOS WebInspector
     6
     7        Reverted changeset:
     8
     9        "WebInspector: refactor RemoteInspector to move cocoa specific
     10        code to their own files"
     11        https://bugs.webkit.org/show_bug.cgi?id=166681
     12        http://trac.webkit.org/changeset/212169
     13
    1142017-02-15  Jonathan Bedard  <jbedard@apple.com>
    215

  • trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch

    • Property svn:mergeinfo deleted
Note: See TracChangeset for help on using the changeset viewer.