Title: [141209] trunk/Source/WebKit2
Revision
141209
Author
[email protected]
Date
2013-01-29 19:29:27 -0800 (Tue, 29 Jan 2013)

Log Message

Replace unnecessary ArgumentDecoder member functions with decode overloads
https://bugs.webkit.org/show_bug.cgi?id=102013

Reviewed by Anders Carlsson.

* Platform/CoreIPC/ArgumentCoders.cpp:
(CoreIPC::::decode):
* Platform/CoreIPC/ArgumentCoders.h:
* Platform/CoreIPC/ArgumentDecoder.cpp:
(CoreIPC::ArgumentDecoder::decodeVariableLengthByteArray):
(CoreIPC::ArgumentDecoder::decode):
* Platform/CoreIPC/ArgumentDecoder.h:
(ArgumentDecoder):
(CoreIPC::ArgumentDecoder::decodeEnum):
(CoreIPC):
* Platform/CoreIPC/Connection.cpp:
(CoreIPC::Connection::dispatchSyncMessage):
* Platform/CoreIPC/MessageDecoder.cpp:
(CoreIPC::MessageDecoder::MessageDecoder):
* Platform/mac/SharedMemoryMac.cpp:
(WebKit::SharedMemory::Handle::decode):
* Platform/win/SharedMemoryWin.cpp:
(WebKit::SharedMemory::Handle::decode):
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(CoreIPC::::decode):
(CoreIPC::decodeTimingFunction):
* Shared/DictionaryPopupInfo.cpp:
(WebKit::DictionaryPopupInfo::decode):
* Shared/UserMessageCoders.h:
(WebKit::UserMessageDecoder::baseDecode):
* Shared/cf/ArgumentCodersCF.cpp:
(CoreIPC::decode):
* Shared/mac/ArgumentCodersMac.mm:
(CoreIPC::decode):
* Shared/mac/ObjCObjectGraphCoders.mm:
(WebKit::ObjCObjectGraphDecoder::baseDecode):
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::SandboxExtension::HandleArray::decode):
* Shared/mac/SecItemRequestData.cpp:
(WebKit::SecItemRequestData::decode):
* Shared/mac/SecItemResponseData.cpp:
(WebKit::SecItemResponseData::decode):
* Shared/qt/ArgumentCodersQt.cpp:
(CoreIPC::::decode):
* Shared/qt/QtNetworkReplyData.cpp:
(WebKit::QtNetworkReplyData::decode):
* WebProcess/WebPage/DecoderAdapter.cpp:
(WebKit::DecoderAdapter::decodeBool):
(WebKit::DecoderAdapter::decodeUInt16):
(WebKit::DecoderAdapter::decodeUInt32):
(WebKit::DecoderAdapter::decodeUInt64):
(WebKit::DecoderAdapter::decodeInt32):
(WebKit::DecoderAdapter::decodeInt64):
(WebKit::DecoderAdapter::decodeFloat):
(WebKit::DecoderAdapter::decodeDouble):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (141208 => 141209)


--- trunk/Source/WebKit2/ChangeLog	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-30 03:29:27 UTC (rev 141209)
@@ -1,3 +1,61 @@
+2013-01-29  Sam Weinig  <[email protected]>
+
+        Replace unnecessary ArgumentDecoder member functions with decode overloads
+        https://bugs.webkit.org/show_bug.cgi?id=102013
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/CoreIPC/ArgumentCoders.cpp:
+        (CoreIPC::::decode):
+        * Platform/CoreIPC/ArgumentCoders.h:
+        * Platform/CoreIPC/ArgumentDecoder.cpp:
+        (CoreIPC::ArgumentDecoder::decodeVariableLengthByteArray):
+        (CoreIPC::ArgumentDecoder::decode):
+        * Platform/CoreIPC/ArgumentDecoder.h:
+        (ArgumentDecoder):
+        (CoreIPC::ArgumentDecoder::decodeEnum):
+        (CoreIPC):
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::dispatchSyncMessage):
+        * Platform/CoreIPC/MessageDecoder.cpp:
+        (CoreIPC::MessageDecoder::MessageDecoder):
+        * Platform/mac/SharedMemoryMac.cpp:
+        (WebKit::SharedMemory::Handle::decode):
+        * Platform/win/SharedMemoryWin.cpp:
+        (WebKit::SharedMemory::Handle::decode):
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+        (CoreIPC::::decode):
+        (CoreIPC::decodeTimingFunction):
+        * Shared/DictionaryPopupInfo.cpp:
+        (WebKit::DictionaryPopupInfo::decode):
+        * Shared/UserMessageCoders.h:
+        (WebKit::UserMessageDecoder::baseDecode):
+        * Shared/cf/ArgumentCodersCF.cpp:
+        (CoreIPC::decode):
+        * Shared/mac/ArgumentCodersMac.mm:
+        (CoreIPC::decode):
+        * Shared/mac/ObjCObjectGraphCoders.mm:
+        (WebKit::ObjCObjectGraphDecoder::baseDecode):
+        * Shared/mac/SandboxExtensionMac.mm:
+        (WebKit::SandboxExtension::HandleArray::decode):
+        * Shared/mac/SecItemRequestData.cpp:
+        (WebKit::SecItemRequestData::decode):
+        * Shared/mac/SecItemResponseData.cpp:
+        (WebKit::SecItemResponseData::decode):
+        * Shared/qt/ArgumentCodersQt.cpp:
+        (CoreIPC::::decode):
+        * Shared/qt/QtNetworkReplyData.cpp:
+        (WebKit::QtNetworkReplyData::decode):
+        * WebProcess/WebPage/DecoderAdapter.cpp:
+        (WebKit::DecoderAdapter::decodeBool):
+        (WebKit::DecoderAdapter::decodeUInt16):
+        (WebKit::DecoderAdapter::decodeUInt32):
+        (WebKit::DecoderAdapter::decodeUInt64):
+        (WebKit::DecoderAdapter::decodeInt32):
+        (WebKit::DecoderAdapter::decodeInt64):
+        (WebKit::DecoderAdapter::decodeFloat):
+        (WebKit::DecoderAdapter::decodeDouble):
+
 2013-01-29  Gyuyoung Kim  <[email protected]>
 
         [WK2] Adjust missing MessageID removals to fix build breaks

Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -139,7 +139,7 @@
 
     bool is8Bit;
 
-    if (!decoder->decodeBool(is8Bit))
+    if (!decoder->decode(is8Bit))
         return false;
 
     if (is8Bit)

Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h (141208 => 141209)


--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h	2013-01-30 03:29:27 UTC (rev 141209)
@@ -106,7 +106,7 @@
     static bool decode(ArgumentDecoder* decoder, Vector<T>& vector)
     {
         uint64_t size;
-        if (!decoder->decodeUInt64(size))
+        if (!decoder->decode(size))
             return false;
 
         Vector<T> tmp;
@@ -134,7 +134,7 @@
     static bool decode(ArgumentDecoder* decoder, Vector<T>& vector)
     {
         uint64_t size;
-        if (!decoder->decodeUInt64(size))
+        if (!decoder->decode(size))
             return false;
 
         // Since we know the total size of the elements, we can allocate the vector in

Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -116,7 +116,7 @@
 bool ArgumentDecoder::decodeVariableLengthByteArray(DataReference& dataReference)
 {
     uint64_t size;
-    if (!decodeUInt64(size))
+    if (!decode(size))
         return false;
     
     if (!alignBufferPosition(1, size))
@@ -129,7 +129,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeBool(bool& result)
+bool ArgumentDecoder::decode(bool& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -139,7 +139,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeUInt8(uint8_t& result)
+bool ArgumentDecoder::decode(uint8_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -149,7 +149,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeUInt16(uint16_t& result)
+bool ArgumentDecoder::decode(uint16_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -159,7 +159,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeUInt32(uint32_t& result)
+bool ArgumentDecoder::decode(uint32_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -169,7 +169,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeUInt64(uint64_t& result)
+bool ArgumentDecoder::decode(uint64_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -179,7 +179,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeInt32(int32_t& result)
+bool ArgumentDecoder::decode(int32_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -189,7 +189,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeInt64(int64_t& result)
+bool ArgumentDecoder::decode(int64_t& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -199,7 +199,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeFloat(float& result)
+bool ArgumentDecoder::decode(float& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;
@@ -209,7 +209,7 @@
     return true;
 }
 
-bool ArgumentDecoder::decodeDouble(double& result)
+bool ArgumentDecoder::decode(double& result)
 {
     if (!alignBufferPosition(sizeof(result), sizeof(result)))
         return false;

Modified: trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h (141208 => 141209)


--- trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h	2013-01-30 03:29:27 UTC (rev 141209)
@@ -52,22 +52,22 @@
     // The data in the data reference here will only be valid for the lifetime of the ArgumentDecoder object.
     bool decodeVariableLengthByteArray(DataReference&);
 
-    bool decodeBool(bool&);
-    bool decodeUInt8(uint8_t&);
-    bool decodeUInt16(uint16_t&);
-    bool decodeUInt32(uint32_t&);
-    bool decodeUInt64(uint64_t&);
-    bool decodeInt32(int32_t&);
-    bool decodeInt64(int64_t&);
-    bool decodeFloat(float&);
-    bool decodeDouble(double&);
+    bool decode(bool&);
+    bool decode(uint8_t&);
+    bool decode(uint16_t&);
+    bool decode(uint32_t&);
+    bool decode(uint64_t&);
+    bool decode(int32_t&);
+    bool decode(int64_t&);
+    bool decode(float&);
+    bool decode(double&);
 
     template<typename T> bool decodeEnum(T& result)
     {
         COMPILE_ASSERT(sizeof(T) <= sizeof(uint64_t), enum_type_must_not_be_larger_than_64_bits);
 
         uint64_t value;
-        if (!decodeUInt64(value))
+        if (!decode(value))
             return false;
         
         result = static_cast<T>(value);
@@ -118,51 +118,6 @@
     Deque<Attachment> m_attachments;
 };
 
-template<> inline bool ArgumentDecoder::decode(bool& n)
-{
-    return decodeBool(n);
-}
-
-template<> inline bool ArgumentDecoder::decode(uint8_t& n)
-{
-    return decodeUInt8(n);
-}
-
-template<> inline bool ArgumentDecoder::decode(uint16_t& n)
-{
-    return decodeUInt16(n);
-}
-
-template<> inline bool ArgumentDecoder::decode(uint32_t& n)
-{
-    return decodeUInt32(n);
-}
-
-template<> inline bool ArgumentDecoder::decode(uint64_t& n)
-{
-    return decodeUInt64(n);
-}
-
-template<> inline bool ArgumentDecoder::decode(int32_t& n)
-{
-    return decodeInt32(n);
-}
-
-template<> inline bool ArgumentDecoder::decode(int64_t& n)
-{
-    return decodeInt64(n);
-}
-
-template<> inline bool ArgumentDecoder::decode(float& n)
-{
-    return decodeFloat(n);
-}
-
-template<> inline bool ArgumentDecoder::decode(double& n)
-{
-    return decodeDouble(n);
-}
-
 } // namespace CoreIPC
 
 #endif // ArgumentDecoder_h

Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -687,7 +687,7 @@
     ASSERT(decoder.isSyncMessage());
 
     uint64_t syncRequestID = 0;
-    if (!decoder.decodeUInt64(syncRequestID) || !syncRequestID) {
+    if (!decoder.decode(syncRequestID) || !syncRequestID) {
         // We received an invalid sync message.
         decoder.markInvalid();
         return;

Modified: trunk/Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -51,7 +51,7 @@
 MessageDecoder::MessageDecoder(const DataReference& buffer, Deque<Attachment>& attachments)
     : ArgumentDecoder(buffer.data(), buffer.size(), attachments)
 {
-    if (!decodeUInt8(m_messageFlags))
+    if (!decode(m_messageFlags))
         return;
 
     if (!decode(m_messageReceiverName))
@@ -60,7 +60,7 @@
     if (!decode(m_messageName))
         return;
 
-    decodeUInt64(m_destinationID);
+    decode(m_destinationID);
 }
 
 bool MessageDecoder::isSyncMessage() const

Modified: trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -68,7 +68,7 @@
     ASSERT(!handle.m_size);
 
     uint64_t size;
-    if (!decoder->decodeUInt64(size))
+    if (!decoder->decode(size))
         return false;
 
     CoreIPC::MachPort machPort;

Modified: trunk/Source/WebKit2/Platform/win/SharedMemoryWin.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Platform/win/SharedMemoryWin.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Platform/win/SharedMemoryWin.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -90,15 +90,15 @@
     ASSERT_ARG(handle, !handle.m_size);
 
     uint64_t size;
-    if (!decoder->decodeUInt64(size))
+    if (!decoder->decode(size))
         return false;
 
     uint64_t sourceHandle;
-    if (!decoder->decodeUInt64(sourceHandle))
+    if (!decoder->decode(sourceHandle))
         return false;
 
     uint32_t sourcePID;
-    if (!decoder->decodeUInt32(sourcePID))
+    if (!decoder->decode(sourcePID))
         return false;
 
     HANDLE duplicatedHandle;

Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -200,7 +200,7 @@
 bool ArgumentCoder<WebCore::FilterOperations>::decode(ArgumentDecoder* decoder, WebCore::FilterOperations& filters)
 {
     uint32_t size;
-    if (!decoder->decodeUInt32(size))
+    if (!decoder->decode(size))
         return false;
 
     Vector<RefPtr<FilterOperation> >& operations = filters.operations();
@@ -217,7 +217,7 @@
         case FilterOperation::SATURATE:
         case FilterOperation::HUE_ROTATE: {
             double value;
-            if (!decoder->decodeDouble(value))
+            if (!decoder->decode(value))
                 return false;
             filter = BasicColorMatrixFilterOperation::create(value, type);
             break;
@@ -227,7 +227,7 @@
         case FilterOperation::CONTRAST:
         case FilterOperation::OPACITY: {
             double value;
-            if (!decoder->decodeDouble(value))
+            if (!decoder->decode(value))
                 return false;
             filter = BasicComponentTransferFilterOperation::create(value, type);
             break;
@@ -245,7 +245,7 @@
             Color color;
             if (!ArgumentCoder<IntPoint>::decode(decoder, location))
                 return false;
-            if (!decoder->decodeInt32(stdDeviation))
+            if (!decoder->decode(stdDeviation))
                 return false;
             if (!ArgumentCoder<Color>::decode(decoder, color))
                 return false;
@@ -268,7 +268,7 @@
                 return false;
 
             uint32_t parametersSize;
-            if (!decoder->decodeUInt32(parametersSize))
+            if (!decoder->decode(parametersSize))
                 return false;
 
             CustomFilterParameterList parameters(parametersSize);
@@ -284,7 +284,7 @@
                 case CustomFilterParameter::ARRAY: {
                     RefPtr<CustomFilterArrayParameter> arrayParameter = CustomFilterArrayParameter::create(name);
                     uint32_t arrayParameterSize;
-                    if (!decoder->decodeUInt32(arrayParameterSize))
+                    if (!decoder->decode(arrayParameterSize))
                         return false;
                     double arrayParameterValue;
                     for (size_t j = 0; j < arrayParameterSize; ++j) {
@@ -298,7 +298,7 @@
                 case CustomFilterParameter::NUMBER: {
                     RefPtr<CustomFilterNumberParameter> numberParameter = CustomFilterNumberParameter::create(name);
                     uint32_t numberParameterSize;
-                    if (!decoder->decodeUInt32(numberParameterSize))
+                    if (!decoder->decode(numberParameterSize))
                         return false;
                     double numberParameterValue;
                     for (size_t j = 0; j < numberParameterSize; ++j) {
@@ -443,7 +443,7 @@
 bool ArgumentCoder<TransformOperations>::decode(ArgumentDecoder* decoder, TransformOperations& transformOperations)
 {
     uint32_t operationsSize;
-    if (!decoder->decodeUInt32(operationsSize))
+    if (!decoder->decode(operationsSize))
         return false;
 
     for (size_t i = 0; i < operationsSize; ++i) {
@@ -596,13 +596,13 @@
             timingFunction = CubicBezierTimingFunction::create(bezierPreset);
             return true;
         }
-        if (!decoder->decodeDouble(x1))
+        if (!decoder->decode(x1))
             return false;
-        if (!decoder->decodeDouble(y1))
+        if (!decoder->decode(y1))
             return false;
-        if (!decoder->decodeDouble(x2))
+        if (!decoder->decode(x2))
             return false;
-        if (!decoder->decodeDouble(y2))
+        if (!decoder->decode(y2))
             return false;
 
         timingFunction = CubicBezierTimingFunction::create(x1, y1, x2, y2);
@@ -611,9 +611,9 @@
     case TimingFunction::StepsFunction: {
         uint32_t numberOfSteps;
         bool stepAtStart;
-        if (!decoder->decodeUInt32(numberOfSteps))
+        if (!decoder->decode(numberOfSteps))
             return false;
-        if (!decoder->decodeBool(stepAtStart))
+        if (!decoder->decode(stepAtStart))
             return false;
 
         timingFunction = StepsTimingFunction::create(numberOfSteps, stepAtStart);
@@ -687,19 +687,19 @@
         return false;
     if (!decoder->decodeEnum(state))
         return false;
-    if (!decoder->decodeDouble(startTime))
+    if (!decoder->decode(startTime))
         return false;
-    if (!decoder->decodeDouble(pauseTime))
+    if (!decoder->decode(pauseTime))
         return false;
-    if (!decoder->decodeBool(listsMatch))
+    if (!decoder->decode(listsMatch))
         return false;
     if (!decoder->decodeEnum(direction))
         return false;
-    if (!decoder->decodeUInt32(fillMode))
+    if (!decoder->decode(fillMode))
         return false;
-    if (!decoder->decodeDouble(duration))
+    if (!decoder->decode(duration))
         return false;
-    if (!decoder->decodeDouble(iterationCount))
+    if (!decoder->decode(iterationCount))
         return false;
     if (!decodeTimingFunction(decoder, timingFunction))
         return false;
@@ -717,7 +717,7 @@
         return false;
     KeyframeValueList keyframes(property);
     unsigned keyframesSize;
-    if (!decoder->decodeUInt32(keyframesSize))
+    if (!decoder->decode(keyframesSize))
         return false;
     for (unsigned i = 0; i < keyframesSize; ++i) {
         float keyTime;
@@ -730,7 +730,7 @@
         switch (property) {
         case AnimatedPropertyOpacity: {
             float value;
-            if (!decoder->decodeFloat(value))
+            if (!decoder->decode(value))
                 return false;
             keyframes.insert(new FloatAnimationValue(keyTime, value, timingFunction));
             break;

Modified: trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -55,7 +55,7 @@
         return false;
 #if PLATFORM(MAC)
     bool hadOptions;
-    if (!decoder->decodeBool(hadOptions))
+    if (!decoder->decode(hadOptions))
         return false;
     if (hadOptions) {
         if (!CoreIPC::decode(decoder, result.options))

Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (141208 => 141209)


--- trunk/Source/WebKit2/Shared/UserMessageCoders.h	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h	2013-01-30 03:29:27 UTC (rev 141209)
@@ -399,13 +399,13 @@
                 return false;
             if (renderer->type() != APIObject::TypeRenderObject)
                 return false;
-            if (!decoder->decodeBool(isReflection))
+            if (!decoder->decode(isReflection))
                 return false;
-            if (!decoder->decodeBool(isClipping))
+            if (!decoder->decode(isClipping))
                 return false;
-            if (!decoder->decodeBool(isClipped))
+            if (!decoder->decode(isClipped))
                 return false;
-            if (!decoder->decodeUInt32(compositingLayerTypeAsUInt32))
+            if (!decoder->decode(compositingLayerTypeAsUInt32))
                 return false;
             if (!decoder->decode(absoluteBoundingBox))
                 return false;

Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -259,7 +259,7 @@
 bool decode(ArgumentDecoder* decoder, RetainPtr<CFArrayRef>& result)
 {
     uint64_t size;
-    if (!decoder->decodeUInt64(size))
+    if (!decoder->decode(size))
         return false;
 
     RetainPtr<CFMutableArrayRef> array(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
@@ -317,7 +317,7 @@
 bool decode(ArgumentDecoder* decoder, RetainPtr<CFDateRef>& result)
 {
     double absoluteTime;
-    if (!decoder->decodeDouble(absoluteTime))
+    if (!decoder->decode(absoluteTime))
         return false;
 
     result.adoptCF(CFDateCreate(0, absoluteTime));
@@ -351,7 +351,7 @@
 bool decode(ArgumentDecoder* decoder, RetainPtr<CFDictionaryRef>& result)
 {
     uint64_t size;
-    if (!decoder->decodeUInt64(size))
+    if (!decoder->decode(size))
         return false;
 
     RetainPtr<CFMutableDictionaryRef> dictionary(AdoptCF, CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
@@ -507,7 +507,7 @@
 {
     RetainPtr<CFURLRef> baseURL;
     bool hasBaseURL;
-    if (!decoder->decodeBool(hasBaseURL))
+    if (!decoder->decode(hasBaseURL))
         return false;
     if (hasBaseURL) {
         if (!decode(decoder, baseURL))

Modified: trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm (141208 => 141209)


--- trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm	2013-01-30 03:29:27 UTC (rev 141209)
@@ -327,7 +327,7 @@
 bool decode(ArgumentDecoder* decoder, RetainPtr<NSDictionary>& result)
 {
     uint64_t size;
-    if (!decoder->decodeUInt64(size))
+    if (!decoder->decode(size))
         return false;
 
     RetainPtr<NSMutableDictionary> dictionary(AdoptNS, [[NSMutableDictionary alloc] initWithCapacity:size]);
@@ -417,7 +417,7 @@
 bool decode(ArgumentDecoder* decoder, RetainPtr<NSArray>& result)
 {
     uint64_t size;
-    if (!decoder->decodeUInt64(size))
+    if (!decoder->decode(size))
         return false;
 
     RetainPtr<NSMutableArray> array = adoptNS([[NSMutableArray alloc] initWithCapacity:size]);

Modified: trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm (141208 => 141209)


--- trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm	2013-01-30 03:29:27 UTC (rev 141209)
@@ -178,7 +178,7 @@
         }
         case NSArrayType: {
             uint64_t size;
-            if (!decoder->decodeUInt64(size))
+            if (!decoder->decode(size))
                 return false;
 
             RetainPtr<NSMutableArray> array = adoptNS([[NSMutableArray alloc] initWithCapacity:size]);
@@ -196,7 +196,7 @@
         }
         case NSDictionaryType: {
             uint64_t size;
-            if (!decoder->decodeUInt64(size))
+            if (!decoder->decode(size))
                 return false;
 
             RetainPtr<NSMutableDictionary> dictionary = adoptNS([[NSMutableDictionary alloc] initWithCapacity:size]);

Modified: trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm (141208 => 141209)


--- trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm	2013-01-30 03:29:27 UTC (rev 141209)
@@ -137,7 +137,7 @@
 bool SandboxExtension::HandleArray::decode(CoreIPC::ArgumentDecoder* decoder, SandboxExtension::HandleArray& handles)
 {
     uint64_t size;
-    if (!decoder->decodeUInt64(size))
+    if (!decoder->decode(size))
         return false;
     handles.allocate(size);
     for (size_t i = 0; i < size; i++) {

Modified: trunk/Source/WebKit2/Shared/mac/SecItemRequestData.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Shared/mac/SecItemRequestData.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/mac/SecItemRequestData.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -69,7 +69,7 @@
         return false;
     
     bool expectAttributes;
-    if (!decoder->decodeBool(expectAttributes))
+    if (!decoder->decode(expectAttributes))
         return false;
     
     if (expectAttributes && !CoreIPC::decode(decoder, secItemRequestData.m_attributesToMatch))

Modified: trunk/Source/WebKit2/Shared/mac/SecItemResponseData.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Shared/mac/SecItemResponseData.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/mac/SecItemResponseData.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -52,13 +52,13 @@
 bool SecItemResponseData::decode(CoreIPC::ArgumentDecoder* decoder, SecItemResponseData& secItemResponseData)
 {
     int64_t resultCode;
-    if (!decoder->decodeInt64(resultCode))
+    if (!decoder->decode(resultCode))
         return false;
     secItemResponseData.m_resultCode = (OSStatus)resultCode;
     secItemResponseData.m_resultObject = 0;
 
     bool expectResultObject;
-    if (!decoder->decodeBool(expectResultObject))
+    if (!decoder->decode(expectResultObject))
         return false;
 
     if (expectResultObject && !CoreIPC::decode(decoder, secItemResponseData.m_resultObject))

Modified: trunk/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -73,7 +73,7 @@
         return false;
 
     bool hasPlatformData;
-    if (!decoder->decodeBool(hasPlatformData))
+    if (!decoder->decode(hasPlatformData))
         return false;
 
     QMimeData* mimeData = 0;

Modified: trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.cpp (141208 => 141209)


--- trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -56,7 +56,7 @@
         return false;
     if (!decoder->decode(destination.m_contentType))
         return false;
-    if (!decoder->decodeUInt64(destination.m_contentLength))
+    if (!decoder->decode(destination.m_contentLength))
         return false;
     if (!decoder->decode(destination.m_replyUuid))
         return false;

Modified: trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp (141208 => 141209)


--- trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp	2013-01-30 03:21:40 UTC (rev 141208)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp	2013-01-30 03:29:27 UTC (rev 141209)
@@ -54,42 +54,42 @@
 
 bool DecoderAdapter::decodeBool(bool& value)
 {
-    return m_decoder->decodeBool(value);
+    return m_decoder->decode(value);
 }
 
 bool DecoderAdapter::decodeUInt16(uint16_t& value)
 {
-    return m_decoder->decodeUInt16(value);
+    return m_decoder->decode(value);
 }
 
 bool DecoderAdapter::decodeUInt32(uint32_t& value)
 {
-    return m_decoder->decodeUInt32(value);
+    return m_decoder->decode(value);
 }
 
 bool DecoderAdapter::decodeUInt64(uint64_t& value)
 {
-    return m_decoder->decodeUInt64(value);
+    return m_decoder->decode(value);
 }
 
 bool DecoderAdapter::decodeInt32(int32_t& value)
 {
-    return m_decoder->decodeInt32(value);
+    return m_decoder->decode(value);
 }
 
 bool DecoderAdapter::decodeInt64(int64_t& value)
 {
-    return m_decoder->decodeInt64(value);
+    return m_decoder->decode(value);
 }
 
 bool DecoderAdapter::decodeFloat(float& value)
 {
-    return m_decoder->decodeFloat(value);
+    return m_decoder->decode(value);
 }
 
 bool DecoderAdapter::decodeDouble(double& value)
 {
-    return m_decoder->decodeDouble(value);
+    return m_decoder->decode(value);
 }
 
 bool DecoderAdapter::decodeString(String& value)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to