Title: [160393] trunk/Source/WebKit2
- Revision
- 160393
- Author
- ander...@apple.com
- Date
- 2013-12-10 15:30:22 -0800 (Tue, 10 Dec 2013)
Log Message
Add encode and decode functions to WebNumber
https://bugs.webkit.org/show_bug.cgi?id=125547
Reviewed by Beth Dakin.
* Shared/APINumber.h:
(WebKit::WebNumber::encode):
(WebKit::WebNumber::decode):
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160392 => 160393)
--- trunk/Source/WebKit2/ChangeLog 2013-12-10 23:27:07 UTC (rev 160392)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 23:30:22 UTC (rev 160393)
@@ -1,3 +1,17 @@
+2013-12-10 Anders Carlsson <ander...@apple.com>
+
+ Add encode and decode functions to WebNumber
+ https://bugs.webkit.org/show_bug.cgi?id=125547
+
+ Reviewed by Beth Dakin.
+
+ * Shared/APINumber.h:
+ (WebKit::WebNumber::encode):
+ (WebKit::WebNumber::decode):
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+
2013-12-10 Nick Diego Yamane <nick.yam...@openbossa.org>
[EFL] One more WK2 build fix
Modified: trunk/Source/WebKit2/Shared/APINumber.h (160392 => 160393)
--- trunk/Source/WebKit2/Shared/APINumber.h 2013-12-10 23:27:07 UTC (rev 160392)
+++ trunk/Source/WebKit2/Shared/APINumber.h 2013-12-10 23:30:22 UTC (rev 160393)
@@ -27,6 +27,8 @@
#define APINumber_h
#include "APIObject.h"
+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
#include <wtf/PassRefPtr.h>
namespace WebKit {
@@ -41,6 +43,21 @@
NumberType value() const { return m_value; }
+ void encode(CoreIPC::ArgumentEncoder& encoder) const
+ {
+ encoder << m_value;
+ }
+
+ static bool decode(CoreIPC::ArgumentDecoder& decoder, RefPtr<API::Object>& result)
+ {
+ NumberType value;
+ if (!decoder.decode(value))
+ return false;
+
+ result = WebNumber::create(value);
+ return true;
+ }
+
private:
explicit WebNumber(NumberType value)
: m_value(value)
Modified: trunk/Source/WebKit2/Shared/UserData.cpp (160392 => 160393)
--- trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-10 23:27:07 UTC (rev 160392)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-10 23:30:22 UTC (rev 160393)
@@ -114,11 +114,9 @@
break;
}
- case API::Object::Type::Boolean: {
- auto& boolean = static_cast<const WebBoolean&>(object);
- encoder << boolean.value();
+ case API::Object::Type::Boolean:
+ static_cast<const WebBoolean&>(object).encode(encoder);
break;
- }
case API::Object::Type::Dictionary: {
auto& dictionary = static_cast<const ImmutableDictionary&>(object);
@@ -138,17 +136,11 @@
break;
}
- case API::Object::Type::Point: {
- auto& point = static_cast<const WebPoint&>(object);
- point.encode(encoder);
- break;
- }
+ case API::Object::Type::Point:
+ static_cast<const WebPoint&>(object).encode(encoder);
- case API::Object::Type::Rect: {
- auto& rect = static_cast<const WebRect&>(object);
- rect.encode(encoder);
- break;
- }
+ case API::Object::Type::Rect:
+ static_cast<const WebRect&>(object).encode(encoder);
case API::Object::Type::SerializedScriptValue: {
auto& serializedScriptValue = static_cast<const WebSerializedScriptValue&>(object);
@@ -156,11 +148,9 @@
break;
}
- case API::Object::Type::Size: {
- auto& size = static_cast<const WebSize&>(object);
- size.encode(encoder);
+ case API::Object::Type::Size:
+ static_cast<const WebSize&>(object).encode(encoder);
break;
- }
case API::Object::Type::String: {
auto& string = static_cast<const WebString&>(object);
@@ -174,11 +164,9 @@
break;
}
- case API::Object::Type::UInt64: {
- auto& uint64 = static_cast<const WebUInt64&>(object);
- encoder << uint64.value();
+ case API::Object::Type::UInt64:
+ static_cast<const WebUInt64&>(object).encode(encoder);
break;
- }
default:
ASSERT_NOT_REACHED();
@@ -210,14 +198,10 @@
break;
}
- case API::Object::Type::Boolean: {
- bool value;
- if (!decoder.decode(value))
+ case API::Object::Type::Boolean:
+ if (!WebBoolean::decode(decoder, result))
return false;
-
- result = WebBoolean::create(value);
break;
- }
case API::Object::Type::Dictionary: {
uint64_t size;
@@ -242,6 +226,11 @@
break;
}
+ case API::Object::Type::Double:
+ if (!WebDouble::decode(decoder, result))
+ return false;
+ break;
+
case API::Object::Type::FrameHandle: {
uint64_t frameID;
if (!decoder.decode(frameID))
@@ -297,13 +286,10 @@
break;
}
- case API::Object::Type::UInt64: {
- uint64_t value;
- if (!decoder.decode(value))
+ case API::Object::Type::UInt64:
+ if (!WebUInt64::decode(decoder, result))
return false;
- result = WebUInt64::create(value);
break;
- }
default:
ASSERT_NOT_REACHED();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
