OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_ | 5 #ifndef CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_ |
6 #define CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_ | 6 #define CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/strings/nullable_string16.h" | 10 #include "base/strings/nullable_string16.h" |
11 #include "content/common/content_export.h" | 11 #include "content/common/content_export.h" |
12 #include "third_party/WebKit/public/platform/WebHTTPBody.h" | 12 #include "third_party/WebKit/public/platform/WebHTTPBody.h" |
13 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" | 13 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" |
14 #include "ui/gfx/point.h" | 14 #include "ui/gfx/point.h" |
| 15 #include "ui/gfx/point_f.h" |
15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
16 | 17 |
17 namespace content { | 18 namespace content { |
18 | 19 |
19 struct CONTENT_EXPORT ExplodedHttpBodyElement { | 20 struct CONTENT_EXPORT ExplodedHttpBodyElement { |
20 blink::WebHTTPBody::Element::Type type; | 21 blink::WebHTTPBody::Element::Type type; |
21 std::string data; | 22 std::string data; |
22 base::NullableString16 file_path; | 23 base::NullableString16 file_path; |
23 GURL filesystem_url; | 24 GURL filesystem_url; |
24 int64 file_start; | 25 int64 file_start; |
(...skipping 15 matching lines...) Expand all Loading... |
40 ExplodedHttpBody(); | 41 ExplodedHttpBody(); |
41 ~ExplodedHttpBody(); | 42 ~ExplodedHttpBody(); |
42 }; | 43 }; |
43 | 44 |
44 struct CONTENT_EXPORT ExplodedFrameState { | 45 struct CONTENT_EXPORT ExplodedFrameState { |
45 base::NullableString16 url_string; | 46 base::NullableString16 url_string; |
46 base::NullableString16 referrer; | 47 base::NullableString16 referrer; |
47 base::NullableString16 target; | 48 base::NullableString16 target; |
48 base::NullableString16 state_object; | 49 base::NullableString16 state_object; |
49 std::vector<base::NullableString16> document_state; | 50 std::vector<base::NullableString16> document_state; |
| 51 gfx::PointF pinch_viewport_scroll_offset; |
50 gfx::Point scroll_offset; | 52 gfx::Point scroll_offset; |
51 int64 item_sequence_number; | 53 int64 item_sequence_number; |
52 int64 document_sequence_number; | 54 int64 document_sequence_number; |
53 double page_scale_factor; | 55 double page_scale_factor; |
54 blink::WebReferrerPolicy referrer_policy; | 56 blink::WebReferrerPolicy referrer_policy; |
55 ExplodedHttpBody http_body; | 57 ExplodedHttpBody http_body; |
56 std::vector<ExplodedFrameState> children; | 58 std::vector<ExplodedFrameState> children; |
57 | 59 |
58 ExplodedFrameState(); | 60 ExplodedFrameState(); |
59 ~ExplodedFrameState(); | 61 ~ExplodedFrameState(); |
(...skipping 15 matching lines...) Expand all Loading... |
75 #if defined(OS_ANDROID) | 77 #if defined(OS_ANDROID) |
76 CONTENT_EXPORT bool DecodePageStateWithDeviceScaleFactorForTesting( | 78 CONTENT_EXPORT bool DecodePageStateWithDeviceScaleFactorForTesting( |
77 const std::string& encoded, | 79 const std::string& encoded, |
78 float device_scale_factor, | 80 float device_scale_factor, |
79 ExplodedPageState* exploded); | 81 ExplodedPageState* exploded); |
80 #endif | 82 #endif |
81 | 83 |
82 } // namespace content | 84 } // namespace content |
83 | 85 |
84 #endif // CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_ | 86 #endif // CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_ |
OLD | NEW |