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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

Issue 1853743005: Oilpan: Remove WillBe types (part 13) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
index c88c738763d0ec4d0b22652449e35c5d085017de..b4de42a84a22021a3f63877592d75d7823f38ff2 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
@@ -124,7 +124,7 @@ void ScriptController::updateSecurityOrigin(SecurityOrigin* origin)
v8::MaybeLocal<v8::Value> ScriptController::callFunction(v8::Local<v8::Function> function, v8::Local<v8::Value> receiver, int argc, v8::Local<v8::Value> info[])
{
// Keep LocalFrame (and therefore ScriptController) alive.
- RefPtrWillBeRawPtr<LocalFrame> protect(frame());
+ RawPtr<LocalFrame> protect(frame());
return ScriptController::callFunction(frame()->document(), function, receiver, argc, info, isolate());
}
@@ -160,7 +160,7 @@ v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(v8::Local<v8:
*compilationFinishTime = WTF::monotonicallyIncreasingTime();
}
// Keep LocalFrame (and therefore ScriptController) alive.
- RefPtrWillBeRawPtr<LocalFrame> protect(frame());
+ RawPtr<LocalFrame> protect(frame());
if (!v8Call(V8ScriptRunner::runCompiledScript(isolate(), script, frame()->document()), result, tryCatch))
return result;
}
@@ -357,8 +357,8 @@ bool ScriptController::executeScriptIfJavaScriptURL(const KURL& url)
// We need to hold onto the LocalFrame here because executing script can
// destroy the frame.
- RefPtrWillBeRawPtr<LocalFrame> protect(frame());
- RefPtrWillBeRawPtr<Document> ownerDocument(frame()->document());
+ RawPtr<LocalFrame> protect(frame());
+ RawPtr<Document> ownerDocument(frame()->document());
const int javascriptSchemeLength = sizeof("javascript:") - 1;
@@ -421,7 +421,7 @@ v8::Local<v8::Value> ScriptController::evaluateScriptInMainWorld(const ScriptSou
v8::EscapableHandleScope handleScope(isolate());
ScriptState::Scope scope(scriptState);
- RefPtrWillBeRawPtr<LocalFrame> protect(frame());
+ RawPtr<LocalFrame> protect(frame());
if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument())
frame()->loader().didAccessInitialDocument();
@@ -434,7 +434,7 @@ v8::Local<v8::Value> ScriptController::evaluateScriptInMainWorld(const ScriptSou
return handleScope.Escape(object);
}
-void ScriptController::executeScriptInIsolatedWorld(int worldID, const WillBeHeapVector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value>>* results)
+void ScriptController::executeScriptInIsolatedWorld(int worldID, const HeapVector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value>>* results)
{
ASSERT(worldID > 0);

Powered by Google App Engine
This is Rietveld 408576698