Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (139896 => 139897)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-16 18:44:18 UTC (rev 139896)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-16 19:04:23 UTC (rev 139897)
@@ -1,3 +1,31 @@
+2013-01-16 Mark Pilgrim <[email protected]>
+
+ [Chromium] Move WebArrayBufferView and WebSerializedScriptValue out of public/platform/
+ https://bugs.webkit.org/show_bug.cgi?id=106863
+
+ Reviewed by Adam Barth.
+
+ These are not being moved into the new top-level Platform
+ directory, so into public they go.
+
+ * WebKit.gyp:
+ * public/WebArrayBufferView.h: Added.
+ (v8):
+ (WebKit):
+ (WebArrayBufferView):
+ (WebKit::WebArrayBufferView::~WebArrayBufferView):
+ (WebKit::WebArrayBufferView::WebArrayBufferView):
+ * public/WebSerializedScriptValue.h: Added.
+ (v8):
+ (WebKit):
+ (WebSerializedScriptValue):
+ (WebKit::WebSerializedScriptValue::~WebSerializedScriptValue):
+ (WebKit::WebSerializedScriptValue::WebSerializedScriptValue):
+ (WebKit::WebSerializedScriptValue::operator=):
+ (WebKit::WebSerializedScriptValue::isNull):
+ * public/platform/WebArrayBufferView.h:
+ * public/platform/WebSerializedScriptValue.h:
+
2013-01-16 Chris Hopman <[email protected]>
[Chromium] Remove hardcoded chromium_*.jar in gyp files
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (139896 => 139897)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-16 18:44:18 UTC (rev 139896)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-16 19:04:23 UTC (rev 139897)
@@ -100,6 +100,7 @@
'public/WebAnimationController.h',
'public/WebApplicationCacheHostClient.h',
'public/WebArrayBuffer.h',
+ 'public/WebArrayBufferView.h',
'public/WebAudioSourceProvider.h',
'public/WebAudioSourceProviderClient.h',
'public/WebAutofillClient.h',
@@ -246,6 +247,7 @@
'public/WebSecurityOrigin.h',
'public/WebSecurityPolicy.h',
'public/WebSelectElement.h',
+ 'public/WebSerializedScriptValue.h',
'public/WebSettings.h',
'public/WebSharedWorkerClient.h',
'public/WebSharedWorker.h',
Copied: trunk/Source/WebKit/chromium/public/WebArrayBufferView.h (from rev 139896, trunk/Source/WebKit/chromium/public/platform/WebArrayBufferView.h) (0 => 139897)
--- trunk/Source/WebKit/chromium/public/WebArrayBufferView.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebArrayBufferView.h 2013-01-16 19:04:23 UTC (rev 139897)
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebArrayBufferView_h
+#define WebArrayBufferView_h
+
+#include "platform/WebCommon.h"
+#include "platform/WebPrivatePtr.h"
+
+#if WEBKIT_USING_V8
+namespace v8 {
+class Value;
+template <class T> class Handle;
+}
+#endif
+
+namespace WTF { class ArrayBufferView; }
+
+namespace WebKit {
+
+// Provides access to an ArrayBufferView.
+class WebArrayBufferView {
+public:
+ ~WebArrayBufferView() { reset(); }
+ WebArrayBufferView() { }
+ WebArrayBufferView(const WebArrayBufferView& v) { assign(v); }
+
+ WEBKIT_EXPORT void* baseAddress() const;
+ WEBKIT_EXPORT unsigned byteOffset() const;
+ WEBKIT_EXPORT unsigned byteLength() const;
+
+ 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>&);
+ WebArrayBufferView& operator=(const WTF::PassRefPtr<WTF::ArrayBufferView>&);
+ operator WTF::PassRefPtr<WTF::ArrayBufferView>() const;
+#endif
+
+private:
+ WebPrivatePtr<WTF::ArrayBufferView> m_private;
+};
+
+} // namespace WebKit
+
+#endif
Copied: trunk/Source/WebKit/chromium/public/WebSerializedScriptValue.h (from rev 139896, trunk/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h) (0 => 139897)
--- trunk/Source/WebKit/chromium/public/WebSerializedScriptValue.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebSerializedScriptValue.h 2013-01-16 19:04:23 UTC (rev 139897)
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebSerializedScriptValue_h
+#define WebSerializedScriptValue_h
+
+#include "platform/WebCommon.h"
+#include "platform/WebPrivatePtr.h"
+
+namespace WebCore { class SerializedScriptValue; }
+
+#if WEBKIT_USING_V8
+namespace v8 {
+class Value;
+template <class T> class Handle;
+}
+#endif
+
+namespace WebKit {
+class WebString;
+
+// FIXME: Should this class be in platform?
+class WebSerializedScriptValue {
+public:
+ ~WebSerializedScriptValue() { reset(); }
+
+ WebSerializedScriptValue() { }
+ WebSerializedScriptValue(const WebSerializedScriptValue& d) { assign(d); }
+ WebSerializedScriptValue& operator=(const WebSerializedScriptValue& d)
+ {
+ assign(d);
+ return *this;
+ }
+
+ 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();
+
+ WEBKIT_EXPORT void reset();
+ WEBKIT_EXPORT void assign(const WebSerializedScriptValue&);
+
+ bool isNull() const { return m_private.isNull(); }
+
+ // 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>&);
+ WebSerializedScriptValue& operator=(const WTF::PassRefPtr<WebCore::SerializedScriptValue>&);
+ operator WTF::PassRefPtr<WebCore::SerializedScriptValue>() const;
+#endif
+
+private:
+ WebPrivatePtr<WebCore::SerializedScriptValue> m_private;
+};
+
+} // namespace WebKit
+
+#endif
Modified: trunk/Source/WebKit/chromium/public/platform/WebArrayBufferView.h (139896 => 139897)
--- trunk/Source/WebKit/chromium/public/platform/WebArrayBufferView.h 2013-01-16 18:44:18 UTC (rev 139896)
+++ trunk/Source/WebKit/chromium/public/platform/WebArrayBufferView.h 2013-01-16 19:04:23 UTC (rev 139897)
@@ -26,51 +26,4 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebArrayBufferView_h
-#define WebArrayBufferView_h
-
-#include "WebCommon.h"
-#include "WebPrivatePtr.h"
-
-#if WEBKIT_USING_V8
-namespace v8 {
-class Value;
-template <class T> class Handle;
-}
-#endif
-
-namespace WTF { class ArrayBufferView; }
-
-namespace WebKit {
-
-// Provides access to an ArrayBufferView.
-class WebArrayBufferView {
-public:
- ~WebArrayBufferView() { reset(); }
- WebArrayBufferView() { }
- WebArrayBufferView(const WebArrayBufferView& v) { assign(v); }
-
- WEBKIT_EXPORT void* baseAddress() const;
- WEBKIT_EXPORT unsigned byteOffset() const;
- WEBKIT_EXPORT unsigned byteLength() const;
-
- 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>&);
- WebArrayBufferView& operator=(const WTF::PassRefPtr<WTF::ArrayBufferView>&);
- operator WTF::PassRefPtr<WTF::ArrayBufferView>() const;
-#endif
-
-private:
- WebPrivatePtr<WTF::ArrayBufferView> m_private;
-};
-
-} // namespace WebKit
-
-#endif
+#include "../WebArrayBufferView.h"
Modified: trunk/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h (139896 => 139897)
--- trunk/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h 2013-01-16 18:44:18 UTC (rev 139896)
+++ trunk/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h 2013-01-16 19:04:23 UTC (rev 139897)
@@ -28,69 +28,4 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebSerializedScriptValue_h
-#define WebSerializedScriptValue_h
-
-#include "WebCommon.h"
-#include "WebPrivatePtr.h"
-
-namespace WebCore { class SerializedScriptValue; }
-
-#if WEBKIT_USING_V8
-namespace v8 {
-class Value;
-template <class T> class Handle;
-}
-#endif
-
-namespace WebKit {
-class WebString;
-
-// FIXME: Should this class be in platform?
-class WebSerializedScriptValue {
-public:
- ~WebSerializedScriptValue() { reset(); }
-
- WebSerializedScriptValue() { }
- WebSerializedScriptValue(const WebSerializedScriptValue& d) { assign(d); }
- WebSerializedScriptValue& operator=(const WebSerializedScriptValue& d)
- {
- assign(d);
- return *this;
- }
-
- 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();
-
- WEBKIT_EXPORT void reset();
- WEBKIT_EXPORT void assign(const WebSerializedScriptValue&);
-
- bool isNull() const { return m_private.isNull(); }
-
- // 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>&);
- WebSerializedScriptValue& operator=(const WTF::PassRefPtr<WebCore::SerializedScriptValue>&);
- operator WTF::PassRefPtr<WebCore::SerializedScriptValue>() const;
-#endif
-
-private:
- WebPrivatePtr<WebCore::SerializedScriptValue> m_private;
-};
-
-} // namespace WebKit
-
-#endif
+#include "../WebSerializedScriptValue.h"
