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

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

Issue 682883003: Move the v8::Isolate* parameter to the first parameter of various binding methods in third_party/We… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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 | « Source/bindings/core/v8/ScriptController.cpp ('k') | Source/bindings/core/v8/V8ScriptRunner.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) 2010-2011 Google Inc. All rights reserved. 2 * Copyright (c) 2010-2011 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 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 ScopedPersistent<v8::Script>* scriptHandle = m_compiledScripts.get(scriptId) ; 690 ScopedPersistent<v8::Script>* scriptHandle = m_compiledScripts.get(scriptId) ;
691 v8::Local<v8::Script> script = scriptHandle->newLocal(m_isolate); 691 v8::Local<v8::Script> script = scriptHandle->newLocal(m_isolate);
692 m_compiledScripts.remove(scriptId); 692 m_compiledScripts.remove(scriptId);
693 if (script.IsEmpty()) 693 if (script.IsEmpty())
694 return; 694 return;
695 695
696 if (!scriptState->contextIsValid()) 696 if (!scriptState->contextIsValid())
697 return; 697 return;
698 ScriptState::Scope scope(scriptState); 698 ScriptState::Scope scope(scriptState);
699 v8::TryCatch tryCatch; 699 v8::TryCatch tryCatch;
700 v8::Local<v8::Value> value = V8ScriptRunner::runCompiledScript(script, scrip tState->executionContext(), m_isolate); 700 v8::Local<v8::Value> value = V8ScriptRunner::runCompiledScript(m_isolate, sc ript, scriptState->executionContext());
701 *wasThrown = false; 701 *wasThrown = false;
702 if (tryCatch.HasCaught()) { 702 if (tryCatch.HasCaught()) {
703 *wasThrown = true; 703 *wasThrown = true;
704 *result = ScriptValue(scriptState, tryCatch.Exception()); 704 *result = ScriptValue(scriptState, tryCatch.Exception());
705 v8::Local<v8::Message> message = tryCatch.Message(); 705 v8::Local<v8::Message> message = tryCatch.Message();
706 if (!message.IsEmpty()) { 706 if (!message.IsEmpty()) {
707 *exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message ->Get()); 707 *exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message ->Get());
708 *lineNumber = message->GetLineNumber(); 708 *lineNumber = message->GetLineNumber();
709 *columnNumber = message->GetStartColumn(); 709 *columnNumber = message->GetStartColumn();
710 *stackTrace = createScriptCallStack(message->GetStackTrace(), messag e->GetStackTrace()->GetFrameCount(), m_isolate); 710 *stackTrace = createScriptCallStack(message->GetStackTrace(), messag e->GetStackTrace()->GetFrameCount(), m_isolate);
711 } 711 }
712 } else { 712 } else {
713 *result = ScriptValue(scriptState, value); 713 *result = ScriptValue(scriptState, value);
714 } 714 }
715 } 715 }
716 716
717 PassOwnPtr<ScriptSourceCode> ScriptDebugServer::preprocess(LocalFrame*, const Sc riptSourceCode&) 717 PassOwnPtr<ScriptSourceCode> ScriptDebugServer::preprocess(LocalFrame*, const Sc riptSourceCode&)
718 { 718 {
719 return PassOwnPtr<ScriptSourceCode>(); 719 return PassOwnPtr<ScriptSourceCode>();
720 } 720 }
721 721
722 String ScriptDebugServer::preprocessEventListener(LocalFrame*, const String& sou rce, const String& url, const String& functionName) 722 String ScriptDebugServer::preprocessEventListener(LocalFrame*, const String& sou rce, const String& url, const String& functionName)
723 { 723 {
724 return source; 724 return source;
725 } 725 }
726 726
727 } // namespace blink 727 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/ScriptController.cpp ('k') | Source/bindings/core/v8/V8ScriptRunner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698