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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (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.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
index b5f258f922ce0c66d533d9576a35413e7c98f7a7..64372de4dc592b51a93e0fbb586763b1f68bc0e4 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
@@ -66,18 +66,17 @@ enum ReasonForCallingCanExecuteScripts {
NotAboutToExecuteScript
};
-class CORE_EXPORT ScriptController final : public NoBaseWillBeGarbageCollectedFinalized<ScriptController> {
+class CORE_EXPORT ScriptController final : public GarbageCollectedFinalized<ScriptController> {
WTF_MAKE_NONCOPYABLE(ScriptController);
- USING_FAST_MALLOC_WILL_BE_REMOVED(ScriptController);
public:
enum ExecuteScriptPolicy {
ExecuteScriptWhenScriptsDisabled,
DoNotExecuteScriptWhenScriptsDisabled
};
- static PassOwnPtrWillBeRawPtr<ScriptController> create(LocalFrame* frame)
+ static RawPtr<ScriptController> create(LocalFrame* frame)
{
- return adoptPtrWillBeNoop(new ScriptController(frame));
+ return new ScriptController(frame);
}
~ScriptController();
@@ -102,7 +101,7 @@ public:
//
// FIXME: Get rid of extensionGroup here.
// FIXME: We don't want to support multiple scripts.
- void executeScriptInIsolatedWorld(int worldID, const WillBeHeapVector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value>>* results);
+ void executeScriptInIsolatedWorld(int worldID, const HeapVector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value>>* results);
// Returns true if argument is a JavaScript URL.
bool executeScriptIfJavaScriptURL(const KURL&);
@@ -162,11 +161,11 @@ private:
LocalFrame* frame() const { return toLocalFrame(m_windowProxyManager->frame()); }
- typedef WillBeHeapHashMap<RawPtrWillBeMember<Widget>, NPObject*> PluginObjectMap;
+ typedef HeapHashMap<Member<Widget>, NPObject*> PluginObjectMap;
v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus, ExecuteScriptPolicy, double* compilationFinishTime = 0);
- OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager;
+ Member<WindowProxyManager> m_windowProxyManager;
const String* m_sourceURL;
// A mapping between Widgets and their corresponding script object.

Powered by Google App Engine
This is Rietveld 408576698