Changeset 53347 in webkit


Ignore:
Timestamp:
Jan 15, 2010 2:37:56 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-15 Eric Seidel <eric@webkit.org>

No review, rolling out r53344.
http://trac.webkit.org/changeset/53344
https://bugs.webkit.org/show_bug.cgi?id=32920

Broke the Chromium Mac builder.

  • WebCore.gypi:
  • bindings/scripts/CodeGeneratorV8.pm:
  • bindings/v8/SerializedScriptValue.cpp: Removed.
  • bindings/v8/SerializedScriptValue.h: (WebCore::SerializedScriptValue::create): (WebCore::SerializedScriptValue::release): (WebCore::SerializedScriptValue::toString): (WebCore::SerializedScriptValue::SerializedScriptValue):
  • bindings/v8/custom/V8DOMWindowCustom.cpp: (WebCore::V8DOMWindow::postMessageCallback):
  • bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp: (WebCore::V8DedicatedWorkerContext::postMessageCallback):
  • bindings/v8/custom/V8HistoryCustom.cpp: (WebCore::V8History::pushStateCallback): (WebCore::V8History::replaceStateCallback):
  • bindings/v8/custom/V8MessageEventCustom.cpp: (WebCore::V8MessageEvent::initMessageEventCallback):
  • bindings/v8/custom/V8MessagePortCustom.cpp: (WebCore::V8MessagePort::postMessageCallback):
  • bindings/v8/custom/V8PopStateEventCustom.cpp: (WebCore::V8PopStateEvent::initPopStateEventCallback): (WebCore::V8PopStateEvent::stateAccessorGetter):
  • bindings/v8/custom/V8WorkerCustom.cpp: (WebCore::V8Worker::postMessageCallback):

2010-01-15 Eric Seidel <eric@webkit.org>

No review, rolling out r53344.
http://trac.webkit.org/changeset/53344
https://bugs.webkit.org/show_bug.cgi?id=32920

Broke the Chromium Mac builder.

  • src/PlatformMessagePortChannel.cpp: (WebCore::PlatformMessagePortChannel::postMessageToRemote): (WebCore::PlatformMessagePortChannel::tryGetMessageFromRemote):
  • src/WebWorkerBase.cpp: (WebKit::WebWorkerBase::postMessageToWorkerObject):
  • src/WebWorkerClientImpl.cpp: (WebKit::WebWorkerClientImpl::postMessageToWorkerContext): (WebKit::WebWorkerClientImpl::postMessageToWorkerObjectTask):
  • src/WebWorkerImpl.cpp: (WebKit::WebWorkerImpl::postMessageToWorkerContextTask):
Location:
trunk
Files:
1 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r53346 r53347  
     12010-01-15  Eric Seidel  <eric@webkit.org>
     2
     3        No review, rolling out r53344.
     4        http://trac.webkit.org/changeset/53344
     5        https://bugs.webkit.org/show_bug.cgi?id=32920
     6
     7        Broke the Chromium Mac builder.
     8
     9        * WebCore.gypi:
     10        * bindings/scripts/CodeGeneratorV8.pm:
     11        * bindings/v8/SerializedScriptValue.cpp: Removed.
     12        * bindings/v8/SerializedScriptValue.h:
     13        (WebCore::SerializedScriptValue::create):
     14        (WebCore::SerializedScriptValue::release):
     15        (WebCore::SerializedScriptValue::toString):
     16        (WebCore::SerializedScriptValue::SerializedScriptValue):
     17        * bindings/v8/custom/V8DOMWindowCustom.cpp:
     18        (WebCore::V8DOMWindow::postMessageCallback):
     19        * bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp:
     20        (WebCore::V8DedicatedWorkerContext::postMessageCallback):
     21        * bindings/v8/custom/V8HistoryCustom.cpp:
     22        (WebCore::V8History::pushStateCallback):
     23        (WebCore::V8History::replaceStateCallback):
     24        * bindings/v8/custom/V8MessageEventCustom.cpp:
     25        (WebCore::V8MessageEvent::initMessageEventCallback):
     26        * bindings/v8/custom/V8MessagePortCustom.cpp:
     27        (WebCore::V8MessagePort::postMessageCallback):
     28        * bindings/v8/custom/V8PopStateEventCustom.cpp:
     29        (WebCore::V8PopStateEvent::initPopStateEventCallback):
     30        (WebCore::V8PopStateEvent::stateAccessorGetter):
     31        * bindings/v8/custom/V8WorkerCustom.cpp:
     32        (WebCore::V8Worker::postMessageCallback):
     33
    1342010-01-15  Darin Fisher  <darin@chromium.org>
    235
  • trunk/WebCore/WebCore.gypi

    r53344 r53347  
    796796            'bindings/v8/ScriptValue.cpp',
    797797            'bindings/v8/ScriptValue.h',
    798             'bindings/v8/SerializedScriptValue.cpp',
    799798            'bindings/v8/SerializedScriptValue.h',
    800799            'bindings/v8/specialization/V8BindingDOMWindow.h',
  • trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

    r53344 r53347  
    25652565    if ($type eq "SerializedScriptValue") {
    25662566        $implIncludes{"$type.h"} = 1;
    2567         return "return $value->deserialize()";
     2567        return "return v8String($value->toString())";
    25682568    }
    25692569
  • trunk/WebCore/bindings/v8/SerializedScriptValue.h

    r53344 r53347  
    11/*
    2  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
     2 * Copyright (C) 2009 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    4141class SerializedScriptValue : public RefCounted<SerializedScriptValue> {
    4242public:
    43     // Creates a serialized representation of the given V8 value.
    44     static PassRefPtr<SerializedScriptValue> create(v8::Handle<v8::Value> value)
     43    static PassRefPtr<SerializedScriptValue> create(String string)
    4544    {
    46         return adoptRef(new SerializedScriptValue(value));
     45        return adoptRef(new SerializedScriptValue(string));
    4746    }
    4847
    49     // Creates a serialized value with the given data obtained from a
    50     // prior call to toWireString().
    51     static PassRefPtr<SerializedScriptValue> createFromWire(String data)
    52     {
    53         return adoptRef(new SerializedScriptValue(data, WireData));
    54     }
    55 
    56     // Creates a serialized representation of WebCore string.
    57     static PassRefPtr<SerializedScriptValue> create(String data)
    58     {
    59         return adoptRef(new SerializedScriptValue(data, StringValue));
    60     }
    61 
    62     // Creates an empty serialized value.
    6348    static PassRefPtr<SerializedScriptValue> create()
    6449    {
     
    6853    PassRefPtr<SerializedScriptValue> release()
    6954    {
    70         RefPtr<SerializedScriptValue> result = adoptRef(new SerializedScriptValue(m_data, WireData));
     55        RefPtr<SerializedScriptValue> result = adoptRef(new SerializedScriptValue(m_data));
    7156        m_data = String();
    7257        return result.release();
    7358    }
    7459
    75     String toWireString() const { return m_data; }
    76 
    77     // Deserializes the value (in the current context). Returns an
    78     // empty handle in case of failure.
    79     v8::Local<v8::Value> deserialize();
     60    String toString()
     61    {
     62        return m_data;
     63    }
    8064
    8165private:
    82     enum StringDataMode {
    83         StringValue,
    84         WireData
    85     };
     66    SerializedScriptValue(String string)
     67        : m_data(string)
     68    {
     69    }
    8670
    8771    SerializedScriptValue() { }
    88 
    89     explicit SerializedScriptValue(v8::Handle<v8::Value>);
    90 
    91     SerializedScriptValue(String data, StringDataMode mode);
    92 
    9372    String m_data;
    9473};
  • trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

    r53344 r53347  
    412412
    413413    v8::TryCatch tryCatch;
    414     RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(args[0]);
     414    RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(toWebCoreString(args[0]));
    415415    MessagePortArray portArray;
    416416    String targetOrigin;
  • trunk/WebCore/bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp

    r53344 r53347  
    4747    INC_STATS(L"DOM.DedicatedWorkerContext.postMessage");
    4848    DedicatedWorkerContext* workerContext = V8DedicatedWorkerContext::toNative(args.Holder());
    49     RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(args[0]);
     49    RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(v8ValueToWebCoreString(args[0]));
    5050    MessagePortArray portArray;
    5151    if (args.Length() > 1) {
  • trunk/WebCore/bindings/v8/custom/V8HistoryCustom.cpp

    r53344 r53347  
    4444v8::Handle<v8::Value> V8History::pushStateCallback(const v8::Arguments& args)
    4545{
    46     RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(args[0]);
     46    RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(toWebCoreString(args[0]));
    4747
    4848    v8::TryCatch tryCatch;
     
    6565v8::Handle<v8::Value> V8History::replaceStateCallback(const v8::Arguments& args)
    6666{
    67     RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(args[0]);
     67    RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(toWebCoreString(args[0]));
    6868
    6969    v8::TryCatch tryCatch;
  • trunk/WebCore/bindings/v8/custom/V8MessageEventCustom.cpp

    r53344 r53347  
    6666    bool canBubbleArg = args[1]->BooleanValue();
    6767    bool cancelableArg = args[2]->BooleanValue();
    68     RefPtr<SerializedScriptValue> dataArg = SerializedScriptValue::create(args[3]);
     68    RefPtr<SerializedScriptValue> dataArg = SerializedScriptValue::create(v8ValueToWebCoreString(args[3]));
    6969    String originArg = v8ValueToWebCoreString(args[4]);
    7070    String lastEventIdArg = v8ValueToWebCoreString(args[5]);
  • trunk/WebCore/bindings/v8/custom/V8MessagePortCustom.cpp

    r53344 r53347  
    7979    INC_STATS("DOM.MessagePort.postMessage");
    8080    MessagePort* messagePort = V8MessagePort::toNative(args.Holder());
    81     RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(args[0]);
     81    RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(toWebCoreString(args[0]));
    8282    MessagePortArray portArray;
    8383    if (args.Length() > 1) {
  • trunk/WebCore/bindings/v8/custom/V8PopStateEventCustom.cpp

    r53344 r53347  
    4545    bool canBubbleArg = args[1]->BooleanValue();
    4646    bool cancelableArg = args[2]->BooleanValue();
    47     RefPtr<SerializedScriptValue> stateArg = SerializedScriptValue::create(args[3]);
     47    RefPtr<SerializedScriptValue> stateArg = SerializedScriptValue::create(v8ValueToWebCoreString(args[3]));
    4848
    4949    PopStateEvent* event = V8PopStateEvent::toNative(args.Holder());
     
    6262        return v8::Null();
    6363
    64     return state->deserialize();
     64    return v8StringOrNull(state->toString());
    6565}
    6666
  • trunk/WebCore/bindings/v8/custom/V8WorkerCustom.cpp

    r53344 r53347  
    9393    INC_STATS("DOM.Worker.postMessage");
    9494    Worker* worker = V8Worker::toNative(args.Holder());
    95     RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(args[0]);
     95    RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(toWebCoreString(args[0]));
    9696    MessagePortArray portArray;
    9797    if (args.Length() > 1) {
  • trunk/WebKit/chromium/ChangeLog

    r53344 r53347  
     12010-01-15  Eric Seidel  <eric@webkit.org>
     2
     3        No review, rolling out r53344.
     4        http://trac.webkit.org/changeset/53344
     5        https://bugs.webkit.org/show_bug.cgi?id=32920
     6
     7        Broke the Chromium Mac builder.
     8
     9        * src/PlatformMessagePortChannel.cpp:
     10        (WebCore::PlatformMessagePortChannel::postMessageToRemote):
     11        (WebCore::PlatformMessagePortChannel::tryGetMessageFromRemote):
     12        * src/WebWorkerBase.cpp:
     13        (WebKit::WebWorkerBase::postMessageToWorkerObject):
     14        * src/WebWorkerClientImpl.cpp:
     15        (WebKit::WebWorkerClientImpl::postMessageToWorkerContext):
     16        (WebKit::WebWorkerClientImpl::postMessageToWorkerObjectTask):
     17        * src/WebWorkerImpl.cpp:
     18        (WebKit::WebWorkerImpl::postMessageToWorkerContextTask):
     19
    1202010-01-15  Vitaly Repeshko  <vitalyr@chromium.org>
    221
  • trunk/WebKit/chromium/src/PlatformMessagePortChannel.cpp

    r53344 r53347  
    180180        return;
    181181
    182     WebString messageString = message->message()->toWireString();
     182    WebString messageString = message->message()->toString();
    183183    OwnPtr<WebCore::MessagePortChannelArray> channels = message->channels();
    184184    WebMessagePortChannelArray* webChannels = 0;
     
    212212            }
    213213        }
    214         RefPtr<SerializedScriptValue> serializedMessage = SerializedScriptValue::createFromWire(message);
     214        RefPtr<SerializedScriptValue> serializedMessage = SerializedScriptValue::create(message);
    215215        result = MessagePortChannel::EventData::create(serializedMessage.release(), channels.release());
    216216    }
  • trunk/WebKit/chromium/src/WebWorkerBase.cpp

    r53344 r53347  
    158158{
    159159    dispatchTaskToMainThread(createCallbackTask(&postMessageTask, this,
    160                                                 message->toWireString(), channels));
     160                                                message->toString(), channels));
    161161}
    162162
  • trunk/WebKit/chromium/src/WebWorkerClientImpl.cpp

    r53344 r53347  
    174174        WebWorkerBase::dispatchTaskToMainThread(createCallbackTask(&postMessageToWorkerContextTask,
    175175                                                                   this,
    176                                                                    message->toWireString(),
     176                                                                   message->toString(),
    177177                                                                   channels));
    178178        return;
     
    185185        webChannels[i] = webchannel;
    186186    }
    187     m_webWorker->postMessageToWorkerContext(message->toWireString(), webChannels);
     187    m_webWorker->postMessageToWorkerContext(message->toString(), webChannels);
    188188}
    189189
     
    357357            MessagePort::entanglePorts(*context, channels.release());
    358358        RefPtr<SerializedScriptValue> serializedMessage =
    359             SerializedScriptValue::createFromWire(message);
     359            SerializedScriptValue::create(message);
    360360        thisPtr->m_worker->dispatchEvent(MessageEvent::create(ports.release(),
    361361                                                              serializedMessage.release()));
  • trunk/WebKit/chromium/src/WebWorkerImpl.cpp

    r53344 r53347  
    8989        MessagePort::entanglePorts(*context, channels.release());
    9090    RefPtr<SerializedScriptValue> serializedMessage =
    91         SerializedScriptValue::createFromWire(message);
     91        SerializedScriptValue::create(message);
    9292    workerContext->dispatchEvent(MessageEvent::create(
    9393        ports.release(), serializedMessage.release()));
Note: See TracChangeset for help on using the changeset viewer.