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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/render_view_impl.h

Issue 222973003: Conversion of content_shell target to use WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove some TODOs Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« content/renderer/render_frame_impl.h ('K') | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('j') | content/shell/renderer/test_runner/WebFrameTestProxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 1244c888e07f836f35dfad0cd0d3889e706f5d13..30d910426b833549af7812635f8d3599ed0d29bd 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -353,11 +353,10 @@ class CONTENT_EXPORT RenderViewImpl
// Temporary call until all this media code moves to RenderFrame.
// TODO(jam): remove me
- blink::WebMediaPlayer* CreateMediaPlayer(
- RenderFrame* render_frame,
- blink::WebFrame* frame,
- const blink::WebURL& url,
- blink::WebMediaPlayerClient* client);
+ blink::WebMediaPlayer* CreateMediaPlayer(RenderFrame* render_frame,
+ blink::WebLocalFrame* frame,
+ const blink::WebURL& url,
+ blink::WebMediaPlayerClient* client);
// Returns the length of the session history of this RenderView. Note that
// this only coincides with the actual length of the session history if this
// RenderView is the currently active RenderView of a WebContents.
@@ -413,13 +412,12 @@ class CONTENT_EXPORT RenderViewImpl
// blink::WebViewClient implementation --------------------------------------
- virtual blink::WebView* createView(
- blink::WebFrame* creator,
- const blink::WebURLRequest& request,
- const blink::WebWindowFeatures& features,
- const blink::WebString& frame_name,
- blink::WebNavigationPolicy policy,
- bool suppress_opener);
+ virtual blink::WebView* createView(blink::WebLocalFrame* creator,
+ const blink::WebURLRequest& request,
+ const blink::WebWindowFeatures& features,
+ const blink::WebString& frame_name,
+ blink::WebNavigationPolicy policy,
+ bool suppress_opener);
virtual blink::WebWidget* createPopupMenu(blink::WebPopupType popup_type);
virtual blink::WebExternalPopupMenu* createExternalPopupMenu(
const blink::WebPopupMenuInfo& popup_menu_info,
@@ -432,7 +430,7 @@ class CONTENT_EXPORT RenderViewImpl
const blink::WebString& source_name,
unsigned source_line,
const blink::WebString& stack_trace);
- virtual void printPage(blink::WebFrame* frame);
+ virtual void printPage(blink::WebLocalFrame* frame);
virtual blink::WebNotificationPresenter* notificationPresenter();
virtual bool enumerateChosenDirectory(
const blink::WebString& path,
@@ -447,15 +445,15 @@ class CONTENT_EXPORT RenderViewImpl
virtual bool runFileChooser(
const blink::WebFileChooserParams& params,
blink::WebFileChooserCompletion* chooser_completion);
- virtual void runModalAlertDialog(blink::WebFrame* frame,
+ virtual void runModalAlertDialog(blink::WebLocalFrame* frame,
const blink::WebString& message);
- virtual bool runModalConfirmDialog(blink::WebFrame* frame,
+ virtual bool runModalConfirmDialog(blink::WebLocalFrame* frame,
const blink::WebString& message);
- virtual bool runModalPromptDialog(blink::WebFrame* frame,
+ virtual bool runModalPromptDialog(blink::WebLocalFrame* frame,
const blink::WebString& message,
const blink::WebString& default_value,
blink::WebString* actual_value);
- virtual bool runModalBeforeUnloadDialog(blink::WebFrame* frame,
+ virtual bool runModalBeforeUnloadDialog(blink::WebLocalFrame* frame,
bool is_reload,
const blink::WebString& message);
virtual void showValidationMessage(const blink::WebRect& anchor_in_root_view,
@@ -467,12 +465,12 @@ class CONTENT_EXPORT RenderViewImpl
const blink::WebRect& anchor_in_root_view) OVERRIDE;
// DEPRECATED
- virtual bool runModalBeforeUnloadDialog(blink::WebFrame* frame,
+ virtual bool runModalBeforeUnloadDialog(blink::WebLocalFrame* frame,
const blink::WebString& message);
virtual void setStatusText(const blink::WebString& text);
virtual void setMouseOverURL(const blink::WebURL& url);
virtual void setKeyboardFocusURL(const blink::WebURL& url);
- virtual void startDragging(blink::WebFrame* frame,
+ virtual void startDragging(blink::WebLocalFrame* frame,
const blink::WebDragData& data,
blink::WebDragOperationsMask mask,
const blink::WebImage& image,
@@ -528,72 +526,70 @@ class CONTENT_EXPORT RenderViewImpl
// blink::WebFrameClient implementation -------------------------------------
virtual blink::WebMediaPlayer* createMediaPlayer(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebURL& url,
blink::WebMediaPlayerClient* client);
- virtual void didAccessInitialDocument(blink::WebFrame* frame);
- virtual void didDisownOpener(blink::WebFrame* frame);
+ virtual void didAccessInitialDocument(blink::WebLocalFrame* frame);
+ virtual void didDisownOpener(blink::WebLocalFrame* frame);
virtual void frameDetached(blink::WebFrame* frame);
virtual void willClose(blink::WebFrame* frame);
virtual void didMatchCSS(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebVector<blink::WebString>& newly_matching_selectors,
const blink::WebVector<blink::WebString>& stopped_matching_selectors);
- virtual void willSendSubmitEvent(blink::WebFrame* frame,
+ virtual void willSendSubmitEvent(blink::WebLocalFrame* frame,
const blink::WebFormElement& form);
- virtual void willSubmitForm(blink::WebFrame* frame,
+ virtual void willSubmitForm(blink::WebLocalFrame* frame,
const blink::WebFormElement& form);
- virtual void didCreateDataSource(blink::WebFrame* frame,
+ virtual void didCreateDataSource(blink::WebLocalFrame* frame,
blink::WebDataSource* datasource);
- virtual void didStartProvisionalLoad(blink::WebFrame* frame);
- virtual void didFailProvisionalLoad(blink::WebFrame* frame,
+ virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame);
+ virtual void didFailProvisionalLoad(blink::WebLocalFrame* frame,
const blink::WebURLError& error);
- virtual void didCommitProvisionalLoad(blink::WebFrame* frame,
+ virtual void didCommitProvisionalLoad(blink::WebLocalFrame* frame,
bool is_new_navigation);
- virtual void didClearWindowObject(blink::WebFrame* frame, int world_id);
- virtual void didCreateDocumentElement(blink::WebFrame* frame);
- virtual void didReceiveTitle(blink::WebFrame* frame,
+ virtual void didClearWindowObject(blink::WebLocalFrame* frame, int world_id);
+ virtual void didCreateDocumentElement(blink::WebLocalFrame* frame);
+ virtual void didReceiveTitle(blink::WebLocalFrame* frame,
const blink::WebString& title,
blink::WebTextDirection direction);
- virtual void didChangeIcon(blink::WebFrame*,
- blink::WebIconURL::Type);
- virtual void didFinishDocumentLoad(blink::WebFrame* frame);
- virtual void didHandleOnloadEvents(blink::WebFrame* frame);
- virtual void didFailLoad(blink::WebFrame* frame,
+ virtual void didChangeIcon(blink::WebLocalFrame*, blink::WebIconURL::Type);
+ virtual void didFinishDocumentLoad(blink::WebLocalFrame* frame);
+ virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame);
+ virtual void didFailLoad(blink::WebLocalFrame* frame,
const blink::WebURLError& error);
- virtual void didFinishLoad(blink::WebFrame* frame);
- virtual void didNavigateWithinPage(blink::WebFrame* frame,
+ virtual void didFinishLoad(blink::WebLocalFrame* frame);
+ virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
bool is_new_navigation);
- virtual void didUpdateCurrentHistoryItem(blink::WebFrame* frame);
- virtual void willSendRequest(blink::WebFrame* frame,
+ virtual void didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame);
+ virtual void willSendRequest(blink::WebLocalFrame* frame,
unsigned identifier,
blink::WebURLRequest& request,
const blink::WebURLResponse& redirect_response);
- virtual void didReceiveResponse(blink::WebFrame* frame,
+ virtual void didReceiveResponse(blink::WebLocalFrame* frame,
unsigned identifier,
const blink::WebURLResponse& response);
- virtual void didFinishResourceLoad(blink::WebFrame* frame,
+ virtual void didFinishResourceLoad(blink::WebLocalFrame* frame,
unsigned identifier);
virtual void didLoadResourceFromMemoryCache(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebURLRequest& request,
const blink::WebURLResponse&);
- virtual void didDisplayInsecureContent(blink::WebFrame* frame);
- virtual void didRunInsecureContent(
- blink::WebFrame* frame,
- const blink::WebSecurityOrigin& origin,
- const blink::WebURL& target);
- virtual void didCreateScriptContext(blink::WebFrame* frame,
+ virtual void didDisplayInsecureContent(blink::WebLocalFrame* frame);
+ virtual void didRunInsecureContent(blink::WebLocalFrame* frame,
+ const blink::WebSecurityOrigin& origin,
+ const blink::WebURL& target);
+ virtual void didCreateScriptContext(blink::WebLocalFrame* frame,
v8::Handle<v8::Context>,
int extension_group,
int world_id);
- virtual void willReleaseScriptContext(blink::WebFrame* frame,
+ virtual void willReleaseScriptContext(blink::WebLocalFrame* frame,
v8::Handle<v8::Context>,
int world_id);
- virtual void didChangeScrollOffset(blink::WebFrame* frame);
- virtual void willInsertBody(blink::WebFrame* frame);
- virtual void didFirstVisuallyNonEmptyLayout(blink::WebFrame*);
- virtual void didChangeContentsSize(blink::WebFrame* frame,
+ virtual void didChangeScrollOffset(blink::WebLocalFrame* frame);
+ virtual void willInsertBody(blink::WebLocalFrame* frame);
+ virtual void didFirstVisuallyNonEmptyLayout(blink::WebLocalFrame*);
+ virtual void didChangeContentsSize(blink::WebLocalFrame* frame,
const blink::WebSize& size);
virtual void reportFindInPageMatchCount(int request_id,
int count,
@@ -601,29 +597,27 @@ class CONTENT_EXPORT RenderViewImpl
virtual void reportFindInPageSelection(int request_id,
int active_match_ordinal,
const blink::WebRect& sel);
- virtual void requestStorageQuota(
- blink::WebFrame* frame,
- blink::WebStorageQuotaType type,
- unsigned long long requested_size,
- blink::WebStorageQuotaCallbacks callbacks);
+ virtual void requestStorageQuota(blink::WebLocalFrame* frame,
+ blink::WebStorageQuotaType type,
+ unsigned long long requested_size,
+ blink::WebStorageQuotaCallbacks callbacks);
virtual void willOpenSocketStream(
blink::WebSocketStreamHandle* handle);
- virtual void willStartUsingPeerConnectionHandler(blink::WebFrame* frame,
+ virtual void willStartUsingPeerConnectionHandler(
+ blink::WebLocalFrame* frame,
blink::WebRTCPeerConnectionHandler* handler);
virtual bool willCheckAndDispatchMessageEvent(
- blink::WebFrame* sourceFrame,
+ blink::WebLocalFrame* sourceFrame,
blink::WebFrame* targetFrame,
blink::WebSecurityOrigin targetOrigin,
blink::WebDOMMessageEvent event);
virtual blink::WebString acceptLanguages();
- virtual blink::WebString userAgentOverride(
- blink::WebFrame* frame,
- const blink::WebURL& url);
- virtual blink::WebString doNotTrackValue(blink::WebFrame* frame);
- virtual bool allowWebGL(blink::WebFrame* frame, bool default_value);
- virtual void didLoseWebGLContext(
- blink::WebFrame* frame,
- int arb_robustness_status_code);
+ virtual blink::WebString userAgentOverride(blink::WebLocalFrame* frame,
+ const blink::WebURL& url);
+ virtual blink::WebString doNotTrackValue(blink::WebLocalFrame* frame);
+ virtual bool allowWebGL(blink::WebLocalFrame* frame, bool default_value);
+ virtual void didLoseWebGLContext(blink::WebLocalFrame* frame,
+ int arb_robustness_status_code);
// blink::WebPageSerializerClient implementation ----------------------------
@@ -649,7 +643,7 @@ class CONTENT_EXPORT RenderViewImpl
virtual bool GetContentStateImmediately() const OVERRIDE;
virtual float GetFilteredTimePerFrame() const OVERRIDE;
virtual blink::WebPageVisibilityState GetVisibilityState() const OVERRIDE;
- virtual void RunModalAlertDialog(blink::WebFrame* frame,
+ virtual void RunModalAlertDialog(blink::WebLocalFrame* frame,
const blink::WebString& message) OVERRIDE;
virtual void DidStartLoading() OVERRIDE;
virtual void DidStopLoading() OVERRIDE;
« content/renderer/render_frame_impl.h ('K') | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('j') | content/shell/renderer/test_runner/WebFrameTestProxy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698