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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 return false; | 535 return false; |
536 | 536 |
537 if (command_line.HasSwitch(switches::kEnableCompositingForFixedPosition)) | 537 if (command_line.HasSwitch(switches::kEnableCompositingForFixedPosition)) |
538 return true; | 538 return true; |
539 | 539 |
540 if (device_scale_factor > 1.0f && | 540 if (device_scale_factor > 1.0f && |
541 command_line.HasSwitch( | 541 command_line.HasSwitch( |
542 switches::kEnableHighDpiCompositingForFixedPosition)) | 542 switches::kEnableHighDpiCompositingForFixedPosition)) |
543 return true; | 543 return true; |
544 | 544 |
545 // Default, when no switches are specified, is also dependent on high-DPI. | 545 // Default, when no switches are specified, is disabled. |
546 return device_scale_factor > 1.0f; | 546 return false; |
547 } | 547 } |
548 | 548 |
549 /////////////////////////////////////////////////////////////////////////////// | 549 /////////////////////////////////////////////////////////////////////////////// |
550 | 550 |
551 struct RenderViewImpl::PendingFileChooser { | 551 struct RenderViewImpl::PendingFileChooser { |
552 PendingFileChooser(const FileChooserParams& p, WebFileChooserCompletion* c) | 552 PendingFileChooser(const FileChooserParams& p, WebFileChooserCompletion* c) |
553 : params(p), | 553 : params(p), |
554 completion(c) { | 554 completion(c) { |
555 } | 555 } |
556 FileChooserParams params; | 556 FileChooserParams params; |
(...skipping 5974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6531 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6531 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6532 RenderProcess::current()->ReleaseTransportDIB(dib); | 6532 RenderProcess::current()->ReleaseTransportDIB(dib); |
6533 } | 6533 } |
6534 | 6534 |
6535 void RenderViewImpl::DidCommitCompositorFrame() { | 6535 void RenderViewImpl::DidCommitCompositorFrame() { |
6536 RenderWidget::DidCommitCompositorFrame(); | 6536 RenderWidget::DidCommitCompositorFrame(); |
6537 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); | 6537 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); |
6538 } | 6538 } |
6539 | 6539 |
6540 } // namespace content | 6540 } // namespace content |
OLD | NEW |