| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
| 9 #include "content/common/content_export.h" | 11 #include "content/common/content_export.h" |
| 10 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 11 | 13 |
| 12 namespace blink { | 14 namespace blink { |
| 13 class WebInputEvent; | 15 class WebInputEvent; |
| 14 struct WebScreenInfo; | 16 struct WebScreenInfo; |
| 15 } | 17 } |
| 16 | 18 |
| 17 namespace cc { | 19 namespace cc { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 bool OnMessageReceived(const IPC::Message &msg); | 81 bool OnMessageReceived(const IPC::Message &msg); |
| 80 | 82 |
| 81 // |view| corresponds to B2's RenderWidgetHostViewChildFrame in the example | 83 // |view| corresponds to B2's RenderWidgetHostViewChildFrame in the example |
| 82 // above. | 84 // above. |
| 83 void set_view(RenderWidgetHostViewChildFrame* view); | 85 void set_view(RenderWidgetHostViewChildFrame* view); |
| 84 RenderWidgetHostViewChildFrame* get_view_for_testing() { return view_; } | 86 RenderWidgetHostViewChildFrame* get_view_for_testing() { return view_; } |
| 85 | 87 |
| 86 void RenderProcessGone(); | 88 void RenderProcessGone(); |
| 87 | 89 |
| 88 virtual void ChildFrameCompositorFrameSwapped( | 90 virtual void ChildFrameCompositorFrameSwapped( |
| 89 uint32 output_surface_id, | 91 uint32_t output_surface_id, |
| 90 int host_id, | 92 int host_id, |
| 91 int route_id, | 93 int route_id, |
| 92 scoped_ptr<cc::CompositorFrame> frame); | 94 scoped_ptr<cc::CompositorFrame> frame); |
| 93 virtual void SetChildFrameSurface(const cc::SurfaceId& surface_id, | 95 virtual void SetChildFrameSurface(const cc::SurfaceId& surface_id, |
| 94 const gfx::Size& frame_size, | 96 const gfx::Size& frame_size, |
| 95 float scale_factor, | 97 float scale_factor, |
| 96 const cc::SurfaceSequence& sequence); | 98 const cc::SurfaceSequence& sequence); |
| 97 | 99 |
| 98 gfx::Rect ChildFrameRect(); | 100 gfx::Rect ChildFrameRect(); |
| 99 float device_scale_factor() const { return device_scale_factor_; } | 101 float device_scale_factor() const { return device_scale_factor_; } |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 RenderWidgetHostViewChildFrame* view_; | 136 RenderWidgetHostViewChildFrame* view_; |
| 135 | 137 |
| 136 gfx::Rect child_frame_rect_; | 138 gfx::Rect child_frame_rect_; |
| 137 float device_scale_factor_; | 139 float device_scale_factor_; |
| 138 }; | 140 }; |
| 139 | 141 |
| 140 } // namespace content | 142 } // namespace content |
| 141 | 143 |
| 142 #endif // CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_ | 144 #endif // CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_ |
| 143 | 145 |
| OLD | NEW |