Chromium Code Reviews

Side by Side Diff: content/renderer/browser_plugin/browser_plugin.cc

Issue 11111020: <browser>: Always read <browser>.src attribute from <object>.src. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename dir. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | 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/renderer/browser_plugin/browser_plugin.h" 5 #include "content/renderer/browser_plugin/browser_plugin.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #if defined (OS_WIN) 9 #if defined (OS_WIN)
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
(...skipping 118 matching lines...)
129 // Record that we sent a NavigateGuest message to embedder. Once we send 129 // Record that we sent a NavigateGuest message to embedder. Once we send
130 // such a message, subsequent SetSrcAttribute() calls must always send 130 // such a message, subsequent SetSrcAttribute() calls must always send
131 // NavigateGuest messages to the embedder (even if |src| is empty), so 131 // NavigateGuest messages to the embedder (even if |src| is empty), so
132 // resize works correctly for all cases (e.g. The embedder can reset the 132 // resize works correctly for all cases (e.g. The embedder can reset the
133 // guest's |src| to empty value, resize and then set the |src| to a 133 // guest's |src| to empty value, resize and then set the |src| to a
134 // non-empty value). 134 // non-empty value).
135 // Additionally, once this instance has navigated, the storage partition 135 // Additionally, once this instance has navigated, the storage partition
136 // cannot be changed, so this value is used for enforcing this. 136 // cannot be changed, so this value is used for enforcing this.
137 navigate_src_sent_ = true; 137 navigate_src_sent_ = true;
138 } 138 }
139 src_ = src; 139 if (!src.empty())
Fady Samuel 2012/10/12 18:54:44 Hmm, do we want to continue doing the rest of Brow
lazyboy 2012/10/12 19:16:18 I think we need to send the resize params above ot
140 src_ = src;
140 guest_crashed_ = false; 141 guest_crashed_ = false;
141 } 142 }
142 143
143 std::string BrowserPlugin::GetPartitionAttribute() const { 144 std::string BrowserPlugin::GetPartitionAttribute() const {
144 std::string value; 145 std::string value;
145 if (persist_storage_) 146 if (persist_storage_)
146 value.append(kPersistPrefix); 147 value.append(kPersistPrefix);
147 148
148 value.append(storage_partition_id_); 149 value.append(storage_partition_id_);
149 return value; 150 return value;
(...skipping 607 matching lines...)
757 void* notify_data) { 758 void* notify_data) {
758 } 759 }
759 760
760 void BrowserPlugin::didFailLoadingFrameRequest( 761 void BrowserPlugin::didFailLoadingFrameRequest(
761 const WebKit::WebURL& url, 762 const WebKit::WebURL& url,
762 void* notify_data, 763 void* notify_data,
763 const WebKit::WebURLError& error) { 764 const WebKit::WebURLError& error) {
764 } 765 }
765 766
766 } // namespace content 767 } // namespace content
OLDNEW

Powered by Google App Engine