Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / common / page_state_serialization.cc

diff --git a/src/content/common/page_state_serialization.cc b/src/content/common/page_state_serialization.cc
index eab23c4..d99830a 100644 (file)
--- a/src/content/common/page_state_serialization.cc
+++ b/src/content/common/page_state_serialization.cc
@@ -232,10 +232,6 @@ int ReadInteger(SerializeObject* obj) {
   return 0;
 }
 
-void ConsumeInteger(SerializeObject* obj) {
-  int unused ALLOW_UNUSED = ReadInteger(obj);
-}
-
 void WriteInteger64(int64 data, SerializeObject* obj) {
   obj->pickle.WriteInt64(data);
 }
@@ -248,10 +244,6 @@ int64 ReadInteger64(SerializeObject* obj) {
   return 0;
 }
 
-void ConsumeInteger64(SerializeObject* obj) {
-  int64 unused ALLOW_UNUSED = ReadInteger64(obj);
-}
-
 void WriteReal(double data, SerializeObject* obj) {
   WriteData(&data, sizeof(double), obj);
 }
@@ -270,10 +262,6 @@ double ReadReal(SerializeObject* obj) {
   return value;
 }
 
-void ConsumeReal(SerializeObject* obj) {
-  double unused ALLOW_UNUSED = ReadReal(obj);
-}
-
 void WriteBoolean(bool data, SerializeObject* obj) {
   obj->pickle.WriteInt(data ? 1 : 0);
 }
@@ -286,10 +274,6 @@ bool ReadBoolean(SerializeObject* obj) {
   return false;
 }
 
-void ConsumeBoolean(SerializeObject* obj) {
-  bool unused ALLOW_UNUSED = ReadBoolean(obj);
-}
-
 void WriteGURL(const GURL& url, SerializeObject* obj) {
   obj->pickle.WriteString(url.possibly_invalid_spec());
 }
@@ -362,10 +346,6 @@ base::NullableString16 ReadString(SerializeObject* obj) {
       base::NullableString16();
 }
 
-void ConsumeString(SerializeObject* obj) {
-  const base::char16* unused ALLOW_UNUSED = ReadStringNoCopy(obj, NULL);
-}
-
 template <typename T>
 void WriteAndValidateVectorSize(const std::vector<T>& v, SerializeObject* obj) {
   CHECK_LT(v.size(), std::numeric_limits<int>::max() / sizeof(T));
@@ -539,19 +519,19 @@ void WriteFrameState(
 void ReadFrameState(SerializeObject* obj, bool is_top,
                     ExplodedFrameState* state) {
   if (obj->version < 14 && !is_top)
-    ConsumeInteger(obj);  // Skip over redundant version field.
+    ReadInteger(obj);  // Skip over redundant version field.
 
   state->url_string = ReadString(obj);
 
   if (obj->version < 19)
-    ConsumeString(obj);  // Skip obsolete original url string field.
+    ReadString(obj);  // Skip obsolete original url string field.
 
   state->target = ReadString(obj);
   if (obj->version < 15) {
-    ConsumeString(obj);  // Skip obsolete parent field.
-    ConsumeString(obj);  // Skip obsolete title field.
-    ConsumeString(obj);  // Skip obsolete alternate title field.
-    ConsumeReal(obj);    // Skip obsolete visited time field.
+    ReadString(obj);  // Skip obsolete parent field.
+    ReadString(obj);  // Skip obsolete title field.
+    ReadString(obj);  // Skip obsolete alternate title field.
+    ReadReal(obj);    // Skip obsolete visited time field.
   }
 
   int x = ReadInteger(obj);
@@ -559,8 +539,8 @@ void ReadFrameState(SerializeObject* obj, bool is_top,
   state->scroll_offset = gfx::Point(x, y);
 
   if (obj->version < 15) {
-    ConsumeBoolean(obj);  // Skip obsolete target item flag.
-    ConsumeInteger(obj);  // Skip obsolete visit count field.
+    ReadBoolean(obj);  // Skip obsolete target item flag.
+    ReadInteger(obj);  // Skip obsolete visit count field.
   }
   state->referrer = ReadString(obj);
 
@@ -573,7 +553,7 @@ void ReadFrameState(SerializeObject* obj, bool is_top,
     state->frame_sequence_number = ReadInteger64(obj);
 
   if (obj->version >= 17 && obj->version < 19)
-    ConsumeInteger64(obj); // Skip obsolete target frame id number.
+    ReadInteger64(obj); // Skip obsolete target frame id number.
 
   if (obj->version >= 18) {
     state->referrer_policy =
@@ -600,7 +580,7 @@ void ReadFrameState(SerializeObject* obj, bool is_top,
   state->http_body.http_content_type = ReadString(obj);
 
   if (obj->version < 14)
-    ConsumeString(obj);  // Skip unused referrer string.
+    ReadString(obj);  // Skip unused referrer string.
 
 #if defined(OS_ANDROID)
   if (obj->version == 11) {