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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 12089100: Delete flag --enable-css-transform-pinch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 3287 matching lines...) Expand 10 before | Expand all | Expand 10 after
3298 } 3298 }
3299 3299
3300 ProcessAcceleratedPinchZoomFlags(command_line); 3300 ProcessAcceleratedPinchZoomFlags(command_line);
3301 } 3301 }
3302 3302
3303 void RenderViewImpl::ProcessAcceleratedPinchZoomFlags( 3303 void RenderViewImpl::ProcessAcceleratedPinchZoomFlags(
3304 const CommandLine& command_line) { 3304 const CommandLine& command_line) {
3305 if (!webview()->isAcceleratedCompositingActive()) 3305 if (!webview()->isAcceleratedCompositingActive())
3306 return; 3306 return;
3307 3307
3308 bool enable_viewport = command_line.HasSwitch(switches::kEnableViewport); 3308 if (command_line.HasSwitch(switches::kEnableViewport))
3309 bool enable_pinch = command_line.HasSwitch(switches::kEnablePinch)
3310 || command_line.HasSwitch(switches::kEnableCssTransformPinch);
3311
3312 if (enable_viewport)
3313 return; 3309 return;
3314 3310
3315 if (enable_pinch) 3311 if (command_line.HasSwitch(switches::kEnablePinch))
3316 webview()->setPageScaleFactorLimits(1, 4); 3312 webview()->setPageScaleFactorLimits(1, 4);
3317 else 3313 else
3318 webview()->setPageScaleFactorLimits(1, 1); 3314 webview()->setPageScaleFactorLimits(1, 1);
3319 } 3315 }
3320 3316
3321 void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) { 3317 void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {
3322 WebDataSource* ds = frame->provisionalDataSource(); 3318 WebDataSource* ds = frame->provisionalDataSource();
3323 3319
3324 // In fast/loader/stop-provisional-loads.html, we abort the load before this 3320 // In fast/loader/stop-provisional-loads.html, we abort the load before this
3325 // callback is invoked. 3321 // callback is invoked.
(...skipping 3258 matching lines...) Expand 10 before | Expand all | Expand 10 after
6584 } 6580 }
6585 #endif 6581 #endif
6586 6582
6587 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( 6583 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
6588 TransportDIB::Handle dib_handle) { 6584 TransportDIB::Handle dib_handle) {
6589 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6585 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6590 RenderProcess::current()->ReleaseTransportDIB(dib); 6586 RenderProcess::current()->ReleaseTransportDIB(dib);
6591 } 6587 }
6592 6588
6593 } // namespace content 6589 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698