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

Side by Side Diff: Source/bindings/core/v8/ScriptPreprocessor.cpp

Issue 376213002: DevTools: Make FrameConsole methods accept ConsoleMessage objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scriptFailedToParse
Patch Set: Created 6 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 21 matching lines...) Expand all
32 #include "bindings/core/v8/ScriptPreprocessor.h" 32 #include "bindings/core/v8/ScriptPreprocessor.h"
33 33
34 #include "bindings/core/v8/ScriptController.h" 34 #include "bindings/core/v8/ScriptController.h"
35 #include "bindings/core/v8/ScriptSourceCode.h" 35 #include "bindings/core/v8/ScriptSourceCode.h"
36 #include "bindings/core/v8/ScriptValue.h" 36 #include "bindings/core/v8/ScriptValue.h"
37 #include "bindings/core/v8/V8Binding.h" 37 #include "bindings/core/v8/V8Binding.h"
38 #include "bindings/core/v8/V8ScriptRunner.h" 38 #include "bindings/core/v8/V8ScriptRunner.h"
39 #include "core/frame/FrameConsole.h" 39 #include "core/frame/FrameConsole.h"
40 #include "core/frame/FrameHost.h" 40 #include "core/frame/FrameHost.h"
41 #include "core/frame/LocalFrame.h" 41 #include "core/frame/LocalFrame.h"
42 #include "core/inspector/ConsoleMessage.h"
42 #include "wtf/TemporaryChange.h" 43 #include "wtf/TemporaryChange.h"
43 44
44 namespace WebCore { 45 namespace WebCore {
45 46
46 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc eCode, LocalFrame* frame) 47 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc eCode, LocalFrame* frame)
47 : m_isPreprocessing(false) 48 : m_isPreprocessing(false)
48 { 49 {
49 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup); 50 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup);
50 m_scriptState = ScriptState::from(toV8Context(frame, *world)); 51 m_scriptState = ScriptState::from(toV8Context(frame, *world));
51 52
52 v8::HandleScope handleScope(m_scriptState->isolate()); 53 v8::HandleScope handleScope(m_scriptState->isolate());
53 ASSERT(frame); 54 ASSERT(frame);
54 v8::TryCatch tryCatch; 55 v8::TryCatch tryCatch;
55 tryCatch.SetVerbose(true); 56 tryCatch.SetVerbose(true);
56 Vector<ScriptSourceCode> sources; 57 Vector<ScriptSourceCode> sources;
57 sources.append(preprocessorSourceCode); 58 sources.append(preprocessorSourceCode);
58 Vector<v8::Local<v8::Value> > scriptResults; 59 Vector<v8::Local<v8::Value> > scriptResults;
59 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults); 60 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults);
60 61
61 if (scriptResults.size() != 1) { 62 if (scriptResults.size() != 1) {
62 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "ScriptP reprocessor internal error, one ScriptSourceCode must give exactly one result.") ; 63 frame->console().addMessage(ConsoleMessage::create(JSMessageSource, Erro rMessageLevel, "ScriptPreprocessor internal error, one ScriptSourceCode must giv e exactly one result."));
63 return; 64 return;
64 } 65 }
65 66
66 v8::Local<v8::Value> preprocessorFunction = scriptResults[0]; 67 v8::Local<v8::Value> preprocessorFunction = scriptResults[0];
67 if (preprocessorFunction.IsEmpty() || !preprocessorFunction->IsFunction()) { 68 if (preprocessorFunction.IsEmpty() || !preprocessorFunction->IsFunction()) {
68 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "The pre processor must compile to a function."); 69 frame->console().addMessage(ConsoleMessage::create(JSMessageSource, Erro rMessageLevel, "The preprocessor must compile to a function."));
69 return; 70 return;
70 } 71 }
71 m_preprocessorFunction.set(m_scriptState->isolate(), v8::Handle<v8::Function >::Cast(preprocessorFunction)); 72 m_preprocessorFunction.set(m_scriptState->isolate(), v8::Handle<v8::Function >::Cast(preprocessorFunction));
72 } 73 }
73 74
74 String ScriptPreprocessor::preprocessSourceCode(const String& sourceCode, const String& sourceName) 75 String ScriptPreprocessor::preprocessSourceCode(const String& sourceCode, const String& sourceName)
75 { 76 {
76 if (!isValid()) 77 if (!isValid())
77 return sourceCode; 78 return sourceCode;
78 79
(...skipping 26 matching lines...) Expand all
105 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true); 106 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true);
106 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate, m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT F_ARRAY_LENGTH(argv), argv); 107 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate, m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT F_ARRAY_LENGTH(argv), argv);
107 108
108 if (!resultValue.IsEmpty() && resultValue->IsString()) 109 if (!resultValue.IsEmpty() && resultValue->IsString())
109 return toCoreStringWithNullCheck(resultValue.As<v8::String>()); 110 return toCoreStringWithNullCheck(resultValue.As<v8::String>());
110 111
111 return sourceCode; 112 return sourceCode;
112 } 113 }
113 114
114 } // namespace WebCore 115 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698