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 <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1657 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidStopLoading()); | 1657 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidStopLoading()); |
1658 } | 1658 } |
1659 } | 1659 } |
1660 | 1660 |
1661 void RenderViewImpl::AttachWebFrameWidget(blink::WebFrameWidget* frame_widget) { | 1661 void RenderViewImpl::AttachWebFrameWidget(blink::WebFrameWidget* frame_widget) { |
1662 // The previous WebFrameWidget must already be detached by CloseForFrame(). | 1662 // The previous WebFrameWidget must already be detached by CloseForFrame(). |
1663 DCHECK(!frame_widget_); | 1663 DCHECK(!frame_widget_); |
1664 frame_widget_ = frame_widget; | 1664 frame_widget_ = frame_widget; |
1665 } | 1665 } |
1666 | 1666 |
| 1667 void RenderViewImpl::NeedsMainFrame() { |
| 1668 RenderWidgetCompositor* rwc = compositor(); |
| 1669 if (!rwc) |
| 1670 return; |
| 1671 rwc->setNeedsBeginFrame(); |
| 1672 } |
| 1673 |
1667 void RenderViewImpl::SetZoomLevel(double zoom_level) { | 1674 void RenderViewImpl::SetZoomLevel(double zoom_level) { |
1668 // If we change the zoom level for the view, make sure any subsequent subframe | 1675 // If we change the zoom level for the view, make sure any subsequent subframe |
1669 // loads reflect the current zoom level. | 1676 // loads reflect the current zoom level. |
1670 page_zoom_level_ = zoom_level; | 1677 page_zoom_level_ = zoom_level; |
1671 | 1678 |
1672 webview()->setZoomLevel(zoom_level); | 1679 webview()->setZoomLevel(zoom_level); |
1673 FOR_EACH_OBSERVER(RenderViewObserver, observers_, OnZoomLevelChanged()); | 1680 FOR_EACH_OBSERVER(RenderViewObserver, observers_, OnZoomLevelChanged()); |
1674 } | 1681 } |
1675 | 1682 |
1676 void RenderViewImpl::didCancelCompositionOnSelectionChange() { | 1683 void RenderViewImpl::didCancelCompositionOnSelectionChange() { |
(...skipping 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3082 return render_frame->focused_pepper_plugin(); | 3089 return render_frame->focused_pepper_plugin(); |
3083 } | 3090 } |
3084 frame = frame->traverseNext(false); | 3091 frame = frame->traverseNext(false); |
3085 } | 3092 } |
3086 | 3093 |
3087 return nullptr; | 3094 return nullptr; |
3088 } | 3095 } |
3089 #endif | 3096 #endif |
3090 | 3097 |
3091 } // namespace content | 3098 } // namespace content |
OLD | NEW |