Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1133)

Side by Side Diff: sky/engine/core/frame/FrameConsole.cpp

Issue 878673005: Get rid of Chrome, use Page. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sky/engine/core/frame/Frame.cpp ('k') | sky/engine/core/frame/FrameHost.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 12 matching lines...) Expand all
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "sky/engine/config.h" 29 #include "sky/engine/config.h"
30 #include "sky/engine/core/frame/FrameConsole.h" 30 #include "sky/engine/core/frame/FrameConsole.h"
31 31
32 #include "sky/engine/bindings/core/v8/ScriptCallStackFactory.h" 32 #include "sky/engine/bindings/core/v8/ScriptCallStackFactory.h"
33 #include "sky/engine/core/dom/Document.h"
33 #include "sky/engine/core/frame/FrameHost.h" 34 #include "sky/engine/core/frame/FrameHost.h"
34 #include "sky/engine/core/inspector/ConsoleAPITypes.h" 35 #include "sky/engine/core/inspector/ConsoleAPITypes.h"
35 #include "sky/engine/core/inspector/ConsoleMessage.h" 36 #include "sky/engine/core/inspector/ConsoleMessage.h"
36 #include "sky/engine/core/inspector/ConsoleMessageStorage.h" 37 #include "sky/engine/core/inspector/ConsoleMessageStorage.h"
37 #include "sky/engine/core/inspector/ScriptArguments.h" 38 #include "sky/engine/core/inspector/ScriptArguments.h"
38 #include "sky/engine/core/page/Chrome.h" 39 #include "sky/engine/core/inspector/ScriptCallStack.h"
39 #include "sky/engine/core/page/ChromeClient.h" 40 #include "sky/engine/core/page/ChromeClient.h"
40 #include "sky/engine/core/page/Page.h" 41 #include "sky/engine/core/page/Page.h"
41 #include "sky/engine/platform/network/ResourceResponse.h" 42 #include "sky/engine/platform/network/ResourceResponse.h"
42 #include "sky/engine/core/inspector/ScriptCallStack.h"
43 #include "sky/engine/wtf/text/StringBuilder.h" 43 #include "sky/engine/wtf/text/StringBuilder.h"
44 44
45 namespace blink { 45 namespace blink {
46 46
47 static const HashSet<int>& allClientReportingMessageTypes() 47 static const HashSet<int>& allClientReportingMessageTypes()
48 { 48 {
49 DEFINE_STATIC_LOCAL(HashSet<int>, types, ()); 49 DEFINE_STATIC_LOCAL(HashSet<int>, types, ());
50 if (types.isEmpty()) { 50 if (types.isEmpty()) {
51 types.add(LogMessageType); 51 types.add(LogMessageType);
52 types.add(DirMessageType); 52 types.add(DirMessageType);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 messageURL = consoleMessage->callStack()->at(0).sourceURL(); 91 messageURL = consoleMessage->callStack()->at(0).sourceURL();
92 } else { 92 } else {
93 lineNumber = consoleMessage->lineNumber(); 93 lineNumber = consoleMessage->lineNumber();
94 messageURL = consoleMessage->url(); 94 messageURL = consoleMessage->url();
95 } 95 }
96 96
97 messageStorage()->reportMessage(consoleMessage); 97 messageStorage()->reportMessage(consoleMessage);
98 98
99 RefPtr<ScriptCallStack> reportedCallStack = nullptr; 99 RefPtr<ScriptCallStack> reportedCallStack = nullptr;
100 if (consoleMessage->source() != ConsoleAPIMessageSource) { 100 if (consoleMessage->source() != ConsoleAPIMessageSource) {
101 if (consoleMessage->callStack() && m_frame.chromeClient().shouldReportDe tailedMessageForSource(messageURL)) 101 if (consoleMessage->callStack() && m_frame.page()->shouldReportDetailedM essageForSource(messageURL))
102 reportedCallStack = consoleMessage->callStack(); 102 reportedCallStack = consoleMessage->callStack();
103 } else { 103 } else {
104 if (!m_frame.host() || (consoleMessage->scriptArguments() && consoleMess age->scriptArguments()->argumentCount() == 0)) 104 if (!m_frame.host() || (consoleMessage->scriptArguments() && consoleMess age->scriptArguments()->argumentCount() == 0))
105 return; 105 return;
106 106
107 if (!allClientReportingMessageTypes().contains(consoleMessage->type())) 107 if (!allClientReportingMessageTypes().contains(consoleMessage->type()))
108 return; 108 return;
109 109
110 if (m_frame.chromeClient().shouldReportDetailedMessageForSource(messageU RL)) 110 if (m_frame.page()->shouldReportDetailedMessageForSource(messageURL))
111 reportedCallStack = createScriptCallStack(ScriptCallStack::maxCallSt ackSizeToCapture); 111 reportedCallStack = createScriptCallStack(ScriptCallStack::maxCallSt ackSizeToCapture);
112 } 112 }
113 113
114 String stackTrace; 114 String stackTrace;
115 if (reportedCallStack) 115 if (reportedCallStack)
116 stackTrace = FrameConsole::formatStackTraceString(consoleMessage->messag e(), reportedCallStack); 116 stackTrace = FrameConsole::formatStackTraceString(consoleMessage->messag e(), reportedCallStack);
117 m_frame.chromeClient().addMessageToConsole(&m_frame, consoleMessage->source( ), consoleMessage->level(), consoleMessage->message(), lineNumber, messageURL, s tackTrace); 117 m_frame.page()->addMessageToConsole(&m_frame, consoleMessage->source(), cons oleMessage->level(), consoleMessage->message(), lineNumber, messageURL, stackTra ce);
118 } 118 }
119 119
120 void FrameConsole::reportResourceResponseReceived(Document* document, unsigned l ong requestIdentifier, const ResourceResponse& response) 120 void FrameConsole::reportResourceResponseReceived(Document* document, unsigned l ong requestIdentifier, const ResourceResponse& response)
121 { 121 {
122 if (!document) 122 if (!document)
123 return; 123 return;
124 if (response.httpStatusCode() < 400) 124 if (response.httpStatusCode() < 400)
125 return; 125 return;
126 String message = "Failed to load resource: the server responded with a statu s of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusT ext() + ')'; 126 String message = "Failed to load resource: the server responded with a statu s of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusT ext() + ')';
127 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(NetworkMessag eSource, ErrorMessageLevel, message, response.url().string()); 127 RefPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(NetworkMessag eSource, ErrorMessageLevel, message, response.url().string());
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 m_consoleMessageStorage = ConsoleMessageStorage::createForFrame(&m_frame ); 164 m_consoleMessageStorage = ConsoleMessageStorage::createForFrame(&m_frame );
165 return m_consoleMessageStorage.get(); 165 return m_consoleMessageStorage.get();
166 } 166 }
167 167
168 void FrameConsole::clearMessages() 168 void FrameConsole::clearMessages()
169 { 169 {
170 messageStorage()->clear(); 170 messageStorage()->clear();
171 } 171 }
172 172
173 } // namespace blink 173 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/frame/Frame.cpp ('k') | sky/engine/core/frame/FrameHost.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698