Changeset 88860 in webkit
- Timestamp:
- Jun 14, 2011 3:57:22 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r88856 r88860 1 2011-06-14 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Add functions for converting between DataReferences and vectors 6 https://bugs.webkit.org/show_bug.cgi?id=62671 7 8 * Platform/CoreIPC/DataReference.h: 9 (CoreIPC::DataReference::DataReference): 10 New implicit constructor that takes a vector. 11 12 (CoreIPC::DataReference::vector): 13 New function that returns a new vector. 14 15 * Shared/WebBackForwardListItem.cpp: 16 (WebKit::WebBackForwardListItem::encode): 17 Use implicit constructor. 18 19 * WebProcess/WebPage/WebPage.cpp: 20 (WebKit::WebPage::runJavaScriptInMainFrame): 21 Ditto. 22 1 23 2011-06-14 John Sullivan <sullivan@apple.com> 2 24 -
trunk/Source/WebKit2/Platform/CoreIPC/DataReference.h
r74588 r88860 27 27 #define DataReference_h 28 28 29 #include < inttypes.h>29 #include <wtf/Vector.h> 30 30 31 31 namespace CoreIPC { … … 48 48 } 49 49 50 template<size_t inlineCapacity> 51 DataReference(const Vector<uint8_t, inlineCapacity>& vector) 52 : m_data(vector.data()) 53 , m_size(vector.size()) 54 { 55 } 56 50 57 bool isEmpty() const { return size() == 0; } 51 58 … … 56 63 return 0; 57 64 return m_data; 65 } 66 67 Vector<uint8_t> vector() 68 { 69 Vector<uint8_t> result; 70 result.append(m_data, m_size); 71 72 return result; 58 73 } 59 74 -
trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp
r88075 r88860 68 68 encoder.encode(m_title); 69 69 encoder.encode(m_itemID); 70 encoder.encode(CoreIPC::DataReference(m_backForwardData .data(), m_backForwardData.size()));70 encoder.encode(CoreIPC::DataReference(m_backForwardData)); 71 71 } 72 72 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r88856 r88860 1417 1417 JSLock lock(SilenceAssertionsOnly); 1418 1418 if (JSValue resultValue = m_mainFrame->coreFrame()->script()->executeScript(script, true).jsValue()) { 1419 if ((serializedResultValue = SerializedScriptValue::create(m_mainFrame->jsContext(), 1420 toRef(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec(), resultValue), 0))) 1421 dataReference = CoreIPC::DataReference(serializedResultValue->data().data(), serializedResultValue->data().size()); 1419 if ((serializedResultValue = SerializedScriptValue::create(m_mainFrame->jsContext(), toRef(m_mainFrame->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec(), resultValue), 0))) 1420 dataReference = serializedResultValue->data(); 1422 1421 } 1423 1422
Note: See TracChangeset
for help on using the changeset viewer.