Commit 4b9c9e29 authored by japhet@chromium.org's avatar japhet@chromium.org

Remove didReceiveDocumentData() and set its only state in didCommitProvisionalLoad

The only use for this callback is to set state that we could just as well set in didCommitProvisionalLoad, which is called almost immediately after.

BUG=none

Review URL: https://chromiumcodereview.appspot.com/19059004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212390 0039d316-1c4b-4281-b951-d872f2087c98
parent 48e30344
......@@ -202,13 +202,6 @@ void RenderFrameImpl::didFailProvisionalLoad(
render_view_->didFailProvisionalLoad(frame, error);
}
void RenderFrameImpl::didReceiveDocumentData(WebKit::WebFrame* frame,
const char* data,
size_t length,
bool& prevent_default) {
render_view_->didReceiveDocumentData(frame, data, length, prevent_default);
}
void RenderFrameImpl::didCommitProvisionalLoad(WebKit::WebFrame* frame,
bool is_new_navigation) {
render_view_->didCommitProvisionalLoad(frame, is_new_navigation);
......
......@@ -104,10 +104,6 @@ class CONTENT_EXPORT RenderFrameImpl
virtual void didFailProvisionalLoad(
WebKit::WebFrame* frame,
const WebKit::WebURLError& error);
virtual void didReceiveDocumentData(WebKit::WebFrame* frame,
const char* data,
size_t length,
bool& prevent_default);
virtual void didCommitProvisionalLoad(WebKit::WebFrame* frame,
bool is_new_navigation);
virtual void didClearWindowObject(WebKit::WebFrame* frame);
......
......@@ -3739,14 +3739,6 @@ void RenderViewImpl::didFailProvisionalLoad(WebFrame* frame,
LoadNavigationErrorPage(frame, failed_request, error, std::string(), replace);
}
void RenderViewImpl::didReceiveDocumentData(
WebFrame* frame, const char* data, size_t data_len,
bool& prevent_default) {
InternalDocumentStateData* internal_data =
InternalDocumentStateData::FromDataSource(frame->dataSource());
internal_data->set_use_error_page(false);
}
void RenderViewImpl::didCommitProvisionalLoad(WebFrame* frame,
bool is_new_navigation) {
DocumentState* document_state =
......@@ -3762,6 +3754,7 @@ void RenderViewImpl::didCommitProvisionalLoad(WebFrame* frame,
webview()->resetScrollAndScaleState();
internal_data->set_must_reset_scroll_and_scale_state(false);
}
internal_data->set_use_error_page(false);
if (is_new_navigation) {
// When we perform a new navigation, we need to update the last committed
......
......@@ -596,9 +596,6 @@ class CONTENT_EXPORT RenderViewImpl
WebKit::WebFrame* frame);
virtual void didFailProvisionalLoad(WebKit::WebFrame* frame,
const WebKit::WebURLError& error);
virtual void didReceiveDocumentData(WebKit::WebFrame* frame,
const char* data, size_t length,
bool& prevent_default);
virtual void didCommitProvisionalLoad(WebKit::WebFrame* frame,
bool is_new_navigation);
virtual void didClearWindowObject(WebKit::WebFrame* frame);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment