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

Side by Side Diff: content/browser/web_contents/navigation_entry_impl.cc

Issue 12086109: Prevent bindings escalation on an existing NavigationEntry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/web_contents/navigation_entry_impl.h" 5 #include "content/browser/web_contents/navigation_entry_impl.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "content/public/common/content_constants.h" 9 #include "content/public/common/content_constants.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 30
31 NavigationEntryImpl* NavigationEntryImpl::FromNavigationEntry( 31 NavigationEntryImpl* NavigationEntryImpl::FromNavigationEntry(
32 NavigationEntry* entry) { 32 NavigationEntry* entry) {
33 return static_cast<NavigationEntryImpl*>(entry); 33 return static_cast<NavigationEntryImpl*>(entry);
34 } 34 }
35 35
36 NavigationEntryImpl::NavigationEntryImpl() 36 NavigationEntryImpl::NavigationEntryImpl()
37 : unique_id_(GetUniqueIDInConstructor()), 37 : unique_id_(GetUniqueIDInConstructor()),
38 site_instance_(NULL), 38 site_instance_(NULL),
39 bindings_(0),
39 page_type_(PAGE_TYPE_NORMAL), 40 page_type_(PAGE_TYPE_NORMAL),
40 update_virtual_url_with_url_(false), 41 update_virtual_url_with_url_(false),
41 page_id_(-1), 42 page_id_(-1),
42 transition_type_(PAGE_TRANSITION_LINK), 43 transition_type_(PAGE_TRANSITION_LINK),
43 has_post_data_(false), 44 has_post_data_(false),
44 post_id_(-1), 45 post_id_(-1),
45 restore_type_(RESTORE_NONE), 46 restore_type_(RESTORE_NONE),
46 is_overriding_user_agent_(false), 47 is_overriding_user_agent_(false),
47 is_renderer_initiated_(false), 48 is_renderer_initiated_(false),
48 should_replace_entry_(false), 49 should_replace_entry_(false),
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 const std::string& NavigationEntryImpl::GetFrameToNavigate() const { 279 const std::string& NavigationEntryImpl::GetFrameToNavigate() const {
279 return frame_to_navigate_; 280 return frame_to_navigate_;
280 } 281 }
281 282
282 void NavigationEntryImpl::SetScreenshotPNGData( 283 void NavigationEntryImpl::SetScreenshotPNGData(
283 const std::vector<unsigned char>& png_data) { 284 const std::vector<unsigned char>& png_data) {
284 screenshot_ = png_data.empty() ? NULL : new base::RefCountedBytes(png_data); 285 screenshot_ = png_data.empty() ? NULL : new base::RefCountedBytes(png_data);
285 } 286 }
286 287
287 } // namespace content 288 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698