Upstream version 9.38.198.0

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

diff --git a/src/content/common/page_state_serialization.h b/src/content/common/page_state_serialization.h
index 1a4ddc8..e31780f 100644 (file)
--- a/src/content/common/page_state_serialization.h
+++ b/src/content/common/page_state_serialization.h
@@ -12,6 +12,7 @@
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "ui/gfx/point.h"
+#include "ui/gfx/point_f.h"
 #include "url/gurl.h"
 
 namespace content {
@@ -43,22 +44,27 @@ struct CONTENT_EXPORT ExplodedHttpBody {
 
 struct CONTENT_EXPORT ExplodedFrameState {
   base::NullableString16 url_string;
-  base::NullableString16 original_url_string;
   base::NullableString16 referrer;
   base::NullableString16 target;
   base::NullableString16 state_object;
   std::vector<base::NullableString16> document_state;
+  gfx::PointF pinch_viewport_scroll_offset;
   gfx::Point scroll_offset;
   int64 item_sequence_number;
   int64 document_sequence_number;
-  int64 target_frame_id;
+  int64 frame_sequence_number;
   double page_scale_factor;
   blink::WebReferrerPolicy referrer_policy;
   ExplodedHttpBody http_body;
   std::vector<ExplodedFrameState> children;
 
   ExplodedFrameState();
+  ExplodedFrameState(const ExplodedFrameState& other);
   ~ExplodedFrameState();
+  void operator=(const ExplodedFrameState& other);
+
+private:
+  void assign(const ExplodedFrameState& other);
 };
 
 struct CONTENT_EXPORT ExplodedPageState {