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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 743773003: OOPIF: Data URLs are now rendered in the renderer that initiated the navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test. Created 6 years, 1 month 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
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_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 // If a cross-site request is in progress, we may be suspended while waiting 265 // If a cross-site request is in progress, we may be suspended while waiting
266 // for the onbeforeunload handler, so this function might buffer the message 266 // for the onbeforeunload handler, so this function might buffer the message
267 // rather than sending it. 267 // rather than sending it.
268 void Navigate(const FrameMsg_Navigate_Params& params); 268 void Navigate(const FrameMsg_Navigate_Params& params);
269 269
270 // Load the specified URL; this is a shortcut for Navigate(). 270 // Load the specified URL; this is a shortcut for Navigate().
271 void NavigateToURL(const GURL& url); 271 void NavigateToURL(const GURL& url);
272 272
273 // Treat this prospective navigation as thought it originated from the 273 // Treat this prospective navigation as thought it originated from the
274 // frame. Used, e.g., for a navigation request that originated from 274 // frame. Used, e.g., for a navigation request that originated from
275 // a RemoteFrame. 275 // a RemoteFrame. |site_instance| is the site instance that originated the
276 void OpenURL(const FrameHostMsg_OpenURL_Params& params); 276 // navigation request.
277 void OpenURL(const FrameHostMsg_OpenURL_Params& params,
278 SiteInstance* site_instance);
277 279
278 // Stop the load in progress. 280 // Stop the load in progress.
279 void Stop(); 281 void Stop();
280 282
281 // Returns whether navigation messages are currently suspended for this 283 // Returns whether navigation messages are currently suspended for this
282 // RenderFrameHost. Only true during a cross-site navigation, while waiting 284 // RenderFrameHost. Only true during a cross-site navigation, while waiting
283 // for the onbeforeunload handler. 285 // for the onbeforeunload handler.
284 bool are_navigations_suspended() const { return navigations_suspended_; } 286 bool are_navigations_suspended() const { return navigations_suspended_; }
285 287
286 // Suspends (or unsuspends) any navigation messages from being sent from this 288 // Suspends (or unsuspends) any navigation messages from being sent from this
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 625
624 // NOTE: This must be the last member. 626 // NOTE: This must be the last member.
625 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 627 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
626 628
627 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 629 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
628 }; 630 };
629 631
630 } // namespace content 632 } // namespace content
631 633
632 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 634 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698