Changeset 61041 in webkit


Ignore:
Timestamp:
Jun 11, 2010 3:10:41 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-06-11 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r61036.
http://trac.webkit.org/changeset/61036
https://bugs.webkit.org/show_bug.cgi?id=40499

broke chromium compile (Requested by jamesr on #webkit).

  • bindings/v8/SerializedScriptValue.cpp:
  • bindings/v8/SerializedScriptValue.h: (WebCore::SerializedScriptValue::deserializeAndSetProperty): (WebCore::SerializedScriptValue::create): (WebCore::SerializedScriptValue::createFromWire): (WebCore::SerializedScriptValue::release): (WebCore::SerializedScriptValue::SerializedScriptValue):
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r61039 r61041  
     12010-06-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r61036.
     4        http://trac.webkit.org/changeset/61036
     5        https://bugs.webkit.org/show_bug.cgi?id=40499
     6
     7        broke chromium compile (Requested by jamesr on #webkit).
     8
     9        * bindings/v8/SerializedScriptValue.cpp:
     10        * bindings/v8/SerializedScriptValue.h:
     11        (WebCore::SerializedScriptValue::deserializeAndSetProperty):
     12        (WebCore::SerializedScriptValue::create):
     13        (WebCore::SerializedScriptValue::createFromWire):
     14        (WebCore::SerializedScriptValue::release):
     15        (WebCore::SerializedScriptValue::SerializedScriptValue):
     16
    1172010-06-11  Kenneth Russell  <kbr@google.com>
    218
  • trunk/WebCore/bindings/v8/SerializedScriptValue.cpp

    r61036 r61041  
    3939#include "ImageData.h"
    4040#include "SharedBuffer.h"
    41 #include "V8Binding.h"
    4241#include "V8Blob.h"
    4342#include "V8File.h"
     
    10131012} // namespace
    10141013
    1015 void SerializedScriptValue::deserializeAndSetProperty(v8::Handle<v8::Object> object, const char* propertyName,
    1016                                                       v8::PropertyAttribute attribute, SerializedScriptValue* value)
    1017 {
    1018     if (!value)
    1019         return;
    1020     v8::Handle<v8::Value> deserialized = value->deserialize();
    1021     object->ForceSet(v8::String::NewSymbol(propertyName), deserialized, attribute);
    1022 }
    1023 
    1024 PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(v8::Handle<v8::Value> value, bool& didThrow)
    1025 {
    1026     return adoptRef(new SerializedScriptValue(value, didThrow));
    1027 }
    1028 
    1029 PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(v8::Handle<v8::Value> value)
    1030 {
    1031     bool didThrow;
    1032     return adoptRef(new SerializedScriptValue(value, didThrow));
    1033 }
    1034 
    1035 PassRefPtr<SerializedScriptValue> SerializedScriptValue::createFromWire(String data)
    1036 {
    1037     return adoptRef(new SerializedScriptValue(data, WireData));
    1038 }
    1039 
    1040 PassRefPtr<SerializedScriptValue> SerializedScriptValue::create(String data)
    1041 {
    1042     return adoptRef(new SerializedScriptValue(data, StringValue));
    1043 }
    1044 
    1045 PassRefPtr<SerializedScriptValue> SerializedScriptValue::create()
    1046 {
    1047     return adoptRef(new SerializedScriptValue());
    1048 }
    1049 
    1050 PassRefPtr<SerializedScriptValue> SerializedScriptValue::release()
    1051 {
    1052     RefPtr<SerializedScriptValue> result = adoptRef(new SerializedScriptValue(m_data, WireData));
    1053     m_data = String();
    1054     return result.release();
    1055 }
    1056 
    1057 SerializedScriptValue::SerializedScriptValue()
    1058 {
    1059 }
    1060 
    10611014SerializedScriptValue::SerializedScriptValue(v8::Handle<v8::Value> value, bool& didThrow)
    10621015{
  • trunk/WebCore/bindings/v8/SerializedScriptValue.h

    r61036 r61041  
    3333
    3434#include "ScriptValue.h"
     35#include "V8Binding.h"
    3536#include <v8.h>
    3637#include <wtf/RefCounted.h>
     
    4041class SerializedScriptValue : public RefCounted<SerializedScriptValue> {
    4142public:
    42     static void deserializeAndSetProperty(v8::Handle<v8::Object> object, const char* propertyName,
    43                                           v8::PropertyAttribute, SerializedScriptValue*);
     43    // Deserializes the given value and sets it as a property on the
     44    // object.
     45    static void deserializeAndSetProperty(v8::Handle<v8::Object> object,
     46                                          const char* propertyName,
     47                                          v8::PropertyAttribute attribute,
     48                                          SerializedScriptValue* value)
     49    {
     50        if (!value)
     51            return;
     52        v8::Handle<v8::Value> deserialized = value->deserialize();
     53        object->ForceSet(v8::String::NewSymbol(propertyName), deserialized, attribute);
     54    }
    4455
     56    // Creates a serialized representation of the given V8 value.
     57    static PassRefPtr<SerializedScriptValue> create(v8::Handle<v8::Value> value)
     58    {
     59        bool didThrow;
     60        return adoptRef(new SerializedScriptValue(value, didThrow));
     61    }
     62
     63    // Creates a serialized representation of the given V8 value.
     64    //
    4565    // If a serialization error occurs (e.g., cyclic input value) this
    4666    // function returns an empty representation, schedules a V8 exception to
     
    4868    // the caller must not invoke any V8 operations until control returns to
    4969    // V8. When serialization is successful, |didThrow| is false.
    50     static PassRefPtr<SerializedScriptValue> create(v8::Handle<v8::Value> value, bool& didThrow);
    51     static PassRefPtr<SerializedScriptValue> create(v8::Handle<v8::Value>);
    52     static PassRefPtr<SerializedScriptValue> createFromWire(String data);
    53     static PassRefPtr<SerializedScriptValue> create(String data);
    54     static PassRefPtr<SerializedScriptValue> create();
     70    static PassRefPtr<SerializedScriptValue> create(v8::Handle<v8::Value> value, bool& didThrow)
     71    {
     72        return adoptRef(new SerializedScriptValue(value, didThrow));
     73    }
    5574
    56     PassRefPtr<SerializedScriptValue> release();
     75    // Creates a serialized value with the given data obtained from a
     76    // prior call to toWireString().
     77    static PassRefPtr<SerializedScriptValue> createFromWire(String data)
     78    {
     79        return adoptRef(new SerializedScriptValue(data, WireData));
     80    }
     81
     82    // Creates a serialized representation of WebCore string.
     83    static PassRefPtr<SerializedScriptValue> create(String data)
     84    {
     85        return adoptRef(new SerializedScriptValue(data, StringValue));
     86    }
     87
     88    // Creates an empty serialized value.
     89    static PassRefPtr<SerializedScriptValue> create()
     90    {
     91        return adoptRef(new SerializedScriptValue());
     92    }
     93
     94    PassRefPtr<SerializedScriptValue> release()
     95    {
     96        RefPtr<SerializedScriptValue> result = adoptRef(new SerializedScriptValue(m_data, WireData));
     97        m_data = String();
     98        return result.release();
     99    }
    57100
    58101    String toWireString() const { return m_data; }
     
    68111    };
    69112
    70     SerializedScriptValue();
     113    SerializedScriptValue() { }
     114
    71115    SerializedScriptValue(v8::Handle<v8::Value>, bool& didThrow);
     116
    72117    SerializedScriptValue(String data, StringDataMode mode);
    73118
Note: See TracChangeset for help on using the changeset viewer.