Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Side by Side Diff: content/common/page_state_serialization.h

Issue 959783003: Add scroll restoration type to page state (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use enum for scroll restoration type Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/common/DEPS ('k') | content/common/page_state_serialization.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/WebHistoryScrollRestorationType.h"
13 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" 14 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
14 #include "ui/gfx/geometry/point.h" 15 #include "ui/gfx/geometry/point.h"
15 #include "ui/gfx/geometry/point_f.h" 16 #include "ui/gfx/geometry/point_f.h"
16 #include "url/gurl.h" 17 #include "url/gurl.h"
17 18
18 namespace content { 19 namespace content {
19 20
20 struct CONTENT_EXPORT ExplodedHttpBodyElement { 21 struct CONTENT_EXPORT ExplodedHttpBodyElement {
21 blink::WebHTTPBody::Element::Type type; 22 blink::WebHTTPBody::Element::Type type;
22 std::string data; 23 std::string data;
(...skipping 18 matching lines...) Expand all
41 ExplodedHttpBody(); 42 ExplodedHttpBody();
42 ~ExplodedHttpBody(); 43 ~ExplodedHttpBody();
43 }; 44 };
44 45
45 struct CONTENT_EXPORT ExplodedFrameState { 46 struct CONTENT_EXPORT ExplodedFrameState {
46 base::NullableString16 url_string; 47 base::NullableString16 url_string;
47 base::NullableString16 referrer; 48 base::NullableString16 referrer;
48 base::NullableString16 target; 49 base::NullableString16 target;
49 base::NullableString16 state_object; 50 base::NullableString16 state_object;
50 std::vector<base::NullableString16> document_state; 51 std::vector<base::NullableString16> document_state;
52 blink::WebHistoryScrollRestorationType scroll_restoration_type;
51 gfx::PointF pinch_viewport_scroll_offset; 53 gfx::PointF pinch_viewport_scroll_offset;
52 gfx::Point scroll_offset; 54 gfx::Point scroll_offset;
53 int64 item_sequence_number; 55 int64 item_sequence_number;
54 int64 document_sequence_number; 56 int64 document_sequence_number;
55 int64 frame_sequence_number; 57 int64 frame_sequence_number;
56 double page_scale_factor; 58 double page_scale_factor;
57 blink::WebReferrerPolicy referrer_policy; 59 blink::WebReferrerPolicy referrer_policy;
58 ExplodedHttpBody http_body; 60 ExplodedHttpBody http_body;
59 std::vector<ExplodedFrameState> children; 61 std::vector<ExplodedFrameState> children;
60 62
(...skipping 25 matching lines...) Expand all
86 #if defined(OS_ANDROID) 88 #if defined(OS_ANDROID)
87 CONTENT_EXPORT bool DecodePageStateWithDeviceScaleFactorForTesting( 89 CONTENT_EXPORT bool DecodePageStateWithDeviceScaleFactorForTesting(
88 const std::string& encoded, 90 const std::string& encoded,
89 float device_scale_factor, 91 float device_scale_factor,
90 ExplodedPageState* exploded); 92 ExplodedPageState* exploded);
91 #endif 93 #endif
92 94
93 } // namespace content 95 } // namespace content
94 96
95 #endif // CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_ 97 #endif // CONTENT_COMMON_PAGE_STATE_SERIALIZATION_H_
OLDNEW
« no previous file with comments | « content/common/DEPS ('k') | content/common/page_state_serialization.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698