Title: [141639] trunk/Source/WebKit2
Revision
141639
Author
caio.olive...@openbossa.org
Date
2013-02-01 13:40:29 -0800 (Fri, 01 Feb 2013)

Log Message

[EFL] [WK2] Fix build after r141619
https://bugs.webkit.org/show_bug.cgi?id=108683

Reviewed by Benjamin Poulain.

Take a reference instead of a pointer for decoding functions.

* Shared/WebBatteryStatus.cpp:
(WebKit::WebBatteryStatus::Data::decode):
* Shared/WebBatteryStatus.h:
(Data):
* Shared/WebNetworkInfo.cpp:
(WebKit::WebNetworkInfo::Data::decode):
* Shared/WebNetworkInfo.h:
(Data):
* Shared/cairo/LayerTreeContextCairo.cpp:
(WebKit::LayerTreeContext::decode):
* Shared/efl/LayerTreeContextEfl.cpp:
(WebKit::LayerTreeContext::decode):
* Shared/soup/PlatformCertificateInfo.cpp:
(WebKit::PlatformCertificateInfo::decode):
* Shared/soup/PlatformCertificateInfo.h:
(PlatformCertificateInfo):
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(CoreIPC::::decodePlatformData):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (141638 => 141639)


--- trunk/Source/WebKit2/ChangeLog	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-01 21:40:29 UTC (rev 141639)
@@ -1,3 +1,31 @@
+2013-02-01  Caio Marcelo de Oliveira Filho  <caio.olive...@openbossa.org>
+
+        [EFL] [WK2] Fix build after r141619
+        https://bugs.webkit.org/show_bug.cgi?id=108683
+
+        Reviewed by Benjamin Poulain.
+
+        Take a reference instead of a pointer for decoding functions.
+
+        * Shared/WebBatteryStatus.cpp:
+        (WebKit::WebBatteryStatus::Data::decode):
+        * Shared/WebBatteryStatus.h:
+        (Data):
+        * Shared/WebNetworkInfo.cpp:
+        (WebKit::WebNetworkInfo::Data::decode):
+        * Shared/WebNetworkInfo.h:
+        (Data):
+        * Shared/cairo/LayerTreeContextCairo.cpp:
+        (WebKit::LayerTreeContext::decode):
+        * Shared/efl/LayerTreeContextEfl.cpp:
+        (WebKit::LayerTreeContext::decode):
+        * Shared/soup/PlatformCertificateInfo.cpp:
+        (WebKit::PlatformCertificateInfo::decode):
+        * Shared/soup/PlatformCertificateInfo.h:
+        (PlatformCertificateInfo):
+        * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+        (CoreIPC::::decodePlatformData):
+
 2013-02-01  Brady Eidson  <beid...@apple.com>
 
         Clean up WebArchive loading with the NetworkProcess

Modified: trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp (141638 => 141639)


--- trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/WebBatteryStatus.cpp	2013-02-01 21:40:29 UTC (rev 141639)
@@ -53,15 +53,15 @@
     encoder.encode(level);
 }
 
-bool WebBatteryStatus::Data::decode(CoreIPC::ArgumentDecoder* decoder, Data& result)
+bool WebBatteryStatus::Data::decode(CoreIPC::ArgumentDecoder& decoder, Data& result)
 {
-    if (!decoder->decode(result.isCharging))
+    if (!decoder.decode(result.isCharging))
         return false;
-    if (!decoder->decode(result.chargingTime))
+    if (!decoder.decode(result.chargingTime))
         return false;
-    if (!decoder->decode(result.dischargingTime))
+    if (!decoder.decode(result.dischargingTime))
         return false;
-    if (!decoder->decode(result.level))
+    if (!decoder.decode(result.level))
         return false;
 
     return true;

Modified: trunk/Source/WebKit2/Shared/WebBatteryStatus.h (141638 => 141639)


--- trunk/Source/WebKit2/Shared/WebBatteryStatus.h	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/WebBatteryStatus.h	2013-02-01 21:40:29 UTC (rev 141639)
@@ -41,7 +41,7 @@
 
     struct Data {
         void encode(CoreIPC::ArgumentEncoder&) const;
-        static bool decode(CoreIPC::ArgumentDecoder*, Data&);
+        static bool decode(CoreIPC::ArgumentDecoder&, Data&);
 
         bool isCharging;
         double chargingTime;

Modified: trunk/Source/WebKit2/Shared/WebNetworkInfo.cpp (141638 => 141639)


--- trunk/Source/WebKit2/Shared/WebNetworkInfo.cpp	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/WebNetworkInfo.cpp	2013-02-01 21:40:29 UTC (rev 141639)
@@ -49,11 +49,11 @@
     encoder.encode(metered);
 }
 
-bool WebNetworkInfo::Data::decode(CoreIPC::ArgumentDecoder* decoder, Data& result)
+bool WebNetworkInfo::Data::decode(CoreIPC::ArgumentDecoder& decoder, Data& result)
 {
-    if (!decoder->decode(result.bandwidth))
+    if (!decoder.decode(result.bandwidth))
         return false;
-    if (!decoder->decode(result.metered))
+    if (!decoder.decode(result.metered))
         return false;
 
     return true;

Modified: trunk/Source/WebKit2/Shared/WebNetworkInfo.h (141638 => 141639)


--- trunk/Source/WebKit2/Shared/WebNetworkInfo.h	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/WebNetworkInfo.h	2013-02-01 21:40:29 UTC (rev 141639)
@@ -41,7 +41,7 @@
 
     struct Data {
         void encode(CoreIPC::ArgumentEncoder&) const;
-        static bool decode(CoreIPC::ArgumentDecoder*, Data&);
+        static bool decode(CoreIPC::ArgumentDecoder&, Data&);
 
         double bandwidth;
         bool metered;

Modified: trunk/Source/WebKit2/Shared/cairo/LayerTreeContextCairo.cpp (141638 => 141639)


--- trunk/Source/WebKit2/Shared/cairo/LayerTreeContextCairo.cpp	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/cairo/LayerTreeContextCairo.cpp	2013-02-01 21:40:29 UTC (rev 141639)
@@ -45,7 +45,7 @@
     notImplemented();
 }
 
-bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder*, LayerTreeContext&)
+bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder&, LayerTreeContext&)
 {
     notImplemented();
     return true;

Modified: trunk/Source/WebKit2/Shared/efl/LayerTreeContextEfl.cpp (141638 => 141639)


--- trunk/Source/WebKit2/Shared/efl/LayerTreeContextEfl.cpp	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/efl/LayerTreeContextEfl.cpp	2013-02-01 21:40:29 UTC (rev 141639)
@@ -45,9 +45,9 @@
     encoder.encode(coordinatedLayerID);
 }
 
-bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder* decoder, LayerTreeContext& context)
+bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder& decoder, LayerTreeContext& context)
 {
-    return decoder->decode(context.coordinatedLayerID);
+    return decoder.decode(context.coordinatedLayerID);
 }
 
 bool LayerTreeContext::isEmpty() const

Modified: trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp (141638 => 141639)


--- trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp	2013-02-01 21:40:29 UTC (rev 141639)
@@ -78,17 +78,17 @@
     encoder.encode(static_cast<uint32_t>(m_tlsErrors));
 }
 
-bool PlatformCertificateInfo::decode(CoreIPC::ArgumentDecoder* decoder, PlatformCertificateInfo& certificateInfo)
+bool PlatformCertificateInfo::decode(CoreIPC::ArgumentDecoder& decoder, PlatformCertificateInfo& certificateInfo)
 {
     bool hasCertificate;
-    if (!decoder->decode(hasCertificate))
+    if (!decoder.decode(hasCertificate))
         return false;
 
     if (!hasCertificate)
         return true;
 
     CoreIPC::DataReference certificateDataReference;
-    if (!decoder->decodeVariableLengthByteArray(certificateDataReference))
+    if (!decoder.decodeVariableLengthByteArray(certificateDataReference))
         return false;
 
     GByteArray* certificateData = g_byte_array_sized_new(certificateDataReference.size());
@@ -100,7 +100,7 @@
                                                                                "certificate", certificate.get(), NULL)));
 
     uint32_t tlsErrors;
-    if (!decoder->decode(tlsErrors))
+    if (!decoder.decode(tlsErrors))
         return false;
     certificateInfo.m_tlsErrors = static_cast<GTlsCertificateFlags>(tlsErrors);
 

Modified: trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.h (141638 => 141639)


--- trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.h	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.h	2013-02-01 21:40:29 UTC (rev 141639)
@@ -53,7 +53,7 @@
     GTlsCertificateFlags tlsErrors() const { return m_tlsErrors; }
 
     void encode(CoreIPC::ArgumentEncoder&) const;
-    static bool decode(CoreIPC::ArgumentDecoder*, PlatformCertificateInfo&);
+    static bool decode(CoreIPC::ArgumentDecoder&, PlatformCertificateInfo&);
 
 private:
     GRefPtr<GTlsCertificate> m_certificate;

Modified: trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp (141638 => 141639)


--- trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp	2013-02-01 21:34:01 UTC (rev 141638)
+++ trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp	2013-02-01 21:40:29 UTC (rev 141639)
@@ -43,10 +43,10 @@
     encoder << static_cast<uint32_t>(resourceRequest.soupMessageFlags());
 }
 
-bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder* decoder, ResourceRequest& resourceRequest)
+bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
 {
     uint32_t soupMessageFlags;
-    if (!decoder->decode(soupMessageFlags))
+    if (!decoder.decode(soupMessageFlags))
         return false;
     resourceRequest.setSoupMessageFlags(static_cast<SoupMessageFlags>(soupMessageFlags));
     return true;
@@ -58,10 +58,10 @@
     encoder << static_cast<uint32_t>(resourceResponse.soupMessageFlags());
 }
 
-bool ArgumentCoder<ResourceResponse>::decodePlatformData(ArgumentDecoder* decoder, ResourceResponse& resourceResponse)
+bool ArgumentCoder<ResourceResponse>::decodePlatformData(ArgumentDecoder& decoder, ResourceResponse& resourceResponse)
 {
     uint32_t soupMessageFlags;
-    if (!decoder->decode(soupMessageFlags))
+    if (!decoder.decode(soupMessageFlags))
         return false;
     resourceResponse.setSoupMessageFlags(static_cast<SoupMessageFlags>(soupMessageFlags));
     return true;
@@ -73,10 +73,10 @@
     encoder << PlatformCertificateInfo(resourceError);
 }
 
-bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder* decoder, ResourceError& resourceError)
+bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError)
 {
     PlatformCertificateInfo certificateInfo;
-    if (!decoder->decode(certificateInfo))
+    if (!decoder.decode(certificateInfo))
         return false;
 
     resourceError.setCertificate(certificateInfo.certificate());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to