Attachment 146281 Details for Bug 88534 – Patch

[patch] Patch

bug-88534-20120607100249.patch (text/plain), 16.00 KB, created by Mark Pilgrim (Google) on 2012-06-07 07:03:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-06-07 07:03:39 PDT

Size: 16.00 KB

patch

obsolete

>Index: Source/Platform/ChangeLog
>===================================================================
>--- Source/Platform/ChangeLog	(revision 119718)
>+++ Source/Platform/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2012-06-07  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move WebSerializedScriptValue to Platform/chromium/public/
>+        https://bugs.webkit.org/show_bug.cgi?id=88534
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * Platform.gypi:
>+        * chromium/public/WebSerializedScriptValue.h: Added.
>+        (v8):
>+        (WebKit):
>+        (WebSerializedScriptValue):
>+        (WebKit::WebSerializedScriptValue::~WebSerializedScriptValue):
>+        (WebKit::WebSerializedScriptValue::WebSerializedScriptValue):
>+        (WebKit::WebSerializedScriptValue::operator=):
>+        (WebKit::WebSerializedScriptValue::isNull):
>+
> 2012-06-06  Mark Pilgrim  <pilgrim@chromium.org>
> 
>         [Chromium] Move createMessagePortChannel to Platform.h
>Index: Source/Platform/Platform.gypi
>===================================================================
>--- Source/Platform/Platform.gypi	(revision 119717)
>+++ Source/Platform/Platform.gypi	(working copy)
>@@ -93,6 +93,7 @@
>             'chromium/public/WebRect.h',
>             'chromium/public/WebReferrerPolicy.h',
>             'chromium/public/WebSessionDescriptionDescriptor.h',
>+            'chromium/public/WebSerializedScriptValue.h',
>             'chromium/public/WebSize.h',
>             'chromium/public/WebSocketStreamError.h',
>             'chromium/public/WebSocketStreamHandle.h',
>Index: Source/Platform/chromium/public/WebSerializedScriptValue.h
>===================================================================
>--- Source/Platform/chromium/public/WebSerializedScriptValue.h	(revision 0)
>+++ Source/Platform/chromium/public/WebSerializedScriptValue.h	(revision 0)
>@@ -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 "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
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 119718)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,28 @@
>+2012-06-07  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Move WebSerializedScriptValue to Platform/chromium/public/
>+        https://bugs.webkit.org/show_bug.cgi?id=88534
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * WebKit.gyp:
>+        * public/platform/WebSerializedScriptValue.h:
>+        * src/DeliveredIntentClientImpl.cpp:
>+        * src/IDBCallbacksProxy.cpp:
>+        * src/IDBCursorBackendProxy.cpp:
>+        * src/IDBObjectStoreBackendProxy.cpp:
>+        * src/WebDOMMessageEvent.cpp:
>+        * src/WebFrameImpl.cpp:
>+        * src/WebHistoryItem.cpp:
>+        * src/WebIDBCallbacksImpl.cpp:
>+        * src/WebIDBKey.cpp:
>+        * src/WebIDBObjectStoreImpl.cpp:
>+        * src/WebIntent.cpp:
>+        * src/WebIntentRequest.cpp:
>+        * src/WebSerializedScriptValue.cpp:
>+
> 2012-06-07  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r119694.
>Index: Source/WebKit/chromium/WebKit.gyp
>===================================================================
>--- Source/WebKit/chromium/WebKit.gyp	(revision 119717)
>+++ Source/WebKit/chromium/WebKit.gyp	(working copy)
>@@ -319,7 +319,6 @@
>                 'public/platform/WebPrivatePtr.h',
>                 'public/platform/WebRect.h',
>                 'public/platform/WebReferrerPolicy.h',
>-                'public/platform/WebSerializedScriptValue.h',
>                 'public/platform/WebSize.h',
>                 'public/platform/WebSocketStreamError.h',
>                 'public/platform/WebSocketStreamHandle.h',
>Index: Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h
>===================================================================
>--- Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h	(revision 119717)
>+++ Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h	(working copy)
>@@ -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 "../../../../Platform/chromium/public/WebSerializedScriptValue.h"
>Index: Source/WebKit/chromium/src/DeliveredIntentClientImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/DeliveredIntentClientImpl.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/DeliveredIntentClientImpl.cpp	(working copy)
>@@ -32,7 +32,7 @@
> #include "DeliveredIntentClientImpl.h"
> 
> #include "WebDeliveredIntentClient.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> namespace WebKit {
> 
>Index: Source/WebKit/chromium/src/IDBCallbacksProxy.cpp
>===================================================================
>--- Source/WebKit/chromium/src/IDBCallbacksProxy.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/IDBCallbacksProxy.cpp	(working copy)
>@@ -39,7 +39,7 @@
> #include "WebIDBDatabaseError.h"
> #include "WebIDBKey.h"
> #include "WebIDBTransactionImpl.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> using namespace WebCore;
> 
>Index: Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp
>===================================================================
>--- Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp	(working copy)
>@@ -34,7 +34,7 @@
> #include "SerializedScriptValue.h"
> #include "WebIDBCallbacksImpl.h"
> #include "WebIDBKey.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> using namespace WebCore;
> 
>Index: Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp
>===================================================================
>--- Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp	(working copy)
>@@ -39,7 +39,7 @@
> #include "WebIDBKey.h"
> #include "WebIDBObjectStore.h"
> #include "WebIDBTransactionImpl.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> using namespace WebCore;
> 
>Index: Source/WebKit/chromium/src/WebDOMMessageEvent.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebDOMMessageEvent.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebDOMMessageEvent.cpp	(working copy)
>@@ -38,8 +38,8 @@
> #include "SerializedScriptValue.h"
> #include "WebFrame.h"
> #include "WebFrameImpl.h"
>-#include "platform/WebSerializedScriptValue.h"
> #include "platform/WebString.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> #if USE(V8)
> #include "V8Proxy.h"
>Index: Source/WebKit/chromium/src/WebFrameImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebFrameImpl.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebFrameImpl.cpp	(working copy)
>@@ -171,13 +171,13 @@
> #include "painting/GraphicsContextBuilder.h"
> #include "platform/WebPoint.h"
> #include "platform/WebRect.h"
>-#include "platform/WebSerializedScriptValue.h"
> #include "platform/WebSize.h"
> #include "platform/WebURLError.h"
> #include "platform/WebVector.h"
> 
> #include <algorithm>
> #include <public/Platform.h>
>+#include <public/WebSerializedScriptValue.h>
> #include <wtf/CurrentTime.h>
> #include <wtf/HashMap.h>
> 
>Index: Source/WebKit/chromium/src/WebHistoryItem.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebHistoryItem.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebHistoryItem.cpp	(working copy)
>@@ -38,10 +38,11 @@
> 
> #include "platform/WebHTTPBody.h"
> #include "platform/WebPoint.h"
>-#include "platform/WebSerializedScriptValue.h"
> #include "platform/WebString.h"
> #include "platform/WebVector.h"
> 
>+#include <public/WebSerializedScriptValue.h>
>+
> using namespace WebCore;
> 
> namespace WebKit {
>Index: Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp	(working copy)
>@@ -40,7 +40,7 @@
> #include "WebIDBDatabaseError.h"
> #include "WebIDBKey.h"
> #include "WebIDBTransaction.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> using namespace WebCore;
> 
>Index: Source/WebKit/chromium/src/WebIDBKey.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebIDBKey.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebIDBKey.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include "IDBKeyPath.h"
> #include "SerializedScriptValue.h"
> #include "WebIDBKeyPath.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> using namespace WebCore;
> 
>Index: Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp	(working copy)
>@@ -38,7 +38,7 @@
> #include "WebIDBKey.h"
> #include "WebIDBKeyRange.h"
> #include "WebIDBTransaction.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> using namespace WebCore;
> 
>Index: Source/WebKit/chromium/src/WebIntent.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebIntent.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebIntent.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include "MessagePort.h"
> #include "PlatformMessagePortChannel.h"
> #include "SerializedScriptValue.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> #include <wtf/HashMap.h>
> 
> namespace WebKit {
>Index: Source/WebKit/chromium/src/WebIntentRequest.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebIntentRequest.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebIntentRequest.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include "IntentRequest.h"
> #include "SerializedScriptValue.h"
> #include "WebIntent.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> namespace WebKit {
> 
>Index: Source/WebKit/chromium/src/WebSerializedScriptValue.cpp
>===================================================================
>--- Source/WebKit/chromium/src/WebSerializedScriptValue.cpp	(revision 119717)
>+++ Source/WebKit/chromium/src/WebSerializedScriptValue.cpp	(working copy)
>@@ -29,7 +29,7 @@
>  */
> 
> #include "config.h"
>-#include "platform/WebSerializedScriptValue.h"
>+#include <public/WebSerializedScriptValue.h>
> 
> #include "SerializedScriptValue.h"
> #include "platform/WebString.h"

Actions: View | Formatted Diff | Diff

Attachments on bug 88534: 146281