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

Side by Side Diff: content/public/common/page_state.cc

Issue 16867005: Re-implement PageState serialization without a Blink API dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Improvements based on Tom's feedback. Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/common/page_state_ios.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "content/public/common/page_state.h" 5 #include "content/public/common/page_state.h"
6 6
7 #include "base/files/file_path.h"
8 #include "base/strings/utf_string_conversions.h"
9 #include "content/common/page_state_serialization.h"
10
7 namespace content { 11 namespace content {
12 namespace {
13
14 base::NullableString16 ToNullableString16(const std::string& utf8) {
15 return base::NullableString16(UTF8ToUTF16(utf8), false);
16 }
17
18 base::FilePath ToFilePath(const base::NullableString16& s) {
19 return base::FilePath::FromUTF16Unsafe(s.string());
20 }
21
22 void ToFilePathVector(const std::vector<base::NullableString16>& input,
23 std::vector<base::FilePath>* output) {
24 output->clear();
25 output->reserve(input.size());
26 for (size_t i = 0; i < input.size(); ++i)
27 output->push_back(ToFilePath(input[i]));
28 }
29
30 PageState ToPageState(const ExplodedPageState& state) {
31 std::string encoded_data;
32 if (!EncodePageState(state, &encoded_data))
33 return PageState();
34
35 return PageState::CreateFromEncodedData(encoded_data);
36 }
37
38 void RecursivelyRemovePasswordData(ExplodedFrameState* state) {
39 if (state->http_body.contains_passwords)
40 state->http_body = ExplodedHttpBody();
41 }
42
43 void RecursivelyRemoveScrollOffset(ExplodedFrameState* state) {
44 state->scroll_offset = gfx::Point();
45 }
46
47 } // namespace
8 48
9 // static 49 // static
10 PageState PageState::CreateFromEncodedData(const std::string& data) { 50 PageState PageState::CreateFromEncodedData(const std::string& data) {
11 return PageState(data); 51 return PageState(data);
12 } 52 }
13 53
54 // static
55 PageState PageState::CreateFromURL(const GURL& url) {
56 ExplodedPageState state;
57
58 state.top.url_string = state.top.original_url_string =
59 ToNullableString16(url.possibly_invalid_spec());
60
61 return ToPageState(state);
62 }
63
64 // static
65 PageState PageState::CreateForTesting(
66 const GURL& url,
67 bool body_contains_password_data,
68 const char* optional_body_data,
69 const base::FilePath* optional_body_file_path) {
70 ExplodedPageState state;
71
72 state.top.url_string = state.top.original_url_string =
73 ToNullableString16(url.possibly_invalid_spec());
74
75 if (optional_body_data || optional_body_file_path) {
76 state.top.http_body.is_null = false;
77 if (optional_body_data) {
78 ExplodedHttpBodyElement element;
79 element.type = WebKit::WebHTTPBody::Element::TypeData;
80 element.data = optional_body_data;
81 state.top.http_body.elements.push_back(element);
82 }
83 if (optional_body_file_path) {
84 ExplodedHttpBodyElement element;
85 element.type = WebKit::WebHTTPBody::Element::TypeFile;
86 element.file_path =
87 ToNullableString16(optional_body_file_path->AsUTF8Unsafe());
88 state.top.http_body.elements.push_back(element);
89 state.referenced_files.push_back(element.file_path);
90 }
91 state.top.http_body.contains_passwords =
92 body_contains_password_data;
93 }
94
95 return ToPageState(state);
96 }
97
14 PageState::PageState() { 98 PageState::PageState() {
15 } 99 }
16 100
17 bool PageState::IsValid() const { 101 bool PageState::IsValid() const {
18 return !data_.empty(); 102 return !data_.empty();
19 } 103 }
20 104
21 bool PageState::Equals(const PageState& other) const { 105 bool PageState::Equals(const PageState& other) const {
22 return data_ == other.data_; 106 return data_ == other.data_;
23 } 107 }
24 108
25 const std::string& PageState::ToEncodedData() const { 109 const std::string& PageState::ToEncodedData() const {
26 return data_; 110 return data_;
27 } 111 }
28 112
113 std::vector<base::FilePath> PageState::GetReferencedFiles() const {
114 std::vector<base::FilePath> results;
115
116 ExplodedPageState state;
117 if (DecodePageState(data_, &state))
118 ToFilePathVector(state.referenced_files, &results);
119
120 return results;
121 }
122
123 PageState PageState::RemovePasswordData() const {
124 ExplodedPageState state;
125 if (!DecodePageState(data_, &state))
126 return PageState(); // Oops!
127
128 RecursivelyRemovePasswordData(&state.top);
129
130 return ToPageState(state);
131 }
132
133 PageState PageState::RemoveScrollOffset() const {
134 ExplodedPageState state;
135 if (!DecodePageState(data_, &state))
136 return PageState(); // Oops!
137
138 RecursivelyRemoveScrollOffset(&state.top);
139
140 return ToPageState(state);
141 }
142
29 PageState::PageState(const std::string& data) 143 PageState::PageState(const std::string& data)
30 : data_(data) { 144 : data_(data) {
31 // TODO(darin): Enable this DCHECK once tests have been fixed up to not pass 145 // TODO(darin): Enable this DCHECK once tests have been fixed up to not pass
32 // bogus encoded data to CreateFromEncodedData. 146 // bogus encoded data to CreateFromEncodedData.
33 //DCHECK(IsValid()); 147 //DCHECK(IsValid());
34 } 148 }
35 149
36 } // namespace content 150 } // namespace content
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/common/page_state_ios.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698