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

Unified Diff: Source/core/inspector/InjectedScriptCanvasModule.cpp

Issue 293963003: Remove ScriptObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InjectedScriptCanvasModule.h ('k') | Source/core/inspector/InjectedScriptManager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InjectedScriptCanvasModule.cpp
diff --git a/Source/core/inspector/InjectedScriptCanvasModule.cpp b/Source/core/inspector/InjectedScriptCanvasModule.cpp
index a844a10091d7855c2ae97f6f03be35e7e10dea0b..97130c403867ba4c62853210b03f0986a4dcce63 100644
--- a/Source/core/inspector/InjectedScriptCanvasModule.cpp
+++ b/Source/core/inspector/InjectedScriptCanvasModule.cpp
@@ -33,7 +33,7 @@
#include "InjectedScriptCanvasModuleSource.h"
#include "bindings/v8/ScriptFunctionCall.h"
-#include "bindings/v8/ScriptObject.h"
+#include "bindings/v8/ScriptValue.h"
using WebCore::TypeBuilder::Array;
using WebCore::TypeBuilder::Canvas::ResourceId;
@@ -61,17 +61,17 @@ String InjectedScriptCanvasModule::source() const
return String(reinterpret_cast<const char*>(InjectedScriptCanvasModuleSource_js), sizeof(InjectedScriptCanvasModuleSource_js));
}
-ScriptObject InjectedScriptCanvasModule::wrapCanvas2DContext(const ScriptObject& context)
+ScriptValue InjectedScriptCanvasModule::wrapCanvas2DContext(const ScriptValue& context)
{
return callWrapContextFunction("wrapCanvas2DContext", context);
}
-ScriptObject InjectedScriptCanvasModule::wrapWebGLContext(const ScriptObject& glContext)
+ScriptValue InjectedScriptCanvasModule::wrapWebGLContext(const ScriptValue& glContext)
{
return callWrapContextFunction("wrapWebGLContext", glContext);
}
-ScriptObject InjectedScriptCanvasModule::callWrapContextFunction(const String& functionName, const ScriptObject& context)
+ScriptValue InjectedScriptCanvasModule::callWrapContextFunction(const String& functionName, const ScriptValue& context)
{
ScriptFunctionCall function(injectedScriptObject(), functionName);
function.appendArgument(context);
@@ -79,9 +79,9 @@ ScriptObject InjectedScriptCanvasModule::callWrapContextFunction(const String& f
ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
if (hadException || resultValue.isEmpty() || !resultValue.isObject()) {
ASSERT_NOT_REACHED();
- return ScriptObject();
+ return ScriptValue();
}
- return ScriptObject(context.scriptState(), resultValue);
+ return resultValue;
}
void InjectedScriptCanvasModule::markFrameEnd()
« no previous file with comments | « Source/core/inspector/InjectedScriptCanvasModule.h ('k') | Source/core/inspector/InjectedScriptManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698