diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 00:11:24 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 00:11:24 +0000 |
| commit | 47e932da0ff754c09639247651c164701da3dfe0 (patch) | |
| tree | 74257a1ffb6f1bcfd28d329fa681feaeb92ca028 /content/renderer/render_view_impl.h | |
| parent | 96b184aef3a695513b322df6d90522dede0d9749 (diff) | |
| download | chromium_src-47e932da0ff754c09639247651c164701da3dfe0.zip chromium_src-47e932da0ff754c09639247651c164701da3dfe0.tar.gz chromium_src-47e932da0ff754c09639247651c164701da3dfe0.tar.bz2 | |
Process pinch zoom flag on RenderViewImpl initialization.
Previously, we waited until compositing was activated to process the
--enable-pinch flag and set the page scale factor limits, but in reality
we don't depend on the compositor existing to set the limits. The
initialization flow is simpler and more robust if we just set it
immediately.
NOTRY=true
BUG=173049
Review URL: https://chromiumcodereview.appspot.com/12433015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.h')
| -rw-r--r-- | content/renderer/render_view_impl.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index b8614ed..80b4c21 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -1177,14 +1177,10 @@ class CONTENT_EXPORT RenderViewImpl // saved in OnNavigate(). NavigationState* CreateNavigationStateFromPending(); - // Processes the command-line flags --enable-viewport and - // --enable-fixed-layout[=w,h]. + // Processes the command-line flags --enable-viewport, + // --enable-fixed-layout[=w,h] and --enable-pinch. void ProcessViewLayoutFlags(const CommandLine& command_line); - // Processes the command-line flags --enable-pinch and - // --enable-pinch-in-compositor - void ProcessAcceleratedPinchZoomFlags(const CommandLine& command_line); - #if defined(OS_ANDROID) // Launch an Android content intent with the given URL. void LaunchAndroidContentIntent(const GURL& intent_url, size_t request_id); |