Changeset 223836 in webkit
- Timestamp:
- Oct 23, 2017 9:44:58 AM (6 years ago)
- Location:
- trunk/Source
- Files:
-
- 2 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r223834 r223836 1 2017-10-23 Matt Lewis <jlewis3@apple.com> 2 3 Unreviewed, rolling out r223820. 4 5 This caused a build break on Windows. 6 7 Reverted changeset: 8 9 "Web Inspector: Remove unused Console.setMonitoringXHREnabled" 10 https://bugs.webkit.org/show_bug.cgi?id=178617 11 https://trac.webkit.org/changeset/223820 12 1 13 2017-10-23 Yusuke Suzuki <utatane.tea@gmail.com> 2 14 -
trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r223820 r223836 1336 1336 A5FD007E189B0B4C00633231 /* ScriptCallStackFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD007C189B0B4C00633231 /* ScriptCallStackFactory.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1337 1337 A5FD0082189B191A00633231 /* InspectorConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD0080189B191A00633231 /* InspectorConsoleAgent.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1338 A5FD0086189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5FD0084189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h */; }; 1338 1339 A700873A17CBE85300C3E643 /* MapConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = A700873817CBE85300C3E643 /* MapConstructor.h */; }; 1339 1340 A700873E17CBE8D300C3E643 /* MapPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = A700873C17CBE8D300C3E643 /* MapPrototype.h */; }; … … 3957 3958 A5FD007F189B191A00633231 /* InspectorConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorConsoleAgent.cpp; sourceTree = "<group>"; }; 3958 3959 A5FD0080189B191A00633231 /* InspectorConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorConsoleAgent.h; sourceTree = "<group>"; }; 3960 A5FD0083189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectConsoleAgent.cpp; sourceTree = "<group>"; }; 3961 A5FD0084189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGlobalObjectConsoleAgent.h; sourceTree = "<group>"; }; 3959 3962 A700873717CBE85300C3E643 /* MapConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MapConstructor.cpp; sourceTree = "<group>"; }; 3960 3963 A700873817CBE85300C3E643 /* MapConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapConstructor.h; sourceTree = "<group>"; }; … … 7558 7561 A55165D01BDEFDBD003B75C1 /* InspectorScriptProfilerAgent.cpp */, 7559 7562 A55165D11BDEFDBD003B75C1 /* InspectorScriptProfilerAgent.h */, 7563 A5FD0083189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp */, 7564 A5FD0084189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h */, 7560 7565 A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */, 7561 7566 A57D23E81891B0770031C7FA /* JSGlobalObjectDebuggerAgent.h */, … … 8760 8765 BC18C4210E16F5CD00B34460 /* JSGlobalObject.h in Headers */, 8761 8766 996B731D1BDA08EF00331B84 /* JSGlobalObject.lut.h in Headers */, 8767 A5FD0086189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h in Headers */, 8762 8768 A5C3A1A618C0490200C9593A /* JSGlobalObjectConsoleClient.h in Headers */, 8763 8769 A59455931824744700CC3843 /* JSGlobalObjectDebuggable.h in Headers */, -
trunk/Source/JavaScriptCore/Sources.txt
r223820 r223836 558 558 inspector/agents/InspectorRuntimeAgent.cpp 559 559 inspector/agents/InspectorScriptProfilerAgent.cpp 560 inspector/agents/JSGlobalObjectConsoleAgent.cpp 560 561 inspector/agents/JSGlobalObjectDebuggerAgent.cpp 561 562 inspector/agents/JSGlobalObjectRuntimeAgent.cpp -
trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
r223820 r223836 36 36 #include "InspectorAgent.h" 37 37 #include "InspectorBackendDispatcher.h" 38 #include "InspectorConsoleAgent.h"39 38 #include "InspectorFrontendChannel.h" 40 39 #include "InspectorFrontendRouter.h" … … 43 42 #include "JSCInlines.h" 44 43 #include "JSGlobalObject.h" 44 #include "JSGlobalObjectConsoleAgent.h" 45 45 #include "JSGlobalObjectConsoleClient.h" 46 46 #include "JSGlobalObjectDebuggerAgent.h" … … 84 84 auto runtimeAgent = std::make_unique<JSGlobalObjectRuntimeAgent>(context); 85 85 auto heapAgent = std::make_unique<InspectorHeapAgent>(context); 86 auto consoleAgent = std::make_unique< InspectorConsoleAgent>(context, heapAgent.get());86 auto consoleAgent = std::make_unique<JSGlobalObjectConsoleAgent>(context, heapAgent.get()); 87 87 auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(context, consoleAgent.get()); 88 88 auto scriptProfilerAgent = std::make_unique<InspectorScriptProfilerAgent>(context); -
trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
r223820 r223836 62 62 void disable(ErrorString&) override; 63 63 void clearMessages(ErrorString&) override; 64 void setMonitoringXHREnabled(ErrorString&, bool enabled) override = 0; 64 65 65 66 bool enabled() const { return m_enabled; } -
trunk/Source/JavaScriptCore/inspector/protocol/Console.json
r223820 r223836 58 58 "name": "clearMessages", 59 59 "description": "Clears console messages collected in the browser." 60 }, 61 { 62 "name": "setMonitoringXHREnabled", 63 "description": "Toggles monitoring of XMLHttpRequest. If <code>true</code>, console will receive messages upon each XHR issued.", 64 "parameters": [ 65 { "name": "enabled", "type": "boolean", "description": "Monitoring enabled state." } 66 ] 60 67 } 61 68 ], -
trunk/Source/WebCore/ChangeLog
r223835 r223836 1 2017-10-23 Matt Lewis <jlewis3@apple.com> 2 3 Unreviewed, rolling out r223820. 4 5 This caused a build break on Windows. 6 7 Reverted changeset: 8 9 "Web Inspector: Remove unused Console.setMonitoringXHREnabled" 10 https://bugs.webkit.org/show_bug.cgi?id=178617 11 https://trac.webkit.org/changeset/223820 12 1 13 2017-10-23 Zalan Bujtas <zalan@apple.com> 2 14 -
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
r223820 r223836 626 626 } 627 627 628 void InspectorInstrumentation::didFinishXHRLoadingImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, std::optional<String> decodedText) 629 { 628 void InspectorInstrumentation::didFinishXHRLoadingImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber) 629 { 630 if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent()) 631 consoleAgent->didFinishXHRLoading(identifier, url, sendURL, sendLineNumber, sendColumnNumber); 630 632 if (InspectorNetworkAgent* networkAgent = instrumentingAgents.inspectorNetworkAgent()) { 631 633 if (decodedText) -
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
r223820 r223836 187 187 static void willSendRequestOfType(Frame*, unsigned long identifier, DocumentLoader*, ResourceRequest&, LoadType); 188 188 189 static void didFinishXHRLoading(ScriptExecutionContext*, unsigned long identifier, std::optional<String> decodedText );189 static void didFinishXHRLoading(ScriptExecutionContext*, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber); 190 190 static void willLoadXHRSynchronously(ScriptExecutionContext*); 191 191 static void didLoadXHRSynchronously(ScriptExecutionContext*); … … 356 356 static void didFinishLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const NetworkLoadMetrics&, ResourceLoader*); 357 357 static void didFailLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const ResourceError&); 358 static void didFinishXHRLoadingImpl(InstrumentingAgents&, unsigned long identifier, std::optional<String> decodedText );358 static void didFinishXHRLoadingImpl(InstrumentingAgents&, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber); 359 359 static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&); 360 360 static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&); … … 958 958 } 959 959 960 inline void InspectorInstrumentation::didFinishXHRLoading(ScriptExecutionContext* context, unsigned long identifier, std::optional<String> decodedText )961 { 962 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context)) 963 didFinishXHRLoadingImpl(*instrumentingAgents, identifier, decodedText );960 inline void InspectorInstrumentation::didFinishXHRLoading(ScriptExecutionContext* context, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber) 961 { 962 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context)) 963 didFinishXHRLoadingImpl(*instrumentingAgents, identifier, decodedText, url, sendURL, sendLineNumber, sendColumnNumber); 964 964 } 965 965 -
trunk/Source/WebCore/inspector/WebConsoleAgent.cpp
r223820 r223836 47 47 } 48 48 49 void WebConsoleAgent::setMonitoringXHREnabled(ErrorString&, bool enabled) 50 { 51 m_monitoringXHREnabled = enabled; 52 } 53 49 54 void WebConsoleAgent::frameWindowDiscarded(DOMWindow* window) 50 55 { … … 59 64 60 65 static_cast<WebInjectedScriptManager&>(m_injectedScriptManager).discardInjectedScriptsFor(window); 66 } 67 68 void WebConsoleAgent::didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber) 69 { 70 if (!m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled()) 71 return; 72 73 if (m_monitoringXHREnabled) { 74 String message = "XHR finished loading: \"" + url + "\"."; 75 addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::Network, MessageType::Log, MessageLevel::Debug, message, sendURL, sendLineNumber, sendColumnNumber, nullptr, requestIdentifier)); 76 } 61 77 } 62 78 -
trunk/Source/WebCore/inspector/WebConsoleAgent.h
r223820 r223836 42 42 virtual ~WebConsoleAgent() = default; 43 43 44 void setMonitoringXHREnabled(ErrorString&, bool enabled) final; 45 44 46 void frameWindowDiscarded(DOMWindow*); 45 47 48 void didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber); 46 49 void didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse&); 47 50 void didFailLoading(unsigned long requestIdentifier, const ResourceError&); 51 52 protected: 53 bool m_monitoringXHREnabled { false }; 48 54 }; 49 55 -
trunk/Source/WebCore/xml/XMLHttpRequest.cpp
r223820 r223836 44 44 #include "ResourceError.h" 45 45 #include "ResourceRequest.h" 46 #include "ScriptController.h" 46 47 #include "SecurityOriginPolicy.h" 47 48 #include "Settings.h" … … 54 55 #include "XMLHttpRequestUpload.h" 55 56 #include "markup.h" 57 #include <interpreter/StackVisitor.h> 56 58 #include <mutex> 57 59 #include <runtime/ArrayBuffer.h> … … 279 281 } 280 282 283 void XMLHttpRequest::setLastSendLineAndColumnNumber(unsigned lineNumber, unsigned columnNumber) 284 { 285 m_lastSendLineNumber = lineNumber; 286 m_lastSendColumnNumber = columnNumber; 287 } 288 281 289 XMLHttpRequestUpload* XMLHttpRequest::upload() 282 290 { … … 426 434 } 427 435 428 ExceptionOr<void> XMLHttpRequest::send(std::optional<SendTypes>&& sendType) 436 namespace { 437 438 // FIXME: This should be abstracted out, so that any IDL function can be passed the line/column/url tuple. 439 440 // FIXME: This should probably use ShadowChicken so that we get the right frame even when it did a tail call. 441 // https://bugs.webkit.org/show_bug.cgi?id=155688 442 443 class SendFunctor { 444 public: 445 SendFunctor() = default; 446 447 unsigned line() const { return m_line; } 448 unsigned column() const { return m_column; } 449 String url() const { return m_url; } 450 451 JSC::StackVisitor::Status operator()(JSC::StackVisitor& visitor) const 452 { 453 if (!m_hasSkippedFirstFrame) { 454 m_hasSkippedFirstFrame = true; 455 return JSC::StackVisitor::Continue; 456 } 457 458 unsigned line = 0; 459 unsigned column = 0; 460 visitor->computeLineAndColumn(line, column); 461 m_line = line; 462 m_column = column; 463 m_url = visitor->sourceURL(); 464 return JSC::StackVisitor::Done; 465 } 466 467 private: 468 mutable bool m_hasSkippedFirstFrame { false }; 469 mutable unsigned m_line { 0 }; 470 mutable unsigned m_column { 0 }; 471 mutable String m_url; 472 }; 473 474 } 475 476 ExceptionOr<void> XMLHttpRequest::send(JSC::ExecState& state, std::optional<SendTypes>&& sendType) 429 477 { 430 478 InspectorInstrumentation::willSendXMLHttpRequest(scriptExecutionContext(), url()); … … 444 492 } 445 493 494 SendFunctor functor; 495 state.iterate(functor); 496 setLastSendLineAndColumnNumber(functor.line(), functor.column()); 497 setLastSendURL(functor.url()); 498 446 499 return result; 447 500 } … … 940 993 if (!m_binaryResponseBuilder) 941 994 decodedText = m_responseBuilder.toStringPreserveCapacity(); 942 InspectorInstrumentation::didFinishXHRLoading(scriptExecutionContext(), identifier, decodedText );995 InspectorInstrumentation::didFinishXHRLoading(scriptExecutionContext(), identifier, decodedText, m_url, m_lastSendURL, m_lastSendLineNumber, m_lastSendColumnNumber); 943 996 944 997 bool hadLoader = m_loader; -
trunk/Source/WebCore/xml/XMLHttpRequest.h
r223820 r223836 36 36 class ArrayBuffer; 37 37 class ArrayBufferView; 38 class ExecState; 38 39 } 39 40 … … 80 81 ExceptionOr<void> open(const String& method, const URL&, bool async); 81 82 ExceptionOr<void> open(const String& method, const String&, bool async, const String& user, const String& password); 82 ExceptionOr<void> send( std::optional<SendTypes>&&);83 ExceptionOr<void> send(JSC::ExecState&, std::optional<SendTypes>&&); 83 84 void abort(); 84 85 ExceptionOr<void> setRequestHeader(const String& name, const String& value); … … 109 110 String responseURL() const; 110 111 112 void setLastSendLineAndColumnNumber(unsigned lineNumber, unsigned columnNumber); 113 void setLastSendURL(const String& url) { m_lastSendURL = url; } 114 111 115 XMLHttpRequestUpload* upload(); 112 116 XMLHttpRequestUpload* optionalUpload() const { return m_upload.get(); } … … 215 219 long long m_receivedLength { 0 }; 216 220 221 unsigned m_lastSendLineNumber { 0 }; 222 unsigned m_lastSendColumnNumber { 0 }; 223 String m_lastSendURL; 217 224 std::optional<ExceptionCode> m_exceptionCode; 218 225 -
trunk/Source/WebCore/xml/XMLHttpRequest.idl
r223820 r223836 67 67 attribute boolean withCredentials; 68 68 readonly attribute XMLHttpRequestUpload upload; 69 [ MayThrowException] void send(optional (Document or BodyInit)? body = null);69 [CallWith=ScriptState, MayThrowException] void send(optional (Document or BodyInit)? body = null); 70 70 void abort(); 71 71
Note: See TracChangeset
for help on using the changeset viewer.