Chromium Code Reviews| 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 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 727 if (opener_id_ == MSG_ROUTING_NONE) { | 727 if (opener_id_ == MSG_ROUTING_NONE) { |
| 728 did_show_ = true; | 728 did_show_ = true; |
| 729 CompleteInit(); | 729 CompleteInit(); |
| 730 } | 730 } |
| 731 | 731 |
| 732 g_view_map.Get().insert(std::make_pair(webview(), this)); | 732 g_view_map.Get().insert(std::make_pair(webview(), this)); |
| 733 g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this)); | 733 g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this)); |
| 734 webview()->setDeviceScaleFactor(device_scale_factor_); | 734 webview()->setDeviceScaleFactor(device_scale_factor_); |
| 735 webview()->settings()->setAcceleratedCompositingForFixedPositionEnabled( | 735 webview()->settings()->setAcceleratedCompositingForFixedPositionEnabled( |
| 736 ShouldUseFixedPositionCompositing(device_scale_factor_)); | 736 ShouldUseFixedPositionCompositing(device_scale_factor_)); |
| 737 allow_partial_swap_ = params->renderer_prefs.allow_partial_swap; | |
|
jamesr
2013/03/06 22:37:59
We store the entire renderer_prefs struct in rende
alexst (slow to review)
2013/03/06 23:12:34
renderer_preferences_ is stored on RenderViewImpl,
| |
| 737 | 738 |
| 738 webkit_preferences_.Apply(webview()); | 739 webkit_preferences_.Apply(webview()); |
| 739 webview()->initializeMainFrame(this); | 740 webview()->initializeMainFrame(this); |
| 740 | 741 |
| 741 if (command_line.HasSwitch(switches::kEnableTouchDragDrop)) | 742 if (command_line.HasSwitch(switches::kEnableTouchDragDrop)) |
| 742 webview()->settings()->setTouchDragDropEnabled(true); | 743 webview()->settings()->setTouchDragDropEnabled(true); |
| 743 | 744 |
| 744 if (!params->frame_name.empty()) | 745 if (!params->frame_name.empty()) |
| 745 webview()->mainFrame()->setName(params->frame_name); | 746 webview()->mainFrame()->setName(params->frame_name); |
| 746 webview()->settings()->setMinimumTimerInterval( | 747 webview()->settings()->setMinimumTimerInterval( |
| (...skipping 6000 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6747 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6748 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
| 6748 RenderProcess::current()->ReleaseTransportDIB(dib); | 6749 RenderProcess::current()->ReleaseTransportDIB(dib); |
| 6749 } | 6750 } |
| 6750 | 6751 |
| 6751 void RenderViewImpl::DidCommitCompositorFrame() { | 6752 void RenderViewImpl::DidCommitCompositorFrame() { |
| 6752 RenderWidget::DidCommitCompositorFrame(); | 6753 RenderWidget::DidCommitCompositorFrame(); |
| 6753 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); | 6754 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); |
| 6754 } | 6755 } |
| 6755 | 6756 |
| 6756 } // namespace content | 6757 } // namespace content |
| OLD | NEW |