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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/render_frame_impl.cc

Issue 222973003: Conversion of content_shell target to use WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed rebase 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 3b80b812232672744b132c36550550c569f78818..b18c55126eb9bcac8657cd7e8e01b2d84b659941 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -109,6 +109,7 @@ using blink::WebElement;
using blink::WebFrame;
using blink::WebHistoryItem;
using blink::WebHTTPBody;
+using blink::WebLocalFrame;
using blink::WebNavigationPolicy;
using blink::WebNavigationType;
using blink::WebNode;
@@ -330,7 +331,7 @@ RenderFrameImpl::~RenderFrameImpl() {
RenderThread::Get()->RemoveRoute(routing_id_);
}
-void RenderFrameImpl::SetWebFrame(blink::WebFrame* web_frame) {
+void RenderFrameImpl::SetWebFrame(blink::WebLocalFrame* web_frame) {
DCHECK(!frame_);
std::pair<FrameMap::iterator, bool> result = g_frame_map.Get().insert(
@@ -1156,10 +1157,9 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
#endif
}
-void RenderFrameImpl::LoadURLExternally(
- blink::WebFrame* frame,
- const blink::WebURLRequest& request,
- blink::WebNavigationPolicy policy) {
+void RenderFrameImpl::LoadURLExternally(blink::WebLocalFrame* frame,
+ const blink::WebURLRequest& request,
+ blink::WebNavigationPolicy policy) {
DCHECK(!frame_ || frame_ == frame);
loadURLExternally(frame, request, policy);
}
@@ -1176,7 +1176,7 @@ void RenderFrameImpl::OnChildFrameProcessGone() {
// blink::WebFrameClient implementation ----------------------------------------
blink::WebPlugin* RenderFrameImpl::createPlugin(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebPluginParams& params) {
DCHECK_EQ(frame_, frame);
blink::WebPlugin* plugin = NULL;
@@ -1209,7 +1209,7 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
}
blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebURL& url,
blink::WebMediaPlayerClient* client) {
DCHECK(!frame_ || frame_ == frame);
@@ -1221,7 +1221,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
blink::WebContentDecryptionModule*
RenderFrameImpl::createContentDecryptionModule(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebSecurityOrigin& security_origin,
const blink::WebString& key_system) {
DCHECK(!frame_ || frame_ == frame);
@@ -1230,7 +1230,7 @@ RenderFrameImpl::createContentDecryptionModule(
}
blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
blink::WebApplicationCacheHostClient* client) {
if (!frame || !frame->view())
return NULL;
@@ -1241,7 +1241,8 @@ blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
}
blink::WebWorkerPermissionClientProxy*
-RenderFrameImpl::createWorkerPermissionClientProxy(blink::WebFrame* frame) {
+RenderFrameImpl::createWorkerPermissionClientProxy(
+ blink::WebLocalFrame* frame) {
if (!frame || !frame->view())
return NULL;
DCHECK(!frame_ || frame_ == frame);
@@ -1249,13 +1250,13 @@ RenderFrameImpl::createWorkerPermissionClientProxy(blink::WebFrame* frame) {
this, frame);
}
-blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebFrame* frame) {
+blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
return &cookie_jar_;
}
blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider(
- blink::WebFrame* frame) {
+ blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
// At this point we should have non-null data source.
DCHECK(frame->dataSource());
@@ -1269,13 +1270,13 @@ blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider(
ChildThread::current()->thread_safe_sender(), provider_id);
}
-void RenderFrameImpl::didAccessInitialDocument(blink::WebFrame* frame) {
+void RenderFrameImpl::didAccessInitialDocument(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
render_view_->didAccessInitialDocument(frame);
}
blink::WebFrame* RenderFrameImpl::createChildFrame(
- blink::WebFrame* parent,
+ blink::WebLocalFrame* parent,
const blink::WebString& name) {
// Synchronously notify the browser of a child frame creation to get the
// routing_id for the RenderFrame.
@@ -1300,14 +1301,14 @@ blink::WebFrame* RenderFrameImpl::createChildFrame(
RenderFrameImpl* child_render_frame = RenderFrameImpl::Create(
render_view_.get(), child_routing_id);
- blink::WebFrame* web_frame = WebFrame::create(child_render_frame);
+ blink::WebLocalFrame* web_frame = WebLocalFrame::create(child_render_frame);
parent->appendChild(web_frame);
child_render_frame->SetWebFrame(web_frame);
return web_frame;
}
-void RenderFrameImpl::didDisownOpener(blink::WebFrame* frame) {
+void RenderFrameImpl::didDisownOpener(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
render_view_->didDisownOpener(frame);
}
@@ -1367,7 +1368,7 @@ void RenderFrameImpl::willClose(blink::WebFrame* frame) {
render_view_->willClose(frame);
}
-void RenderFrameImpl::didChangeName(blink::WebFrame* frame,
+void RenderFrameImpl::didChangeName(blink::WebLocalFrame* frame,
const blink::WebString& name) {
DCHECK(!frame_ || frame_ == frame);
if (!render_view_->renderer_preferences_.report_frame_name_changes)
@@ -1381,7 +1382,7 @@ void RenderFrameImpl::didChangeName(blink::WebFrame* frame,
}
void RenderFrameImpl::didMatchCSS(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebVector<blink::WebString>& newly_matching_selectors,
const blink::WebVector<blink::WebString>& stopped_matching_selectors) {
DCHECK(!frame_ || frame_ == frame);
@@ -1445,7 +1446,7 @@ void RenderFrameImpl::didAddMessageToConsole(
source_name));
}
-void RenderFrameImpl::loadURLExternally(blink::WebFrame* frame,
+void RenderFrameImpl::loadURLExternally(blink::WebLocalFrame* frame,
const blink::WebURLRequest& request,
blink::WebNavigationPolicy policy) {
DCHECK(!frame_ || frame_ == frame);
@@ -1453,7 +1454,7 @@ void RenderFrameImpl::loadURLExternally(blink::WebFrame* frame,
}
void RenderFrameImpl::loadURLExternally(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebURLRequest& request,
blink::WebNavigationPolicy policy,
const blink::WebString& suggested_name) {
@@ -1469,7 +1470,7 @@ void RenderFrameImpl::loadURLExternally(
}
blink::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
blink::WebDataSource::ExtraData* extra_data,
const blink::WebURLRequest& request,
blink::WebNavigationType type,
@@ -1485,7 +1486,7 @@ blink::WebHistoryItem RenderFrameImpl::historyItemForNewChildFrame(
return render_view_->webview()->itemForNewChildFrame(frame);
}
-void RenderFrameImpl::willSendSubmitEvent(blink::WebFrame* frame,
+void RenderFrameImpl::willSendSubmitEvent(blink::WebLocalFrame* frame,
const blink::WebFormElement& form) {
DCHECK(!frame_ || frame_ == frame);
// Call back to RenderViewImpl for observers to be notified.
@@ -1493,7 +1494,7 @@ void RenderFrameImpl::willSendSubmitEvent(blink::WebFrame* frame,
render_view_->willSendSubmitEvent(frame, form);
}
-void RenderFrameImpl::willSubmitForm(blink::WebFrame* frame,
+void RenderFrameImpl::willSubmitForm(blink::WebLocalFrame* frame,
const blink::WebFormElement& form) {
DCHECK(!frame_ || frame_ == frame);
DocumentState* document_state =
@@ -1518,7 +1519,7 @@ void RenderFrameImpl::willSubmitForm(blink::WebFrame* frame,
render_view_->willSubmitForm(frame, form);
}
-void RenderFrameImpl::didCreateDataSource(blink::WebFrame* frame,
+void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame,
blink::WebDataSource* datasource) {
DCHECK(!frame_ || frame_ == frame);
@@ -1538,7 +1539,7 @@ void RenderFrameImpl::didCreateDataSource(blink::WebFrame* frame,
network_provider.Pass());
}
-void RenderFrameImpl::didStartProvisionalLoad(blink::WebFrame* frame) {
+void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
WebDataSource* ds = frame->provisionalDataSource();
@@ -1593,7 +1594,7 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebFrame* frame) {
}
void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
- blink::WebFrame* frame) {
+ blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
render_view_->webview()->removeChildrenForRedirect(frame);
if (frame->parent())
@@ -1616,9 +1617,8 @@ void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
}
}
-void RenderFrameImpl::didFailProvisionalLoad(
- blink::WebFrame* frame,
- const blink::WebURLError& error) {
+void RenderFrameImpl::didFailProvisionalLoad(blink::WebLocalFrame* frame,
+ const blink::WebURLError& error) {
DCHECK(!frame_ || frame_ == frame);
WebDataSource* ds = frame->provisionalDataSource();
DCHECK(ds);
@@ -1729,7 +1729,7 @@ void RenderFrameImpl::didCommitProvisionalLoad(
didCommitProvisionalLoad(frame, commit_type == blink::WebStandardCommit);
}
-void RenderFrameImpl::didCommitProvisionalLoad(blink::WebFrame* frame,
+void RenderFrameImpl::didCommitProvisionalLoad(blink::WebLocalFrame* frame,
bool is_new_navigation) {
DCHECK(!frame_ || frame_ == frame);
DocumentState* document_state =
@@ -1822,7 +1822,7 @@ void RenderFrameImpl::didCommitProvisionalLoad(blink::WebFrame* frame,
render_view_->UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
}
-void RenderFrameImpl::didClearWindowObject(blink::WebFrame* frame,
+void RenderFrameImpl::didClearWindowObject(blink::WebLocalFrame* frame,
int world_id) {
DCHECK(!frame_ || frame_ == frame);
// TODO(nasko): Move implementation here. Needed state:
@@ -1843,7 +1843,7 @@ void RenderFrameImpl::didClearWindowObject(blink::WebFrame* frame,
DidClearWindowObject(world_id));
}
-void RenderFrameImpl::didCreateDocumentElement(blink::WebFrame* frame) {
+void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
// Notify the browser about non-blank documents loading in the top frame.
@@ -1862,7 +1862,7 @@ void RenderFrameImpl::didCreateDocumentElement(blink::WebFrame* frame) {
render_view_->didCreateDocumentElement(frame);
}
-void RenderFrameImpl::didReceiveTitle(blink::WebFrame* frame,
+void RenderFrameImpl::didReceiveTitle(blink::WebLocalFrame* frame,
const blink::WebString& title,
blink::WebTextDirection direction) {
DCHECK(!frame_ || frame_ == frame);
@@ -1870,14 +1870,14 @@ void RenderFrameImpl::didReceiveTitle(blink::WebFrame* frame,
render_view_->didReceiveTitle(frame, title, direction);
}
-void RenderFrameImpl::didChangeIcon(blink::WebFrame* frame,
+void RenderFrameImpl::didChangeIcon(blink::WebLocalFrame* frame,
blink::WebIconURL::Type icon_type) {
DCHECK(!frame_ || frame_ == frame);
// TODO(nasko): Investigate wheather implementation should move here.
render_view_->didChangeIcon(frame, icon_type);
}
-void RenderFrameImpl::didFinishDocumentLoad(blink::WebFrame* frame) {
+void RenderFrameImpl::didFinishDocumentLoad(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
WebDataSource* ds = frame->dataSource();
DocumentState* document_state = DocumentState::FromDataSource(ds);
@@ -1895,14 +1895,14 @@ void RenderFrameImpl::didFinishDocumentLoad(blink::WebFrame* frame) {
render_view_->UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
}
-void RenderFrameImpl::didHandleOnloadEvents(blink::WebFrame* frame) {
+void RenderFrameImpl::didHandleOnloadEvents(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
// TODO(nasko): Move implementation here. Needed state:
// * page_id_
render_view_->didHandleOnloadEvents(frame);
}
-void RenderFrameImpl::didFailLoad(blink::WebFrame* frame,
+void RenderFrameImpl::didFailLoad(blink::WebLocalFrame* frame,
const blink::WebURLError& error) {
DCHECK(!frame_ || frame_ == frame);
// TODO(nasko): Move implementation here. No state needed.
@@ -1926,7 +1926,7 @@ void RenderFrameImpl::didFailLoad(blink::WebFrame* frame,
error_description));
}
-void RenderFrameImpl::didFinishLoad(blink::WebFrame* frame) {
+void RenderFrameImpl::didFinishLoad(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
WebDataSource* ds = frame->dataSource();
DocumentState* document_state = DocumentState::FromDataSource(ds);
@@ -1970,7 +1970,7 @@ void RenderFrameImpl::didNavigateWithinPage(blink::WebFrame* frame,
didCommitProvisionalLoad(frame, item, commit_type);
}
-void RenderFrameImpl::didNavigateWithinPage(blink::WebFrame* frame,
+void RenderFrameImpl::didNavigateWithinPage(blink::WebLocalFrame* frame,
bool is_new_navigation) {
DCHECK(!frame_ || frame_ == frame);
// If this was a reference fragment navigation that we initiated, then we
@@ -1990,7 +1990,7 @@ void RenderFrameImpl::didNavigateWithinPage(blink::WebFrame* frame,
didCommitProvisionalLoad(frame, is_new_navigation);
}
-void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebFrame* frame) {
+void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
// TODO(nasko): Move implementation here. Needed methods:
// * StartNavStateSyncTimerIfNecessary
@@ -2067,7 +2067,7 @@ void RenderFrameImpl::clearContextMenu() {
}
void RenderFrameImpl::willRequestAfterPreconnect(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
blink::WebURLRequest& request) {
DCHECK(!frame_ || frame_ == frame);
// FIXME(kohei): This will never be set.
@@ -2085,7 +2085,7 @@ void RenderFrameImpl::willRequestAfterPreconnect(
}
void RenderFrameImpl::willSendRequest(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
unsigned identifier,
blink::WebURLRequest& request,
const blink::WebURLResponse& redirect_response) {
@@ -2243,7 +2243,7 @@ void RenderFrameImpl::willSendRequest(
}
void RenderFrameImpl::didReceiveResponse(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
unsigned identifier,
const blink::WebURLResponse& response) {
DCHECK(!frame_ || frame_ == frame);
@@ -2289,7 +2289,7 @@ void RenderFrameImpl::didReceiveResponse(
internal_data->set_use_error_page(true);
}
-void RenderFrameImpl::didFinishResourceLoad(blink::WebFrame* frame,
+void RenderFrameImpl::didFinishResourceLoad(blink::WebLocalFrame* frame,
unsigned identifier) {
DCHECK(!frame_ || frame_ == frame);
// TODO(nasko): Move implementation here. Needed state:
@@ -2300,7 +2300,7 @@ void RenderFrameImpl::didFinishResourceLoad(blink::WebFrame* frame,
}
void RenderFrameImpl::didLoadResourceFromMemoryCache(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebURLRequest& request,
const blink::WebURLResponse& response) {
DCHECK(!frame_ || frame_ == frame);
@@ -2323,14 +2323,14 @@ void RenderFrameImpl::didLoadResourceFromMemoryCache(
ResourceType::FromTargetType(request.targetType())));
}
-void RenderFrameImpl::didDisplayInsecureContent(blink::WebFrame* frame) {
+void RenderFrameImpl::didDisplayInsecureContent(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
render_view_->Send(new ViewHostMsg_DidDisplayInsecureContent(
render_view_->GetRoutingID()));
}
void RenderFrameImpl::didRunInsecureContent(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
const blink::WebSecurityOrigin& origin,
const blink::WebURL& target) {
DCHECK(!frame_ || frame_ == frame);
@@ -2340,7 +2340,7 @@ void RenderFrameImpl::didRunInsecureContent(
target));
}
-void RenderFrameImpl::didAbortLoading(blink::WebFrame* frame) {
+void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
#if defined(ENABLE_PLUGINS)
if (frame != render_view_->webview()->mainFrame())
@@ -2350,7 +2350,7 @@ void RenderFrameImpl::didAbortLoading(blink::WebFrame* frame) {
#endif
}
-void RenderFrameImpl::didCreateScriptContext(blink::WebFrame* frame,
+void RenderFrameImpl::didCreateScriptContext(blink::WebLocalFrame* frame,
v8::Handle<v8::Context> context,
int extension_group,
int world_id) {
@@ -2359,7 +2359,7 @@ void RenderFrameImpl::didCreateScriptContext(blink::WebFrame* frame,
frame, context, extension_group, world_id);
}
-void RenderFrameImpl::willReleaseScriptContext(blink::WebFrame* frame,
+void RenderFrameImpl::willReleaseScriptContext(blink::WebLocalFrame* frame,
v8::Handle<v8::Context> context,
int world_id) {
DCHECK(!frame_ || frame_ == frame);
@@ -2369,12 +2369,13 @@ void RenderFrameImpl::willReleaseScriptContext(blink::WebFrame* frame,
WillReleaseScriptContext(context, world_id));
}
-void RenderFrameImpl::didFirstVisuallyNonEmptyLayout(blink::WebFrame* frame) {
+void RenderFrameImpl::didFirstVisuallyNonEmptyLayout(
+ blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
render_view_->didFirstVisuallyNonEmptyLayout(frame);
}
-void RenderFrameImpl::didChangeContentsSize(blink::WebFrame* frame,
+void RenderFrameImpl::didChangeContentsSize(blink::WebLocalFrame* frame,
const blink::WebSize& size) {
DCHECK(!frame_ || frame_ == frame);
// TODO(nasko): Move implementation here. Needed state:
@@ -2383,14 +2384,14 @@ void RenderFrameImpl::didChangeContentsSize(blink::WebFrame* frame,
render_view_->didChangeContentsSize(frame, size);
}
-void RenderFrameImpl::didChangeScrollOffset(blink::WebFrame* frame) {
+void RenderFrameImpl::didChangeScrollOffset(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
// TODO(nasko): Move implementation here. Needed methods:
// * StartNavStateSyncTimerIfNecessary
render_view_->didChangeScrollOffset(frame);
}
-void RenderFrameImpl::willInsertBody(blink::WebFrame* frame) {
+void RenderFrameImpl::willInsertBody(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
if (!frame->parent()) {
render_view_->Send(new ViewHostMsg_WillInsertBody(
@@ -2420,7 +2421,7 @@ void RenderFrameImpl::reportFindInPageSelection(
}
void RenderFrameImpl::requestStorageQuota(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
blink::WebStorageQuotaType type,
unsigned long long requested_size,
blink::WebStorageQuotaCallbacks callbacks) {
@@ -2445,7 +2446,7 @@ void RenderFrameImpl::willOpenSocketStream(
}
void RenderFrameImpl::willStartUsingPeerConnectionHandler(
- blink::WebFrame* frame,
+ blink::WebLocalFrame* frame,
blink::WebRTCPeerConnectionHandler* handler) {
DCHECK(!frame_ || frame_ == frame);
#if defined(ENABLE_WEBRTC)
@@ -2454,7 +2455,7 @@ void RenderFrameImpl::willStartUsingPeerConnectionHandler(
}
bool RenderFrameImpl::willCheckAndDispatchMessageEvent(
- blink::WebFrame* sourceFrame,
+ blink::WebLocalFrame* sourceFrame,
blink::WebFrame* targetFrame,
blink::WebSecurityOrigin targetOrigin,
blink::WebDOMMessageEvent event) {
@@ -2465,9 +2466,8 @@ bool RenderFrameImpl::willCheckAndDispatchMessageEvent(
sourceFrame, targetFrame, targetOrigin, event);
}
-blink::WebString RenderFrameImpl::userAgentOverride(
- blink::WebFrame* frame,
- const blink::WebURL& url) {
+blink::WebString RenderFrameImpl::userAgentOverride(blink::WebLocalFrame* frame,
+ const blink::WebURL& url) {
DCHECK(!frame_ || frame_ == frame);
if (!render_view_->webview() || !render_view_->webview()->mainFrame() ||
render_view_->renderer_preferences_.user_agent_override.empty()) {
@@ -2491,14 +2491,15 @@ blink::WebString RenderFrameImpl::userAgentOverride(
return blink::WebString();
}
-blink::WebString RenderFrameImpl::doNotTrackValue(blink::WebFrame* frame) {
+blink::WebString RenderFrameImpl::doNotTrackValue(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame);
if (render_view_->renderer_preferences_.enable_do_not_track)
return WebString::fromUTF8("1");
return WebString();
}
-bool RenderFrameImpl::allowWebGL(blink::WebFrame* frame, bool default_value) {
+bool RenderFrameImpl::allowWebGL(blink::WebLocalFrame* frame,
+ bool default_value) {
DCHECK(!frame_ || frame_ == frame);
if (!default_value)
return false;
@@ -2512,7 +2513,7 @@ bool RenderFrameImpl::allowWebGL(blink::WebFrame* frame, bool default_value) {
return !blocked;
}
-void RenderFrameImpl::didLoseWebGLContext(blink::WebFrame* frame,
+void RenderFrameImpl::didLoseWebGLContext(blink::WebLocalFrame* frame,
int arb_robustness_status_code) {
DCHECK(!frame_ || frame_ == frame);
render_view_->Send(new ViewHostMsg_DidLose3DContext(
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698