summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorsschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-03 00:23:07 +0000
committersschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-03 00:23:07 +0000
commitef992ad8abd83fc74484968a64447b8d6e469877 (patch)
tree4e94c07e343e39f7e8b6232addedb03317f5150e /content
parentb4cb12d05e2fd61994e2478a51732cdcac6dfaf6 (diff)
downloadchromium_src-ef992ad8abd83fc74484968a64447b8d6e469877.zip
chromium_src-ef992ad8abd83fc74484968a64447b8d6e469877.tar.gz
chromium_src-ef992ad8abd83fc74484968a64447b8d6e469877.tar.bz2
Undo change to render_view_impl.cc for crbug.com/153907 (Request Table Site not working)
Pre request from dfalcantara@: When you get a chance, can you try reverting the change you landed to render_view_impl.cc for http://crbug.com/153907 ? We ended up getting bitten by a similar bug as you guys and a fix for WebKit just landed that should address it. Solution: removed "#if defined(OS_ANDROID)" around one line of code. See also: https://chromiumcodereview.appspot.com/11227065/ BUG=166652 TEST=manual:enable "Request RTS flag" (chrome://flags "Enables the request tablet site option in the settings menu"). Navigate to something like: www.whatsmyua.com www.whatsmyuseragent.com www.espn.com www.facebook.com Under Settings toggle "Request Tablet Site". Observe the page reloading with "tablet site look". Exit and reenter chrome with one or more tabs that have RTS enabled and observe "look". Review URL: https://chromiumcodereview.appspot.com/11678004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/render_view_impl.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index e659a48..4666171 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3408,9 +3408,7 @@ void RenderViewImpl::didCommitProvisionalLoad(WebFrame* frame,
document_state->set_commit_load_time(Time::Now());
if (document_state->must_reset_scroll_and_scale_state()) {
-#if defined(OS_ANDROID) // crbug.com/153907
webview()->resetScrollAndScaleState();
-#endif
document_state->set_must_reset_scroll_and_scale_state(false);
}