Changeset 125995 in webkit

Timestamp:

Aug 19, 2012 9:39:48 PM (12 years ago)

Author:

haraken@chromium.org

Message:

[V8] Rename SafeAllocation to V8ObjectConstructor
​https://bugs.webkit.org/show_bug.cgi?id=94436

Reviewed by Adam Barth.

For clarification.

No tests. No change in behavior.

• UseV8.cmake:
• WebCore.gypi:
• bindings/v8/ScriptFunctionCall.cpp:

(WebCore::ScriptFunctionCall::construct):

• bindings/v8/V8Binding.cpp:

(WebCore::createRawTemplate):

• bindings/v8/V8Binding.h:
• bindings/v8/V8DOMWindowShell.cpp:

(WebCore::V8DOMWindowShell::installDOMWindow):

• bindings/v8/V8DOMWrapper.cpp:

(WebCore::V8DOMWrapper::instantiateV8Object):

• bindings/v8/V8NPObject.cpp:

(WebCore::createV8ObjectForNPObject):

• bindings/v8/V8ObjectConstructor.cpp: Renamed from Source/WebCore/bindings/v8/SafeAllocation.cpp.

(WebCore):
(WebCore::V8ObjectConstructor::isValidConstructorMode):

• bindings/v8/V8ObjectConstructor.h: Renamed from Source/WebCore/bindings/v8/SafeAllocation.h.

(WebCore):
(ConstructorMode):
(WebCore::ConstructorMode::ConstructorMode):
(WebCore::ConstructorMode::~ConstructorMode):
(WebCore::ConstructorMode::current):
(V8ObjectConstructor):
(WebCore::V8ObjectConstructor::newInstance):

• bindings/v8/V8PerContextData.cpp:

(WebCore::V8PerContextData::createWrapperFromCacheSlowCase):

• bindings/v8/WorkerContextExecutionProxy.cpp:

(WebCore::WorkerContextExecutionProxy::initContextIfNeeded):

• bindings/v8/custom/V8InjectedScriptManager.cpp:

(WebCore::createInjectedScriptHostV8Wrapper):

• bindings/v8/custom/V8ScriptProfileCustom.cpp:

(WebCore::toV8):

• bindings/v8/custom/V8ScriptProfileNodeCustom.cpp:

(WebCore::toV8):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• UseV8.cmake (modified) (2 diffs)
• WebCore.gypi (modified) (2 diffs)
• bindings/v8/ScriptFunctionCall.cpp (modified) (2 diffs)
• bindings/v8/V8Binding.cpp (modified) (2 diffs)
• bindings/v8/V8Binding.h (modified) (2 diffs)
• bindings/v8/V8DOMWindowShell.cpp (modified) (3 diffs)
• bindings/v8/V8DOMWrapper.cpp (modified) (3 diffs)
• bindings/v8/V8NPObject.cpp (modified) (3 diffs)
• bindings/v8/V8ObjectConstructor.cpp (moved) (moved from trunk/Source/WebCore/bindings/v8/SafeAllocation.cpp) (2 diffs)
• bindings/v8/V8ObjectConstructor.h (moved) (moved from trunk/Source/WebCore/bindings/v8/SafeAllocation.h) (6 diffs)
• bindings/v8/V8PerContextData.cpp (modified) (2 diffs)
• bindings/v8/WorkerContextExecutionProxy.cpp (modified) (3 diffs)
• bindings/v8/custom/V8InjectedScriptManager.cpp (modified) (2 diffs)
• bindings/v8/custom/V8ScriptProfileCustom.cpp (modified) (2 diffs)
• bindings/v8/custom/V8ScriptProfileNodeCustom.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-19  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Rename SafeAllocation to V8ObjectConstructor
+        https://bugs.webkit.org/show_bug.cgi?id=94436
+
+        Reviewed by Adam Barth.
+
+        For clarification.
+
+        No tests. No change in behavior.
+
+        * UseV8.cmake:
+        * WebCore.gypi:
+        * bindings/v8/ScriptFunctionCall.cpp:
+        (WebCore::ScriptFunctionCall::construct):
+        * bindings/v8/V8Binding.cpp:
+        (WebCore::createRawTemplate):
+        * bindings/v8/V8Binding.h:
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::installDOMWindow):
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::instantiateV8Object):
+        * bindings/v8/V8NPObject.cpp:
+        (WebCore::createV8ObjectForNPObject):
+        * bindings/v8/V8ObjectConstructor.cpp: Renamed from Source/WebCore/bindings/v8/SafeAllocation.cpp.
+        (WebCore):
+        (WebCore::V8ObjectConstructor::isValidConstructorMode):
+        * bindings/v8/V8ObjectConstructor.h: Renamed from Source/WebCore/bindings/v8/SafeAllocation.h.
+        (WebCore):
+        (ConstructorMode):
+        (WebCore::ConstructorMode::ConstructorMode):
+        (WebCore::ConstructorMode::~ConstructorMode):
+        (WebCore::ConstructorMode::current):
+        (V8ObjectConstructor):
+        (WebCore::V8ObjectConstructor::newInstance):
+        * bindings/v8/V8PerContextData.cpp:
+        (WebCore::V8PerContextData::createWrapperFromCacheSlowCase):
+        * bindings/v8/WorkerContextExecutionProxy.cpp:
+        (WebCore::WorkerContextExecutionProxy::initContextIfNeeded):
+        * bindings/v8/custom/V8InjectedScriptManager.cpp:
+        (WebCore::createInjectedScriptHostV8Wrapper):
+        * bindings/v8/custom/V8ScriptProfileCustom.cpp:
+        (WebCore::toV8):
+        * bindings/v8/custom/V8ScriptProfileNodeCustom.cpp:
+        (WebCore::toV8):
+
 2012-08-19  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/UseV8.cmake

@@ -29 +29 @@
     bindings/v8/PageScriptDebugServer.cpp
     bindings/v8/RetainedDOMInfo.cpp
-    bindings/v8/SafeAllocation.cpp
     bindings/v8/ScheduledAction.cpp
     bindings/v8/ScopedDOMDataStore.cpp
@@ -60 +59 @@
     bindings/v8/V8LazyEventListener.cpp
     bindings/v8/V8NodeFilterCondition.cpp
+    bindings/v8/V8ObjectConstructor.cpp
     bindings/v8/V8PerContextData.cpp
     bindings/v8/V8PerIsolateData.cpp

trunk/Source/WebCore/WebCore.gypi

@@ -2197 +2197 @@
             'bindings/v8/RetainedDOMInfo.h',
             'bindings/v8/RetainedObjectInfo.h',
-            'bindings/v8/SafeAllocation.cpp',
-            'bindings/v8/SafeAllocation.h',
             'bindings/v8/ScheduledAction.cpp',
             'bindings/v8/ScheduledAction.h',
@@ -2279 +2277 @@
             'bindings/v8/V8NodeFilterCondition.cpp',
             'bindings/v8/V8NodeFilterCondition.h',
+            'bindings/v8/V8ObjectConstructor.cpp',
+            'bindings/v8/V8ObjectConstructor.h',
             'bindings/v8/V8PerContextData.cpp',
             'bindings/v8/V8PerContextData.h',

trunk/Source/WebCore/bindings/v8/ScriptFunctionCall.cpp

@@ -32 +32 @@
 #include "ScriptFunctionCall.h"
 
-#include "SafeAllocation.h"
 #include "ScriptScope.h"
 #include "ScriptState.h"
 #include "ScriptValue.h"
 #include "V8Binding.h"
+#include "V8ObjectConstructor.h"
 #include "V8Proxy.h"
 #include "V8RecursionScope.h"
@@ -169 +169 @@
         args[i] = m_arguments[i].v8Value();
 
-    v8::Local<v8::Object> result = SafeAllocation::newInstance(constructor, m_arguments.size(), args.get());
+    v8::Local<v8::Object> result = V8ObjectConstructor::newInstance(constructor, m_arguments.size(), args.get());
     if (!scope.success()) {
         hadException = true;

trunk/Source/WebCore/bindings/v8/V8Binding.cpp

@@ -38 +38 @@
 #include "PlatformString.h"
 #include "QualifiedName.h"
-#include "SafeAllocation.h"
 #include "V8DOMStringList.h"
 #include "V8Element.h"
+#include "V8ObjectConstructor.h"
 #include "V8Proxy.h"
 
@@ -318 +318 @@
 {
     v8::HandleScope scope;
-    v8::Local<v8::FunctionTemplate> result = v8::FunctionTemplate::New(SafeAllocation::isValidConstructorMode);
+    v8::Local<v8::FunctionTemplate> result = v8::FunctionTemplate::New(V8ObjectConstructor::isValidConstructorMode);
     return v8::Persistent<v8::FunctionTemplate>::New(result);
 }        

trunk/Source/WebCore/bindings/v8/V8Binding.h

@@ -34 +34 @@
 #include "BindingSecurity.h"
 #include "Document.h"
-#include "SafeAllocation.h"
 #include "V8BindingMacros.h"
 #include "V8DOMConfiguration.h"
@@ -40 +39 @@
 #include "V8DOMWrapper.h"
 #include "V8HiddenPropertyName.h"
+#include "V8ObjectConstructor.h"
 #include "V8PerIsolateData.h"
 #include "V8Proxy.h"

trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp

@@ -43 +43 @@
 #include "PlatformSupport.h"
 #include "RuntimeEnabledFeatures.h"
-#include "SafeAllocation.h"
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
@@ -60 +59 @@
 #include "V8History.h"
 #include "V8Location.h"
+#include "V8ObjectConstructor.h"
 #include "V8PerContextData.h"
 #include "V8Proxy.h"
@@ -411 +411 @@
     // Create a new JS window object and use it as the prototype for the  shadow global object.
     v8::Handle<v8::Function> windowConstructor = V8DOMWrapper::constructorForType(&V8DOMWindow::info, window);
-    v8::Local<v8::Object> jsWindow = SafeAllocation::newInstance(windowConstructor);
+    v8::Local<v8::Object> jsWindow = V8ObjectConstructor::newInstance(windowConstructor);
     // Bail out if allocation failed.
     if (jsWindow.IsEmpty())

trunk/Source/WebCore/bindings/v8/V8DOMWrapper.cpp

@@ -38 +38 @@
 #include "Frame.h"
 #include "FrameLoaderClient.h"
-#include "SafeAllocation.h"
 #include "StylePropertySet.h"
 #include "V8AbstractEventListener.h"
@@ -52 +51 @@
 #include "V8NodeFilterCondition.h"
 #include "V8NodeList.h"
+#include "V8ObjectConstructor.h"
 #include "V8PerContextData.h"
 #include "V8Proxy.h"
@@ -206 +206 @@
     else {
         v8::Local<v8::Function> function = type->getTemplate()->GetFunction();
-        instance = SafeAllocation::newInstance(function);
+        instance = V8ObjectConstructor::newInstance(function);
     }
 

trunk/Source/WebCore/bindings/v8/V8NPObject.cpp

@@ -35 +35 @@
 #include "HTMLPlugInElement.h"
 #include "NPV8Object.h"
-#include "SafeAllocation.h"
 #include "V8Binding.h"
 #include "V8DOMMap.h"
@@ -42 +41 @@
 #include "V8HTMLObjectElement.h"
 #include "V8NPUtils.h"
+#include "V8ObjectConstructor.h"
 #include "V8Proxy.h"
 #include "npruntime_impl.h"
@@ -408 +408 @@
 
     v8::Handle<v8::Function> v8Function = npObjectDesc->GetFunction();
-    v8::Local<v8::Object> value = SafeAllocation::newInstance(v8Function);
+    v8::Local<v8::Object> value = V8ObjectConstructor::newInstance(v8Function);
 
     // If we were unable to allocate the instance, we avoid wrapping and registering the NP object.

trunk/Source/WebCore/bindings/v8/V8ObjectConstructor.cpp

@@ -24 +24 @@
 
 #include "config.h"
-#include "SafeAllocation.h"
+#include "V8ObjectConstructor.h"
 
 #include "V8Binding.h"
@@ -30 +30 @@
 namespace WebCore {
 
-v8::Handle<v8::Value> SafeAllocation::isValidConstructorMode(const v8::Arguments& args)
+v8::Handle<v8::Value> V8ObjectConstructor::isValidConstructorMode(const v8::Arguments& args)
 {
     if (ConstructorMode::current() == ConstructorMode::CreateNewObject)

trunk/Source/WebCore/bindings/v8/V8ObjectConstructor.h

@@ -29 +29 @@
 */
 
-#ifndef SafeAllocation_h
-#define SafeAllocation_h
+#ifndef V8ObjectConstructor_h
+#define V8ObjectConstructor_h
 
 #include "V8PerIsolateData.h"
@@ -65 +65 @@
 };
 
-class SafeAllocation {
+class V8ObjectConstructor {
 public:
     static inline v8::Local<v8::Object> newInstance(v8::Handle<v8::Function>);
@@ -74 +74 @@
 };
 
-v8::Local<v8::Object> SafeAllocation::newInstance(v8::Handle<v8::Function> function)
+v8::Local<v8::Object> V8ObjectConstructor::newInstance(v8::Handle<v8::Function> function)
 {
     if (function.IsEmpty())
@@ -83 +83 @@
 }
 
-v8::Local<v8::Object> SafeAllocation::newInstance(v8::Handle<v8::ObjectTemplate> objectTemplate)
+v8::Local<v8::Object> V8ObjectConstructor::newInstance(v8::Handle<v8::ObjectTemplate> objectTemplate)
 {
     if (objectTemplate.IsEmpty())
@@ -92 +92 @@
 }
 
-v8::Local<v8::Object> SafeAllocation::newInstance(v8::Handle<v8::Function> function, int argc, v8::Handle<v8::Value> argv[])
+v8::Local<v8::Object> V8ObjectConstructor::newInstance(v8::Handle<v8::Function> function, int argc, v8::Handle<v8::Value> argv[])
 {
     if (function.IsEmpty())
@@ -103 +103 @@
 } // namespace WebCore
 
-#endif // SafeAllocation_h
+#endif // V8ObjectConstructor_h

trunk/Source/WebCore/bindings/v8/V8PerContextData.cpp

@@ -32 +32 @@
 #include "V8PerContextData.h"
 
-#include "SafeAllocation.h"
+#include "V8ObjectConstructor.h"
 
 namespace WebCore {
@@ -93 +93 @@
     v8::Context::Scope scope(m_context);
     v8::Local<v8::Function> function = constructorForType(type);
-    v8::Local<v8::Object> instance = SafeAllocation::newInstance(function);
+    v8::Local<v8::Object> instance = V8ObjectConstructor::newInstance(function);
     if (!instance.IsEmpty()) {
         m_wrapperBoilerplates.set(type, v8::Persistent<v8::Object>::New(instance));

trunk/Source/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp

@@ -38 +38 @@
 #include "DedicatedWorkerContext.h"
 #include "Event.h"
-#include "SafeAllocation.h"
 #include "ScriptCallStack.h"
 #include "SharedWorker.h"
@@ -46 +45 @@
 #include "V8DOMWindowShell.h"
 #include "V8DedicatedWorkerContext.h"
+#include "V8ObjectConstructor.h"
 #include "V8PerContextData.h"
 #include "V8Proxy.h"
@@ -174 +174 @@
 #endif
     v8::Handle<v8::Function> workerContextConstructor = m_perContextData->constructorForType(contextType);
-    v8::Local<v8::Object> jsWorkerContext = SafeAllocation::newInstance(workerContextConstructor);
+    v8::Local<v8::Object> jsWorkerContext = V8ObjectConstructor::newInstance(workerContextConstructor);
     // Bail out if allocation failed.
     if (jsWorkerContext.IsEmpty()) {

trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptManager.cpp

@@ -36 +36 @@
 #include "DOMWindow.h"
 #include "InjectedScriptHost.h"
-#include "SafeAllocation.h"
 #include "ScriptObject.h"
 #include "V8Binding.h"
@@ -60 +59 @@
         return v8::Local<v8::Object>();
     }
-    v8::Local<v8::Object> instance = SafeAllocation::newInstance(function);
+    v8::Local<v8::Object> instance = V8ObjectConstructor::newInstance(function);
     if (instance.IsEmpty()) {
         // Avoid setting the wrapper if allocation failed.

trunk/Source/WebCore/bindings/v8/custom/V8ScriptProfileCustom.cpp

@@ -33 +33 @@
 #include "V8ScriptProfile.h"
 
-#include "SafeAllocation.h"
 #include "ScriptProfile.h"
 #include "V8Binding.h"
@@ -51 +50 @@
         return v8Undefined();
     }
-    v8::Local<v8::Object> instance = SafeAllocation::newInstance(function);
+    v8::Local<v8::Object> instance = V8ObjectConstructor::newInstance(function);
     if (instance.IsEmpty()) {
         // Avoid setting the wrapper if allocation failed.

trunk/Source/WebCore/bindings/v8/custom/V8ScriptProfileNodeCustom.cpp

@@ -33 +33 @@
 #include "V8ScriptProfileNode.h"
 
-#include "SafeAllocation.h"
 #include "ScriptProfileNode.h"
 #include "V8Binding.h"
@@ -58 +57 @@
         return v8Undefined();
     }
-    v8::Local<v8::Object> instance = SafeAllocation::newInstance(function);
+    v8::Local<v8::Object> instance = V8ObjectConstructor::newInstance(function);
     if (instance.IsEmpty()) {
         // Avoid setting the wrapper if allocation failed.