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

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

Issue 10254011: Add flag to experiments to force high DPI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2648 matching lines...) Expand 10 before | Expand all | Expand 10 after
2659 navigation_state->set_transferred_request_request_id( 2659 navigation_state->set_transferred_request_request_id(
2660 params.transferred_request_request_id); 2660 params.transferred_request_request_id);
2661 } else { 2661 } else {
2662 navigation_state = NavigationState::CreateContentInitiated(); 2662 navigation_state = NavigationState::CreateContentInitiated();
2663 } 2663 }
2664 return navigation_state; 2664 return navigation_state;
2665 } 2665 }
2666 2666
2667 void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) { 2667 void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) {
2668 bool enable_viewport = 2668 bool enable_viewport =
2669 command_line.HasSwitch(switches::kEnableViewport); 2669 command_line.HasSwitch(switches::kEnableViewport) ||
2670 // Setting a default device scale factor forces enable_viewport on.
2671 webkit_preferences_.default_device_scale_factor > 1;
2670 bool enable_fixed_layout = 2672 bool enable_fixed_layout =
2671 command_line.HasSwitch(switches::kEnableFixedLayout); 2673 command_line.HasSwitch(switches::kEnableFixedLayout);
2672 2674
2673 webview()->enableFixedLayoutMode(enable_fixed_layout || enable_viewport); 2675 webview()->enableFixedLayoutMode(enable_fixed_layout || enable_viewport);
2674 webview()->settings()->setFixedElementsLayoutRelativeToFrame(true); 2676 webview()->settings()->setFixedElementsLayoutRelativeToFrame(true);
2675 2677
2676 if (enable_viewport) { 2678 if (enable_viewport) {
2677 webview()->settings()->setViewportEnabled(true); 2679 webview()->settings()->setViewportEnabled(true);
2678 } else if (enable_fixed_layout) { 2680 } else if (enable_fixed_layout) {
2679 std::string str = 2681 std::string str =
(...skipping 2577 matching lines...) Expand 10 before | Expand all | Expand 10 after
5257 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5259 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5258 return !!RenderThreadImpl::current()->compositor_thread(); 5260 return !!RenderThreadImpl::current()->compositor_thread();
5259 } 5261 }
5260 5262
5261 void RenderViewImpl::OnJavaBridgeInit() { 5263 void RenderViewImpl::OnJavaBridgeInit() {
5262 DCHECK(!java_bridge_dispatcher_.get()); 5264 DCHECK(!java_bridge_dispatcher_.get());
5263 #if defined(ENABLE_JAVA_BRIDGE) 5265 #if defined(ENABLE_JAVA_BRIDGE)
5264 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5266 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5265 #endif 5267 #endif
5266 } 5268 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698