| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 120d55863df289c3d50cb2dcb642b2302a31b5b3..f38051497d1dac5ac1f0109df5fdddaaee97a9b7 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -655,7 +655,6 @@ media::Context3D GetSharedMainThreadContext3D(
|
| bool IsReload(FrameMsg_Navigate_Type::Value navigation_type) {
|
| switch (navigation_type) {
|
| case FrameMsg_Navigate_Type::RELOAD:
|
| - case FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE:
|
| case FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE:
|
| case FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL:
|
| return true;
|
| @@ -673,8 +672,6 @@ WebFrameLoadType ReloadFrameLoadTypeFor(
|
| switch (navigation_type) {
|
| case FrameMsg_Navigate_Type::RELOAD:
|
| case FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL:
|
| - return WebFrameLoadType::Reload;
|
| - case FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE:
|
| return WebFrameLoadType::ReloadMainResource;
|
| case FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE:
|
| return WebFrameLoadType::ReloadBypassingCache;
|
| @@ -6272,6 +6269,7 @@ void RenderFrameImpl::LoadDataURL(
|
| const GURL base_url = params.base_url_for_data_url.is_empty() ?
|
| params.url : params.base_url_for_data_url;
|
| bool replace = load_type == WebFrameLoadType::ReloadBypassingCache ||
|
| + load_type == WebFrameLoadType::ReloadMainResource ||
|
| load_type == WebFrameLoadType::Reload;
|
|
|
| frame->loadData(
|
|
|