Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (145588 => 145589)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-12 21:54:11 UTC (rev 145589)
@@ -1,3 +1,43 @@
+2013-03-12 Adam Barth <aba...@webkit.org>
+
+ [Chromium] Remove WEBKIT_USING_V8 from the WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=112120
+
+ Reviewed by Tony Chang.
+
+ Chromium always uses V8. This macro has outlived it's usefulness. It's
+ now just noise.
+
+ * README:
+ * public/WebArrayBuffer.h:
+ (WebArrayBuffer):
+ * public/WebArrayBufferView.h:
+ (WebArrayBufferView):
+ * public/WebBindings.h:
+ (WebBindings):
+ * public/WebBlob.h:
+ (WebBlob):
+ * public/WebFrame.h:
+ (WebFrame):
+ * public/WebFrameClient.h:
+ * public/WebSerializedScriptValue.h:
+ (WebSerializedScriptValue):
+ * src/WebArrayBuffer.cpp:
+ (WebKit::WebArrayBuffer::createFromV8Value):
+ * src/WebArrayBufferView.cpp:
+ (WebKit::WebArrayBufferView::createFromV8Value):
+ * src/WebBindings.cpp:
+ (WebKit::WebBindings::toV8Value):
+ * src/WebBlob.cpp:
+ (WebKit::WebBlob::toV8Value):
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrame::frameForContext):
+ * src/WebFrameImpl.h:
+ (WebFrameImpl):
+ * src/WebSerializedScriptValue.cpp:
+ (WebKit::WebSerializedScriptValue::serialize):
+ (WebKit::WebSerializedScriptValue::deserialize):
+
2013-03-12 Abhishek Arya <infe...@chromium.org>
Replace static_casts with to* functions.
Modified: trunk/Source/WebKit/chromium/README (145588 => 145589)
--- trunk/Source/WebKit/chromium/README 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/README 2013-03-12 21:54:11 UTC (rev 145589)
@@ -35,11 +35,7 @@
called by a public inline-defined method should be annotated with
WEBKIT_EXPORT. WEBKIT_EXPORT is not used to export whole classes.
- WEBKIT_USING_V8 is defined when using V8 as the _javascript_ library.
- WEBKIT_USING_JSC is defined when using JSC as the _javascript_ library.
-
-
BASIC TYPES
Use of STL is prohibited except in cases where it would be allowed in
Modified: trunk/Source/WebKit/chromium/public/WebArrayBuffer.h (145588 => 145589)
--- trunk/Source/WebKit/chromium/public/WebArrayBuffer.h 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/public/WebArrayBuffer.h 2013-03-12 21:54:11 UTC (rev 145589)
@@ -34,12 +34,10 @@
#include "../../../Platform/chromium/public/WebCommon.h"
#include "../../../Platform/chromium/public/WebPrivatePtr.h"
-#if WEBKIT_USING_V8
namespace v8 {
class Value;
template <class T> class Handle;
}
-#endif
namespace WTF { class ArrayBuffer; }
@@ -66,10 +64,8 @@
WEBKIT_EXPORT void* data() const;
WEBKIT_EXPORT unsigned byteLength() const;
-#if WEBKIT_USING_V8
WEBKIT_EXPORT v8::Handle<v8::Value> toV8Value();
WEBKIT_EXPORT static WebArrayBuffer* createFromV8Value(v8::Handle<v8::Value>);
-#endif
#if WEBKIT_IMPLEMENTATION
WebArrayBuffer(const WTF::PassRefPtr<WTF::ArrayBuffer>&);
Modified: trunk/Source/WebKit/chromium/public/WebArrayBufferView.h (145588 => 145589)
--- trunk/Source/WebKit/chromium/public/WebArrayBufferView.h 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/public/WebArrayBufferView.h 2013-03-12 21:54:11 UTC (rev 145589)
@@ -32,12 +32,10 @@
#include "../../../Platform/chromium/public/WebCommon.h"
#include "../../../Platform/chromium/public/WebPrivatePtr.h"
-#if WEBKIT_USING_V8
namespace v8 {
class Value;
template <class T> class Handle;
}
-#endif
namespace WTF { class ArrayBufferView; }
@@ -57,9 +55,7 @@
WEBKIT_EXPORT void assign(const WebArrayBufferView&);
WEBKIT_EXPORT void reset();
-#if WEBKIT_USING_V8
WEBKIT_EXPORT static WebArrayBufferView* createFromV8Value(v8::Handle<v8::Value>);
-#endif
#if WEBKIT_IMPLEMENTATION
WebArrayBufferView(const WTF::PassRefPtr<WTF::ArrayBufferView>&);
Modified: trunk/Source/WebKit/chromium/public/WebBindings.h (145588 => 145589)
--- trunk/Source/WebKit/chromium/public/WebBindings.h 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/public/WebBindings.h 2013-03-12 21:54:11 UTC (rev 145589)
@@ -36,13 +36,11 @@
#include "../../../Platform/chromium/public/WebVector.h"
#include <bindings/npruntime.h>
-#if WEBKIT_USING_V8
namespace v8 {
class Value;
template <class T> class Handle;
template <class T> class Local;
}
-#endif
namespace WebKit {
@@ -172,11 +170,9 @@
WEBKIT_EXPORT static void pushExceptionHandler(ExceptionHandler, void* data);
WEBKIT_EXPORT static void popExceptionHandler();
-#if WEBKIT_USING_V8
// Conversion utilities to/from V8 native objects and NPVariant wrappers.
WEBKIT_EXPORT static void toNPVariant(v8::Local<v8::Value>, NPObject* root, NPVariant* result);
WEBKIT_EXPORT static v8::Handle<v8::Value> toV8Value(const NPVariant*);
-#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/public/WebBlob.h (145588 => 145589)
--- trunk/Source/WebKit/chromium/public/WebBlob.h 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/public/WebBlob.h 2013-03-12 21:54:11 UTC (rev 145589)
@@ -35,12 +35,10 @@
#include "../../../Platform/chromium/public/WebPrivatePtr.h"
#include "../../../Platform/chromium/public/WebString.h"
-#if WEBKIT_USING_V8
namespace v8 {
class Value;
template <class T> class Handle;
}
-#endif
namespace WebCore { class Blob; }
@@ -65,9 +63,7 @@
bool isNull() const { return m_private.isNull(); }
-#if WEBKIT_USING_V8
WEBKIT_EXPORT v8::Handle<v8::Value> toV8Value();
-#endif
#if WEBKIT_IMPLEMENTATION
WebBlob(const WTF::PassRefPtr<WebCore::Blob>&);
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (145588 => 145589)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2013-03-12 21:54:11 UTC (rev 145589)
@@ -42,7 +42,6 @@
struct NPObject;
-#if WEBKIT_USING_V8
namespace v8 {
class Context;
class Function;
@@ -51,7 +50,6 @@
template <class T> class Handle;
template <class T> class Local;
}
-#endif
namespace WebKit {
@@ -101,12 +99,10 @@
// is not currently being displayed in a Frame.
WEBKIT_EXPORT static WebFrame* frameForCurrentContext();
-#if WEBKIT_USING_V8
// Returns the frame corresponding to the given context. This can return 0
// if the context is detached from the frame, or if the context doesn't
// correspond to a frame (e.g., workers).
WEBKIT_EXPORT static WebFrame* frameForContext(v8::Handle<v8::Context>);
-#endif
// Returns the frame inside a given frame or iframe element. Returns 0 if
// the given element is not a frame, iframe or if the frame is empty.
@@ -270,7 +266,6 @@
// to this frame.
virtual bool checkIfRunInsecureContent(const WebURL&) const = 0;
-#if WEBKIT_USING_V8
// Executes script in the context of the current page and returns the value
// that the script evaluated to.
virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
@@ -311,7 +306,6 @@
const WebString& fileSystemRootURL,
const WebString& filePath,
bool isDirectory) = 0;
-#endif
// Navigation ----------------------------------------------------------
Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (145588 => 145589)
--- trunk/Source/WebKit/chromium/public/WebFrameClient.h 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h 2013-03-12 21:54:11 UTC (rev 145589)
@@ -42,10 +42,7 @@
#include "WebSecurityOrigin.h"
#include "WebStorageQuotaType.h"
#include "WebTextDirection.h"
-
-#if WEBKIT_USING_V8
#include <v8.h>
-#endif
namespace WebKit {
@@ -309,7 +306,6 @@
// Script in the page tried to allocate too much memory.
virtual void didExhaustMemoryAvailableForScript(WebFrame*) { }
-#if WEBKIT_USING_V8
// Notifies that a new script context has been created for this frame.
// This is similar to didClearWindowObject but only called once per
// frame context.
@@ -317,7 +313,6 @@
// WebKit is about to release its reference to a v8 context for a frame.
virtual void willReleaseScriptContext(WebFrame*, v8::Handle<v8::Context>, int worldId) { }
-#endif
// Geometry notifications ----------------------------------------------
Modified: trunk/Source/WebKit/chromium/public/WebSerializedScriptValue.h (145588 => 145589)
--- trunk/Source/WebKit/chromium/public/WebSerializedScriptValue.h 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/public/WebSerializedScriptValue.h 2013-03-12 21:54:11 UTC (rev 145589)
@@ -36,12 +36,10 @@
namespace WebCore { class SerializedScriptValue; }
-#if WEBKIT_USING_V8
namespace v8 {
class Value;
template <class T> class Handle;
}
-#endif
namespace WebKit {
class WebString;
@@ -61,9 +59,7 @@
WEBKIT_EXPORT static WebSerializedScriptValue fromString(const WebString&);
-#if WEBKIT_USING_V8
WEBKIT_EXPORT static WebSerializedScriptValue serialize(v8::Handle<v8::Value>);
-#endif
// Create a WebSerializedScriptValue that represents a serialization error.
WEBKIT_EXPORT static WebSerializedScriptValue createInvalid();
@@ -76,10 +72,8 @@
// Returns a string representation of the WebSerializedScriptValue.
WEBKIT_EXPORT WebString toString() const;
-#if WEBKIT_USING_V8
// Convert the serialized value to a parsed v8 value.
WEBKIT_EXPORT v8::Handle<v8::Value> deserialize();
-#endif
#if WEBKIT_IMPLEMENTATION
WebSerializedScriptValue(const WTF::PassRefPtr<WebCore::SerializedScriptValue>&);
Modified: trunk/Source/WebKit/chromium/src/WebArrayBuffer.cpp (145588 => 145589)
--- trunk/Source/WebKit/chromium/src/WebArrayBuffer.cpp 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/src/WebArrayBuffer.cpp 2013-03-12 21:54:11 UTC (rev 145589)
@@ -69,7 +69,6 @@
return 0;
}
-#if WEBKIT_USING_V8
v8::Handle<v8::Value> WebArrayBuffer::toV8Value()
{
if (!m_private.get())
@@ -84,7 +83,6 @@
WTF::ArrayBuffer* buffer = V8ArrayBuffer::toNative(value->ToObject());
return new WebArrayBuffer(buffer);
}
-#endif
WebArrayBuffer::WebArrayBuffer(const WTF::PassRefPtr<WTF::ArrayBuffer>& blob)
: m_private(blob)
Modified: trunk/Source/WebKit/chromium/src/WebArrayBufferView.cpp (145588 => 145589)
--- trunk/Source/WebKit/chromium/src/WebArrayBufferView.cpp 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/src/WebArrayBufferView.cpp 2013-03-12 21:54:11 UTC (rev 145589)
@@ -61,7 +61,6 @@
return m_private->byteLength();
}
-#if WEBKIT_USING_V8
WebArrayBufferView* WebArrayBufferView::createFromV8Value(v8::Handle<v8::Value> value)
{
if (!WebCore::V8ArrayBufferView::HasInstance(value, v8::Isolate::GetCurrent()))
@@ -69,7 +68,6 @@
ArrayBufferView* view = WebCore::V8ArrayBufferView::toNative(value->ToObject());
return new WebArrayBufferView(view);
}
-#endif
WebArrayBufferView::WebArrayBufferView(const PassRefPtr<ArrayBufferView>& value)
: m_private(value)
Modified: trunk/Source/WebKit/chromium/src/WebBindings.cpp (145588 => 145589)
--- trunk/Source/WebKit/chromium/src/WebBindings.cpp 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/src/WebBindings.cpp 2013-03-12 21:54:11 UTC (rev 145589)
@@ -386,7 +386,6 @@
WebCore::popExceptionHandler();
}
-#if WEBKIT_USING_V8
void WebBindings::toNPVariant(v8::Local<v8::Value> object, NPObject* root, NPVariant* result)
{
WebCore::convertV8ObjectToNPVariant(object, root, result);
@@ -406,6 +405,5 @@
// argument is a primitive v8 type.
return convertNPVariantToV8Object(variant, 0, isolate);
}
-#endif
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebBlob.cpp (145588 => 145589)
--- trunk/Source/WebKit/chromium/src/WebBlob.cpp 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/src/WebBlob.cpp 2013-03-12 21:54:11 UTC (rev 145589)
@@ -58,14 +58,12 @@
m_private = other.m_private;
}
-#if WEBKIT_USING_V8
v8::Handle<v8::Value> WebBlob::toV8Value()
{
if (!m_private.get())
return v8::Handle<v8::Value>();
return toV8(m_private.get(), v8::Handle<v8::Object>(), v8::Isolate::GetCurrent());
}
-#endif
WebBlob::WebBlob(const WTF::PassRefPtr<WebCore::Blob>& blob)
: m_private(blob)
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (145588 => 145589)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-03-12 21:54:11 UTC (rev 145589)
@@ -542,12 +542,10 @@
return frameForContext(context);
}
-#if WEBKIT_USING_V8
WebFrame* WebFrame::frameForContext(v8::Handle<v8::Context> context)
{
return WebFrameImpl::fromFrame(toFrameIfNotDetached(context));
}
-#endif
WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& element)
{
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.h (145588 => 145589)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2013-03-12 21:54:11 UTC (rev 145589)
@@ -116,7 +116,6 @@
virtual void addMessageToConsole(const WebConsoleMessage&);
virtual void collectGarbage();
virtual bool checkIfRunInsecureContent(const WebURL&) const;
-#if WEBKIT_USING_V8
virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
const WebScriptSource&);
virtual void executeScriptInIsolatedWorld(
@@ -139,7 +138,6 @@
const WebString& fileSystemPath,
const WebString& filePath,
bool isDirectory);
-#endif
virtual void reload(bool ignoreCache);
virtual void reloadWithOverrideURL(const WebURL& overrideUrl, bool ignoreCache);
virtual void loadRequest(const WebURLRequest&);
Modified: trunk/Source/WebKit/chromium/src/WebSerializedScriptValue.cpp (145588 => 145589)
--- trunk/Source/WebKit/chromium/src/WebSerializedScriptValue.cpp 2013-03-12 21:53:19 UTC (rev 145588)
+++ trunk/Source/WebKit/chromium/src/WebSerializedScriptValue.cpp 2013-03-12 21:54:11 UTC (rev 145589)
@@ -43,7 +43,6 @@
return SerializedScriptValue::createFromWire(s);
}
-#if WEBKIT_USING_V8
WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Value> value)
{
bool didThrow;
@@ -52,7 +51,6 @@
return createInvalid();
return serializedValue;
}
-#endif
WebSerializedScriptValue WebSerializedScriptValue::createInvalid()
{
@@ -74,12 +72,10 @@
return m_private->toWireString();
}
-#if WEBKIT_USING_V8
v8::Handle<v8::Value> WebSerializedScriptValue::deserialize()
{
return m_private->deserialize();
}
-#endif
WebSerializedScriptValue::WebSerializedScriptValue(const PassRefPtr<SerializedScriptValue>& value)
: m_private(value)
