| OLD | NEW | 
|---|
| 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 #include <string> | 9 #include <string> | 
| 10 #include <vector> | 10 #include <vector> | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 21 #include "base/metrics/histogram.h" | 21 #include "base/metrics/histogram.h" | 
| 22 #include "base/path_service.h" | 22 #include "base/path_service.h" | 
| 23 #include "base/process_util.h" | 23 #include "base/process_util.h" | 
| 24 #include "base/string_number_conversions.h" | 24 #include "base/string_number_conversions.h" | 
| 25 #include "base/string_piece.h" | 25 #include "base/string_piece.h" | 
| 26 #include "base/string_split.h" | 26 #include "base/string_split.h" | 
| 27 #include "base/string_util.h" | 27 #include "base/string_util.h" | 
| 28 #include "base/sys_string_conversions.h" | 28 #include "base/sys_string_conversions.h" | 
| 29 #include "base/time.h" | 29 #include "base/time.h" | 
| 30 #include "base/utf_string_conversions.h" | 30 #include "base/utf_string_conversions.h" | 
|  | 31 #include "cc/switches.h" | 
| 31 #include "content/common/appcache/appcache_dispatcher.h" | 32 #include "content/common/appcache/appcache_dispatcher.h" | 
| 32 #include "content/common/child_thread.h" | 33 #include "content/common/child_thread.h" | 
| 33 #include "content/common/clipboard_messages.h" | 34 #include "content/common/clipboard_messages.h" | 
| 34 #include "content/common/content_constants_internal.h" | 35 #include "content/common/content_constants_internal.h" | 
| 35 #include "content/common/database_messages.h" | 36 #include "content/common/database_messages.h" | 
| 36 #include "content/common/drag_messages.h" | 37 #include "content/common/drag_messages.h" | 
| 37 #include "content/common/fileapi/file_system_dispatcher.h" | 38 #include "content/common/fileapi/file_system_dispatcher.h" | 
| 38 #include "content/common/fileapi/webfilesystem_callback_dispatcher.h" | 39 #include "content/common/fileapi/webfilesystem_callback_dispatcher.h" | 
| 39 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 40 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 
| 40 #include "content/common/intents_messages.h" | 41 #include "content/common/intents_messages.h" | 
| (...skipping 3141 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3182   ProcessAcceleratedPinchZoomFlags(command_line); | 3183   ProcessAcceleratedPinchZoomFlags(command_line); | 
| 3183 } | 3184 } | 
| 3184 | 3185 | 
| 3185 void RenderViewImpl::ProcessAcceleratedPinchZoomFlags( | 3186 void RenderViewImpl::ProcessAcceleratedPinchZoomFlags( | 
| 3186     const CommandLine& command_line) { | 3187     const CommandLine& command_line) { | 
| 3187   bool enable_viewport = | 3188   bool enable_viewport = | 
| 3188       command_line.HasSwitch(switches::kEnableViewport); | 3189       command_line.HasSwitch(switches::kEnableViewport); | 
| 3189   bool enable_pinch = enable_viewport || | 3190   bool enable_pinch = enable_viewport || | 
| 3190                       command_line.HasSwitch(switches::kEnablePinch); | 3191                       command_line.HasSwitch(switches::kEnablePinch); | 
| 3191   bool enable_pinch_in_compositor = | 3192   bool enable_pinch_in_compositor = | 
| 3192       command_line.HasSwitch(switches::kEnablePinchInCompositor); | 3193       command_line.HasSwitch(cc::switches::kEnablePinchInCompositor); | 
| 3193 | 3194 | 
| 3194   if (!enable_pinch && | 3195   if (!enable_pinch && | 
| 3195       webview()->isAcceleratedCompositingActive() && | 3196       webview()->isAcceleratedCompositingActive() && | 
| 3196       webkit_preferences_.apply_default_device_scale_factor_in_compositor && | 3197       webkit_preferences_.apply_default_device_scale_factor_in_compositor && | 
| 3197       device_scale_factor_ != 1) { | 3198       device_scale_factor_ != 1) { | 
| 3198     // Page scaling is disabled by default when applying a scale factor in the | 3199     // Page scaling is disabled by default when applying a scale factor in the | 
| 3199     // compositor since they are currently incompatible. | 3200     // compositor since they are currently incompatible. | 
| 3200     webview()->setPageScaleFactorLimits(1, 1); | 3201     webview()->setPageScaleFactorLimits(1, 1); | 
| 3201   } | 3202   } | 
| 3202 | 3203 | 
| (...skipping 3178 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 6381 | 6382 | 
| 6382   updating_frame_tree_ = true; | 6383   updating_frame_tree_ = true; | 
| 6383   active_frame_id_map_.clear(); | 6384   active_frame_id_map_.clear(); | 
| 6384 | 6385 | 
| 6385   target_process_id_ = process_id; | 6386   target_process_id_ = process_id; | 
| 6386   target_routing_id_ = route_id; | 6387   target_routing_id_ = route_id; | 
| 6387   CreateFrameTree(webview()->mainFrame(), frames); | 6388   CreateFrameTree(webview()->mainFrame(), frames); | 
| 6388 | 6389 | 
| 6389   updating_frame_tree_ = false; | 6390   updating_frame_tree_ = false; | 
| 6390 } | 6391 } | 
| OLD | NEW | 
|---|