Changeset 212424 in webkit
- Timestamp:
- Feb 15, 2017 11:40:16 PM (7 years ago)
- Location:
- trunk/Source
- Files:
-
- 4 deleted
- 11 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/API/JSRemoteInspector.cpp
r212394 r212424 51 51 } 52 52 53 void JSRemoteInspectorSetParentProcessInformation(pid_t pid, const UInt8* auditData, size_t auditLength)53 void JSRemoteInspectorSetParentProcessInformation(pid_t pid, const uint8_t* auditData, size_t auditLength) 54 54 { 55 #if ENABLE(REMOTE_INSPECTOR) 55 #if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA) 56 56 RetainPtr<CFDataRef> auditDataRef = adoptCF(CFDataCreate(kCFAllocatorDefault, auditData, auditLength)); 57 57 RemoteInspector::singleton().setParentProcessInformation(pid, auditDataRef); -
trunk/Source/JavaScriptCore/ChangeLog
r212419 r212424 1 2017-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 1 13 2017-02-15 Guillaume Emont <guijemont@igalia.com> 2 14 -
trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r212394 r212424 1604 1604 9928FF3C18AC4AEC00B8CF12 /* JSReplayInputs.h in Headers */ = {isa = PBXBuildFile; fileRef = 9928FF3A18AC4AEC00B8CF12 /* JSReplayInputs.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1605 1605 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 */; }; 1606 1611 9959E92B1BD17FA4001AA413 /* cssmin.py in Headers */ = {isa = PBXBuildFile; fileRef = 9959E9271BD17FA0001AA413 /* cssmin.py */; settings = {ATTRIBUTES = (Private, ); }; }; 1607 1612 9959E92D1BD17FA4001AA413 /* jsmin.py in Headers */ = {isa = PBXBuildFile; fileRef = 9959E9291BD17FA0001AA413 /* jsmin.py */; settings = {ATTRIBUTES = (Private, ); }; }; … … 1780 1785 A5B6A74D18C6DBA600F11E91 /* ConsoleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5B6A74C18C6DBA600F11E91 /* ConsoleClient.cpp */; }; 1781 1786 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 */; };1783 1787 A5BA15EA182340B400A82E69 /* RemoteInspectorConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1784 1788 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 */; };1788 1789 A5BA15F0182345AF00A82E69 /* RemoteInspectionTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1789 1790 A5C3A1A518C0490200C9593A /* JSGlobalObjectConsoleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5C3A1A318C0490200C9593A /* JSGlobalObjectConsoleClient.cpp */; }; … … 4121 4122 992ABCF51BEA94CA006403A0 /* RemoteAutomationTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteAutomationTarget.cpp; sourceTree = "<group>"; }; 4122 4123 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>"; }; 4123 4129 9959E9271BD17FA0001AA413 /* cssmin.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = cssmin.py; sourceTree = "<group>"; }; 4124 4130 9959E9291BD17FA0001AA413 /* jsmin.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = jsmin.py; sourceTree = "<group>"; }; … … 4298 4304 A5B6A74C18C6DBA600F11E91 /* ConsoleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleClient.cpp; sourceTree = "<group>"; }; 4299 4305 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>"; };4301 4306 A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectorConstants.h; sourceTree = "<group>"; }; 4302 4307 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>"; };4306 4308 A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteInspectionTarget.h; sourceTree = "<group>"; }; 4307 4309 A5C3A1A318C0490200C9593A /* JSGlobalObjectConsoleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectConsoleClient.cpp; sourceTree = "<group>"; }; … … 5043 5045 children = ( 5044 5046 0F9327591C20BCBA00CF6564 /* dynbench */, 5047 932F5BE10822A1C700736975 /* jsc */, 5045 5048 0FF922CF14F46B130041A24E /* JSCLLIntOffsetsExtractor */, 5046 5049 141211200A48793C00480255 /* minidom */, … … 5050 5053 6511230514046A4C002B101D /* testRegExp */, 5051 5054 932F5BD90822A1C700736975 /* JavaScriptCore.framework */, 5052 932F5BE10822A1C700736975 /* jsc */,5053 5055 ); 5054 5056 name = Products; … … 6107 6109 name = ARMv7; 6108 6110 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; 6109 6122 sourceTree = "<group>"; 6110 6123 }; … … 6825 6838 FE384EE31ADDB7AD0055DE2C /* JSDollarVMPrototype.cpp */, 6826 6839 FE384EE41ADDB7AD0055DE2C /* JSDollarVMPrototype.h */, 6840 86B5822C14D22F5F00A9C306 /* ProfileTreeNode.h */, 6827 6841 FE3022D01E3D739600BAC493 /* SigillCrashAnalyzer.cpp */, 6828 6842 FE3022D11E3D739600BAC493 /* SigillCrashAnalyzer.h */, 6829 86B5822C14D22F5F00A9C306 /* ProfileTreeNode.h */,6830 6843 86B5826A14D35D5100A9C306 /* TieredMMapArray.h */, 6831 6844 FE3022D41E42856700BAC493 /* VMInspector.cpp */, … … 7111 7124 0F3A1BF71A9ECB7D000DE01A /* DFGPutStackSinkingPhase.cpp */, 7112 7125 0F3A1BF81A9ECB7D000DE01A /* DFGPutStackSinkingPhase.h */, 7126 86EC9DC11328DF82002B2AD7 /* DFGRegisterBank.h */, 7113 7127 79FC8A071E32E9F000D88F0E /* DFGRegisteredStructure.h */, 7114 7128 7980C16A1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp */, 7115 7129 7980C16B1E3A940E00B71615 /* DFGRegisteredStructureSet.h */, 7116 86EC9DC11328DF82002B2AD7 /* DFGRegisterBank.h */,7117 7130 0F2FCCF418A60070001A27F8 /* DFGSafepoint.cpp */, 7118 7131 0F2FCCF518A60070001A27F8 /* DFGSafepoint.h */, … … 7643 7656 isa = PBXGroup; 7644 7657 children = ( 7658 7ACDDECF1E252ACA0097AFEB /* cocoa */, 7645 7659 992ABCF51BEA94CA006403A0 /* RemoteAutomationTarget.cpp */, 7646 7660 992ABCF61BEA94CA006403A0 /* RemoteAutomationTarget.h */, 7647 7661 A5BA15E4182340B300A82E69 /* RemoteConnectionToTarget.h */, 7648 A5BA15E5182340B300A82E69 /* RemoteConnectionToTarget.mm */,7649 7662 998ED6721BED659A00DD8017 /* RemoteControllableTarget.cpp */, 7650 7663 998ED6731BED659A00DD8017 /* RemoteControllableTarget.h */, 7651 7664 A594558E18245EDE00CC3843 /* RemoteInspectionTarget.cpp */, 7652 7665 A5BA15EF182345AF00A82E69 /* RemoteInspectionTarget.h */, 7666 995566851E4E8B0700AAE13C /* RemoteInspector.cpp */, 7653 7667 A5BA15E1182340B300A82E69 /* RemoteInspector.h */, 7654 A5BA15E2182340B300A82E69 /* RemoteInspector.mm */,7655 7668 A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */, 7656 A5BA15E6182340B300A82E69 /* RemoteInspectorXPCConnection.h */,7657 A5BA15E7182340B300A82E69 /* RemoteInspectorXPCConnection.mm */,7658 7669 ); 7659 7670 path = remote; … … 8098 8109 0F0B83A714BCF50700885B4F /* CodeType.h in Headers */, 8099 8110 0FA762051DB9242900B7A2FD /* CollectionScope.h in Headers */, 8100 79FC8A081E32E9F000D88F0E /* DFGRegisteredStructure.h in Headers */,8101 8111 A53243981856A489002ED692 /* CombinedDomains.json in Headers */, 8102 8112 BC18C3F30E16F5CD00B34460 /* CommonIdentifiers.h in Headers */, … … 8293 8303 0F3A1BFA1A9ECB7D000DE01A /* DFGPutStackSinkingPhase.h in Headers */, 8294 8304 86EC9DD11328DF82002B2AD7 /* DFGRegisterBank.h in Headers */, 8305 79FC8A081E32E9F000D88F0E /* DFGRegisteredStructure.h in Headers */, 8306 7980C16D1E3A940E00B71615 /* DFGRegisteredStructureSet.h in Headers */, 8295 8307 0F2FCCFC18A60070001A27F8 /* DFGSafepoint.h in Headers */, 8296 8308 A77A424317A0BBFD00A8DB81 /* DFGSafeToExecute.h in Headers */, … … 8455 8467 9959E9311BD18272001AA413 /* generate-combined-inspector-json.py in Headers */, 8456 8468 C4703CC0192844960013FBEA /* generate-inspector-protocol-bindings.py in Headers */, 8457 FE3022D91E43C93400BAC493 /* JSVirtualMachinePrivate.h in Headers */,8458 8469 99DA00AF1BD5994E00F4575C /* generate-js-builtins.py in Headers */, 8459 8470 A5EA70EC19F5B3EA0098F5EC /* generate_cpp_alternate_backend_dispatcher_header.py in Headers */, … … 8692 8703 A503FA2A188F105900110F14 /* JSGlobalObjectScriptDebugServer.h in Headers */, 8693 8704 A513E5C0185BFACC007E95AD /* JSInjectedScriptHost.h in Headers */, 8694 7980C16D1E3A940E00B71615 /* DFGRegisteredStructureSet.h in Headers */,8695 8705 A513E5C2185BFACC007E95AD /* JSInjectedScriptHostPrototype.h in Headers */, 8696 8706 C442CB251A6CDB8C005D3D7C /* JSInputs.json in Headers */, … … 8772 8782 86E3C615167BABD7006D760A /* JSVirtualMachine.h in Headers */, 8773 8783 86E3C61D167BABEE006D760A /* JSVirtualMachineInternal.h in Headers */, 8784 FE3022D91E43C93400BAC493 /* JSVirtualMachinePrivate.h in Headers */, 8774 8785 A7CA3AE817DA41AE006538AF /* JSWeakMap.h in Headers */, 8775 8786 A7482E93116A7CAD003B0712 /* JSWeakObjectMapRefInternal.h in Headers */, … … 8809 8820 70DE9A091BE7D69E005D89D9 /* LLIntAssembly.h in Headers */, 8810 8821 0F0FC45A14BD15F500B81154 /* LLIntCallLinkInfo.h in Headers */, 8811 FE3022D31E3D73A500BAC493 /* SigillCrashAnalyzer.h in Headers */,8812 8822 FE20CE9E15F04A9500DF3430 /* LLIntCLoop.h in Headers */, 8813 8823 0F4680CA14BBB16C00BFE272 /* LLIntCommon.h in Headers */, … … 8869 8879 0F1FB3991E1F65FB00A9BE50 /* MutatorScheduler.h in Headers */, 8870 8880 0FA762071DB9243300B7A2FD /* MutatorState.h in Headers */, 8871 FE3022D71E42857300BAC493 /* VMInspector.h in Headers */,8872 8881 BC02E9110E1839DB000F9297 /* NativeErrorConstructor.h in Headers */, 8873 8882 BC02E9130E1839DB000F9297 /* NativeErrorPrototype.h in Headers */, … … 8979 8988 A5BA15E8182340B300A82E69 /* RemoteInspector.h in Headers */, 8980 8989 A5BA15EA182340B400A82E69 /* RemoteInspectorConstants.h in Headers */, 8981 A5BA15ED182340B400A82E69/* RemoteInspectorXPCConnection.h in Headers */,8990 992F56B71E4E84B20035953B /* RemoteInspectorXPCConnection.h in Headers */, 8982 8991 0F24E55117EE274900ABB217 /* Repatch.h in Headers */, 8983 8992 869EBCB70E8C6D4A008722CC /* ResultType.h in Headers */, … … 9009 9018 DC17E8181C9C91D9008A6AB3 /* ShadowChicken.h in Headers */, 9010 9019 DC17E8191C9C91DB008A6AB3 /* ShadowChickenInlines.h in Headers */, 9020 FE3022D31E3D73A500BAC493 /* SigillCrashAnalyzer.h in Headers */, 9011 9021 0F2B670517B6B5AB00A7AE3F /* SimpleTypedArrayController.h in Headers */, 9012 9022 14BA78F113AAB88F005B7C2C /* SlotVisitor.h in Headers */, … … 9127 9137 FE5932A8183C5A2600A1ECCC /* VMEntryScope.h in Headers */, 9128 9138 0F5AE2C41DF4F2800066EFE1 /* VMInlines.h in Headers */, 9139 FE3022D71E42857300BAC493 /* VMInspector.h in Headers */, 9129 9140 53F40E931D5A4AB30099A1B6 /* WasmB3IRGenerator.h in Headers */, 9130 9141 AD4B1DFA1DF244E20071AE32 /* WasmBinding.h in Headers */, … … 9736 9747 147F39BD107EC37600427A48 /* ArgList.cpp in Sources */, 9737 9748 79A228351D35D71E00D8E067 /* ArithProfile.cpp in Sources */, 9738 FE3022D61E42857300BAC493 /* VMInspector.cpp in Sources */,9739 9749 0F743BAA16B88249009F9277 /* ARM64Disassembler.cpp in Sources */, 9740 9750 86D3B2C310156BDE002865E7 /* ARMAssembler.cpp in Sources */, … … 10006 10016 0FB17662196B8F9E0091052A /* DFGPureValue.cpp in Sources */, 10007 10017 0F3A1BF91A9ECB7D000DE01A /* DFGPutStackSinkingPhase.cpp in Sources */, 10018 7980C16C1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp in Sources */, 10008 10019 0F2FCCFB18A60070001A27F8 /* DFGSafepoint.cpp in Sources */, 10009 10020 86EC9DD21328DF82002B2AD7 /* DFGSpeculativeJIT.cpp in Sources */, … … 10059 10070 147341E21DC2CE9600AA29BA /* EvalExecutable.cpp in Sources */, 10060 10071 A54982031891D0B00081E5B8 /* EventLoop.cpp in Sources */, 10061 7980C16C1E3A940E00B71615 /* DFGRegisteredStructureSet.cpp in Sources */,10062 10072 FE1C0FFF1B194FD100B53FCA /* Exception.cpp in Sources */, 10063 10073 FE80C19B1D776A98008510C0 /* ExceptionEventLocation.cpp in Sources */, … … 10432 10442 79160DBD1C8E3EC8008C085A /* ProxyRevoke.cpp in Sources */, 10433 10443 0F15CD221BA5F9860031FFD3 /* PutByIdFlags.cpp in Sources */, 10434 FE3022D21E3D73A500BAC493 /* SigillCrashAnalyzer.cpp in Sources */,10435 10444 0F9332A314CA7DD70085F3C6 /* PutByIdStatus.cpp in Sources */, 10436 10445 0F93B4A918B92C4D00178A3F /* PutByIdVariant.cpp in Sources */, … … 10450 10459 A57D23ED1891B5540031C7FA /* RegularExpression.cpp in Sources */, 10451 10460 992ABCF91BEA9BD2006403A0 /* RemoteAutomationTarget.cpp in Sources */, 10452 A5BA15EC182340B400A82E69 /* RemoteConnectionToTarget.mm in Sources */,10461 992F56B41E4E84A40035953B /* RemoteConnectionToTargetCocoa.mm in Sources */, 10453 10462 998ED6741BED70AC00DD8017 /* RemoteControllableTarget.cpp in Sources */, 10454 10463 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 */, 10457 10467 0F24E55017EE274900ABB217 /* Repatch.cpp in Sources */, 10458 10468 527773DE1AAF83AC00BDE7E8 /* RuntimeType.cpp in Sources */, … … 10477 10487 0FEE98431A89227500754E93 /* SetupVarargsFrame.cpp in Sources */, 10478 10488 DC17E8171C9C91D6008A6AB3 /* ShadowChicken.cpp in Sources */, 10489 FE3022D21E3D73A500BAC493 /* SigillCrashAnalyzer.cpp in Sources */, 10479 10490 0F2B670417B6B5AB00A7AE3F /* SimpleTypedArrayController.cpp in Sources */, 10480 10491 C225494315F7DBAA0065E898 /* SlotVisitor.cpp in Sources */, … … 10551 10562 E18E3A590DF9278C00D90B34 /* VM.cpp in Sources */, 10552 10563 FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */, 10564 FE3022D61E42857300BAC493 /* VMInspector.cpp in Sources */, 10553 10565 53F40E8F1D5902820099A1B6 /* WasmB3IRGenerator.cpp in Sources */, 10554 10566 AD4B1DF91DF244E20071AE32 /* WasmBinding.cpp in Sources */, -
trunk/Source/JavaScriptCore/PlatformMac.cmake
r212394 r212424 11 11 12 12 inspector/remote/RemoteAutomationTarget.cpp 13 inspector/remote/RemoteConnectionToTarget.mm14 13 inspector/remote/RemoteControllableTarget.cpp 15 14 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 17 20 ) 18 21 add_definitions(-DSTATICALLY_LINKED_WITH_WTF -D__STDC_WANT_LIB_EXT1__) … … 26 29 ${JAVASCRIPTCORE_DIR}/disassembler/udis86 27 30 ${JAVASCRIPTCORE_DIR}/icu 31 ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa 28 32 ) 29 33 -
trunk/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h
r212394 r212424 28 28 #if ENABLE(REMOTE_INSPECTOR) 29 29 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> 38 37 39 38 OBJC_CLASS NSString; 39 #endif 40 40 41 41 namespace Inspector { 42 42 43 class RemoteControllableTarget; 44 45 #if PLATFORM(COCOA) 43 46 typedef Vector<BlockPtr<void ()>> RemoteTargetQueue; 47 #endif 44 48 45 49 class RemoteConnectionToTarget final : public ThreadSafeRefCounted<RemoteConnectionToTarget>, public FrontendChannel { 46 50 public: 47 RemoteConnectionToTarget(RemoteControllableTarget*, NSString *connectionIdentifier, NSString *destination); 51 #if PLATFORM(COCOA) 52 RemoteConnectionToTarget(RemoteControllableTarget*, NSString* connectionIdentifier, NSString* destination); 53 #endif 48 54 virtual ~RemoteConnectionToTarget(); 49 55 50 56 // Main API. 51 57 bool setup(bool isAutomaticInspection = false, bool automaticallyPause = false); 58 #if PLATFORM(COCOA) 52 59 void sendMessageToTarget(NSString *); 60 #else 61 void sendMessageToTarget(const String&); 62 #endif 53 63 void close(); 54 64 void targetClosed(); 55 65 56 66 std::optional<unsigned> targetIdentifier() const; 67 #if PLATFORM(COCOA) 57 68 NSString *connectionIdentifier() const; 58 69 NSString *destination() const; … … 61 72 const RemoteTargetQueue& queue() const { return m_queue; } 62 73 void clearQueue() { m_queue.clear(); } 74 #endif 63 75 64 76 // FrontendChannel overrides. … … 67 79 68 80 private: 81 #if PLATFORM(COCOA) 69 82 void dispatchAsyncOnTarget(void (^block)()); 70 83 … … 72 85 void teardownRunLoop(); 73 86 void queueTaskOnPrivateRunLoop(void (^block)()); 87 #endif 74 88 75 89 // This connection from the RemoteInspector singleton to the InspectionTarget … … 78 92 Lock m_targetMutex; 79 93 94 #if PLATFORM(COCOA) 80 95 // If a target has a specific run loop it wants to evaluate on 81 96 // we setup our run loop sources on that specific run loop. … … 84 99 RemoteTargetQueue m_queue; 85 100 Lock m_queueMutex; 101 #endif 86 102 87 103 RemoteControllableTarget* m_target { nullptr }; 104 bool m_connected { false }; 105 106 #if PLATFORM(COCOA) 88 107 RetainPtr<NSString> m_connectionIdentifier; 89 108 RetainPtr<NSString> m_destination; 90 bool m_connected { false }; 109 #endif 91 110 }; 92 111 -
trunk/Source/JavaScriptCore/inspector/remote/RemoteControllableTarget.h
r212394 r212424 28 28 #if ENABLE(REMOTE_INSPECTOR) 29 29 30 #include <CoreFoundation/CFRunLoop.h>31 30 #include <wtf/TypeCasts.h> 32 31 #include <wtf/text/WTFString.h> 32 33 #if USE(CF) 34 #include <CoreFoundation/CFRunLoop.h> 35 #endif 33 36 34 37 namespace Inspector { … … 54 57 virtual void dispatchMessageFromRemote(const String& message) = 0; 55 58 59 #if USE(CF) 56 60 // The dispatch block will be scheduled on a global run loop if null is returned. 57 61 virtual CFRunLoopRef targetRunLoop() { return nullptr; } 62 #endif 58 63 private: 59 64 unsigned m_identifier {0}; -
trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectionTarget.h
r212394 r212424 42 42 void setRemoteDebuggingAllowed(bool); 43 43 44 #if USE(CF) 44 45 CFRunLoopRef targetRunLoop() override { return m_runLoop.get(); } 45 46 void setTargetRunLoop(CFRunLoopRef runLoop) { m_runLoop = runLoop; } 47 #endif 46 48 47 49 virtual String name() const { return String(); } // JavaScript and Web … … 60 62 private: 61 63 bool m_allowed {false}; 64 #if USE(CF) 62 65 RetainPtr<CFRunLoopRef> m_runLoop; 66 #endif 63 67 }; 64 68 -
trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h
r212394 r212424 28 28 #if ENABLE(REMOTE_INSPECTOR) 29 29 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> 35 37 36 38 OBJC_CLASS NSDictionary; 37 39 OBJC_CLASS NSString; 40 typedef RetainPtr<NSDictionary> TargetListing; 41 #endif 38 42 39 43 namespace Inspector { … … 45 49 class RemoteInspectorClient; 46 50 47 class JS_EXPORT_PRIVATE RemoteInspector final : public RemoteInspectorXPCConnection::Client { 51 class JS_EXPORT_PRIVATE RemoteInspector final 52 #if PLATFORM(COCOA) 53 : public RemoteInspectorXPCConnection::Client 54 #endif 55 { 48 56 public: 49 57 class Client { … … 81 89 void stop(); 82 90 91 #if PLATFORM(COCOA) 83 92 bool hasParentProcessInformation() const { return m_parentProcessIdentifier != 0; } 84 93 pid_t parentProcessIdentifier() const { return m_parentProcessIdentifier; } … … 86 95 void setParentProcessInformation(pid_t, RetainPtr<CFDataRef> auditData); 87 96 void setParentProcessInfomationIsDelayed(); 97 #endif 88 98 89 99 private: … … 95 105 void stopInternal(StopSource); 96 106 107 #if PLATFORM(COCOA) 97 108 void setupXPCConnectionIfNeeded(); 109 #endif 98 110 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 102 115 void pushListingsNow(); 103 116 void pushListingsSoon(); … … 111 124 void sendAutomaticInspectionCandidateMessage(); 112 125 126 #if PLATFORM(COCOA) 113 127 void xpcConnectionReceivedMessage(RemoteInspectorXPCConnection*, NSString *messageName, NSDictionary *userInfo) override; 114 128 void xpcConnectionFailed(RemoteInspectorXPCConnection*) override; … … 125 139 void receivedAutomaticInspectionRejectMessage(NSDictionary *userInfo); 126 140 void receivedAutomationSessionRequestMessage(NSDictionary *userInfo); 141 #endif 127 142 128 143 static bool startEnabled; … … 135 150 136 151 HashMap<unsigned, RemoteControllableTarget*> m_targetMap; 137 HashMap<unsigned, RetainPtr<NSDictionary>> m_targetListingMap;138 152 HashMap<unsigned, RefPtr<RemoteConnectionToTarget>> m_targetConnectionMap; 153 HashMap<unsigned, TargetListing> m_targetListingMap; 139 154 155 #if PLATFORM(COCOA) 140 156 RefPtr<RemoteInspectorXPCConnection> m_relayConnection; 157 #endif 141 158 142 159 RemoteInspector::Client* m_client { nullptr }; 143 160 std::optional<RemoteInspector::Client::Capabilities> m_clientCapabilities; 144 161 162 #if PLATFORM(COCOA) 145 163 dispatch_queue_t m_xpcQueue; 164 #endif 146 165 unsigned m_nextAvailableTargetIdentifier { 1 }; 147 166 int m_notifyToken { 0 }; … … 151 170 152 171 pid_t m_parentProcessIdentifier { 0 }; 172 #if PLATFORM(COCOA) 153 173 RetainPtr<CFDataRef> m_parentProcessAuditData; 174 #endif 154 175 bool m_shouldSendParentProcessInformation { false }; 155 176 bool m_automaticInspectionEnabled { false }; -
trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm
r212169 r212424 211 211 } 212 212 213 void RemoteConnectionToTarget::sendMessageToTarget( const String&message)213 void RemoteConnectionToTarget::sendMessageToTarget(NSString *message) 214 214 { 215 215 ref(); -
trunk/Source/WebKit2/ChangeLog
r212418 r212424 1 2017-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 1 13 2017-02-15 Eric Carlson <eric.carlson@apple.com> 2 14 -
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
r212394 r212424 371 371 #endif 372 372 373 #if ENABLE(REMOTE_INSPECTOR) 373 #if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA) 374 374 audit_token_t auditToken; 375 375 if (parentProcessConnection()->getAuditToken(auditToken)) {
Note: See TracChangeset
for help on using the changeset viewer.