Changeset 53347 in webkit
- Timestamp:
- Jan 15, 2010 2:37:56 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r53346 r53347 1 2010-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 1 34 2010-01-15 Darin Fisher <darin@chromium.org> 2 35 -
trunk/WebCore/WebCore.gypi
r53344 r53347 796 796 'bindings/v8/ScriptValue.cpp', 797 797 'bindings/v8/ScriptValue.h', 798 'bindings/v8/SerializedScriptValue.cpp',799 798 'bindings/v8/SerializedScriptValue.h', 800 799 'bindings/v8/specialization/V8BindingDOMWindow.h', -
trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm
r53344 r53347 2565 2565 if ($type eq "SerializedScriptValue") { 2566 2566 $implIncludes{"$type.h"} = 1; 2567 return "return $value->deserialize()";2567 return "return v8String($value->toString())"; 2568 2568 } 2569 2569 -
trunk/WebCore/bindings/v8/SerializedScriptValue.h
r53344 r53347 1 1 /* 2 * Copyright (C) 2009 , 2010Google Inc. All rights reserved.2 * Copyright (C) 2009 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 41 41 class SerializedScriptValue : public RefCounted<SerializedScriptValue> { 42 42 public: 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) 45 44 { 46 return adoptRef(new SerializedScriptValue( value));45 return adoptRef(new SerializedScriptValue(string)); 47 46 } 48 47 49 // Creates a serialized value with the given data obtained from a50 // 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.63 48 static PassRefPtr<SerializedScriptValue> create() 64 49 { … … 68 53 PassRefPtr<SerializedScriptValue> release() 69 54 { 70 RefPtr<SerializedScriptValue> result = adoptRef(new SerializedScriptValue(m_data , WireData));55 RefPtr<SerializedScriptValue> result = adoptRef(new SerializedScriptValue(m_data)); 71 56 m_data = String(); 72 57 return result.release(); 73 58 } 74 59 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 } 80 64 81 65 private: 82 enum StringDataMode {83 StringValue,84 WireData85 } ;66 SerializedScriptValue(String string) 67 : m_data(string) 68 { 69 } 86 70 87 71 SerializedScriptValue() { } 88 89 explicit SerializedScriptValue(v8::Handle<v8::Value>);90 91 SerializedScriptValue(String data, StringDataMode mode);92 93 72 String m_data; 94 73 }; -
trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
r53344 r53347 412 412 413 413 v8::TryCatch tryCatch; 414 RefPtr<SerializedScriptValue> message = SerializedScriptValue::create( args[0]);414 RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(toWebCoreString(args[0])); 415 415 MessagePortArray portArray; 416 416 String targetOrigin; -
trunk/WebCore/bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp
r53344 r53347 47 47 INC_STATS(L"DOM.DedicatedWorkerContext.postMessage"); 48 48 DedicatedWorkerContext* workerContext = V8DedicatedWorkerContext::toNative(args.Holder()); 49 RefPtr<SerializedScriptValue> message = SerializedScriptValue::create( args[0]);49 RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(v8ValueToWebCoreString(args[0])); 50 50 MessagePortArray portArray; 51 51 if (args.Length() > 1) { -
trunk/WebCore/bindings/v8/custom/V8HistoryCustom.cpp
r53344 r53347 44 44 v8::Handle<v8::Value> V8History::pushStateCallback(const v8::Arguments& args) 45 45 { 46 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create( args[0]);46 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(toWebCoreString(args[0])); 47 47 48 48 v8::TryCatch tryCatch; … … 65 65 v8::Handle<v8::Value> V8History::replaceStateCallback(const v8::Arguments& args) 66 66 { 67 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create( args[0]);67 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(toWebCoreString(args[0])); 68 68 69 69 v8::TryCatch tryCatch; -
trunk/WebCore/bindings/v8/custom/V8MessageEventCustom.cpp
r53344 r53347 66 66 bool canBubbleArg = args[1]->BooleanValue(); 67 67 bool cancelableArg = args[2]->BooleanValue(); 68 RefPtr<SerializedScriptValue> dataArg = SerializedScriptValue::create( args[3]);68 RefPtr<SerializedScriptValue> dataArg = SerializedScriptValue::create(v8ValueToWebCoreString(args[3])); 69 69 String originArg = v8ValueToWebCoreString(args[4]); 70 70 String lastEventIdArg = v8ValueToWebCoreString(args[5]); -
trunk/WebCore/bindings/v8/custom/V8MessagePortCustom.cpp
r53344 r53347 79 79 INC_STATS("DOM.MessagePort.postMessage"); 80 80 MessagePort* messagePort = V8MessagePort::toNative(args.Holder()); 81 RefPtr<SerializedScriptValue> message = SerializedScriptValue::create( args[0]);81 RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(toWebCoreString(args[0])); 82 82 MessagePortArray portArray; 83 83 if (args.Length() > 1) { -
trunk/WebCore/bindings/v8/custom/V8PopStateEventCustom.cpp
r53344 r53347 45 45 bool canBubbleArg = args[1]->BooleanValue(); 46 46 bool cancelableArg = args[2]->BooleanValue(); 47 RefPtr<SerializedScriptValue> stateArg = SerializedScriptValue::create( args[3]);47 RefPtr<SerializedScriptValue> stateArg = SerializedScriptValue::create(v8ValueToWebCoreString(args[3])); 48 48 49 49 PopStateEvent* event = V8PopStateEvent::toNative(args.Holder()); … … 62 62 return v8::Null(); 63 63 64 return state->deserialize();64 return v8StringOrNull(state->toString()); 65 65 } 66 66 -
trunk/WebCore/bindings/v8/custom/V8WorkerCustom.cpp
r53344 r53347 93 93 INC_STATS("DOM.Worker.postMessage"); 94 94 Worker* worker = V8Worker::toNative(args.Holder()); 95 RefPtr<SerializedScriptValue> message = SerializedScriptValue::create( args[0]);95 RefPtr<SerializedScriptValue> message = SerializedScriptValue::create(toWebCoreString(args[0])); 96 96 MessagePortArray portArray; 97 97 if (args.Length() > 1) { -
trunk/WebKit/chromium/ChangeLog
r53344 r53347 1 2010-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 1 20 2010-01-15 Vitaly Repeshko <vitalyr@chromium.org> 2 21 -
trunk/WebKit/chromium/src/PlatformMessagePortChannel.cpp
r53344 r53347 180 180 return; 181 181 182 WebString messageString = message->message()->to WireString();182 WebString messageString = message->message()->toString(); 183 183 OwnPtr<WebCore::MessagePortChannelArray> channels = message->channels(); 184 184 WebMessagePortChannelArray* webChannels = 0; … … 212 212 } 213 213 } 214 RefPtr<SerializedScriptValue> serializedMessage = SerializedScriptValue::create FromWire(message);214 RefPtr<SerializedScriptValue> serializedMessage = SerializedScriptValue::create(message); 215 215 result = MessagePortChannel::EventData::create(serializedMessage.release(), channels.release()); 216 216 } -
trunk/WebKit/chromium/src/WebWorkerBase.cpp
r53344 r53347 158 158 { 159 159 dispatchTaskToMainThread(createCallbackTask(&postMessageTask, this, 160 message->to WireString(), channels));160 message->toString(), channels)); 161 161 } 162 162 -
trunk/WebKit/chromium/src/WebWorkerClientImpl.cpp
r53344 r53347 174 174 WebWorkerBase::dispatchTaskToMainThread(createCallbackTask(&postMessageToWorkerContextTask, 175 175 this, 176 message->to WireString(),176 message->toString(), 177 177 channels)); 178 178 return; … … 185 185 webChannels[i] = webchannel; 186 186 } 187 m_webWorker->postMessageToWorkerContext(message->to WireString(), webChannels);187 m_webWorker->postMessageToWorkerContext(message->toString(), webChannels); 188 188 } 189 189 … … 357 357 MessagePort::entanglePorts(*context, channels.release()); 358 358 RefPtr<SerializedScriptValue> serializedMessage = 359 SerializedScriptValue::create FromWire(message);359 SerializedScriptValue::create(message); 360 360 thisPtr->m_worker->dispatchEvent(MessageEvent::create(ports.release(), 361 361 serializedMessage.release())); -
trunk/WebKit/chromium/src/WebWorkerImpl.cpp
r53344 r53347 89 89 MessagePort::entanglePorts(*context, channels.release()); 90 90 RefPtr<SerializedScriptValue> serializedMessage = 91 SerializedScriptValue::create FromWire(message);91 SerializedScriptValue::create(message); 92 92 workerContext->dispatchEvent(MessageEvent::create( 93 93 ports.release(), serializedMessage.release()));
Note: See TracChangeset
for help on using the changeset viewer.