| 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> | 8 #include <stdint.h> | 
| 9 | 9 | 
| 10 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" | 
|  | 11 #include "content/browser/renderer_host/event_with_latency_info.h" | 
| 11 #include "content/common/content_export.h" | 12 #include "content/common/content_export.h" | 
|  | 13 #include "content/common/input/input_event_ack_state.h" | 
| 12 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" | 
| 13 | 15 | 
| 14 namespace blink { | 16 namespace blink { | 
| 15 class WebInputEvent; | 17 class WebInputEvent; | 
| 16 struct WebScreenInfo; | 18 struct WebScreenInfo; | 
| 17 } | 19 } | 
| 18 | 20 | 
| 19 namespace cc { | 21 namespace cc { | 
| 20 struct SurfaceId; | 22 struct SurfaceId; | 
| 21 struct SurfaceSequence; | 23 struct SurfaceSequence; | 
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 88                                     const gfx::Size& frame_size, | 90                                     const gfx::Size& frame_size, | 
| 89                                     float scale_factor, | 91                                     float scale_factor, | 
| 90                                     const cc::SurfaceSequence& sequence); | 92                                     const cc::SurfaceSequence& sequence); | 
| 91 | 93 | 
| 92   gfx::Rect ChildFrameRect(); | 94   gfx::Rect ChildFrameRect(); | 
| 93   float device_scale_factor() const { return device_scale_factor_; } | 95   float device_scale_factor() const { return device_scale_factor_; } | 
| 94   void GetScreenInfo(blink::WebScreenInfo* results); | 96   void GetScreenInfo(blink::WebScreenInfo* results); | 
| 95   void UpdateCursor(const WebCursor& cursor); | 97   void UpdateCursor(const WebCursor& cursor); | 
| 96   gfx::Point TransformPointToRootCoordSpace(const gfx::Point& point, | 98   gfx::Point TransformPointToRootCoordSpace(const gfx::Point& point, | 
| 97                                             cc::SurfaceId surface_id); | 99                                             cc::SurfaceId surface_id); | 
|  | 100   // Pass acked touch events to the root view for gesture processing. | 
|  | 101   void ForwardProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, | 
|  | 102                                      InputEventAckState ack_result); | 
| 98 | 103 | 
| 99   // Determines whether the root RenderWidgetHostView (and thus the current | 104   // Determines whether the root RenderWidgetHostView (and thus the current | 
| 100   // page) has focus. | 105   // page) has focus. | 
| 101   bool HasFocus(); | 106   bool HasFocus(); | 
|  | 107   void Focus(); | 
| 102 | 108 | 
| 103  private: | 109  private: | 
| 104   // Handlers for messages received from the parent frame. | 110   // Handlers for messages received from the parent frame. | 
| 105   void OnForwardInputEvent(const blink::WebInputEvent* event); | 111   void OnForwardInputEvent(const blink::WebInputEvent* event); | 
| 106   void OnFrameRectChanged(const gfx::Rect& frame_rect); | 112   void OnFrameRectChanged(const gfx::Rect& frame_rect); | 
| 107   void OnVisibilityChanged(bool visible); | 113   void OnVisibilityChanged(bool visible); | 
| 108   void OnInitializeChildFrame(gfx::Rect frame_rect, float scale_factor); | 114   void OnInitializeChildFrame(gfx::Rect frame_rect, float scale_factor); | 
| 109   void OnSatisfySequence(const cc::SurfaceSequence& sequence); | 115   void OnSatisfySequence(const cc::SurfaceSequence& sequence); | 
| 110   void OnRequireSequence(const cc::SurfaceId& id, | 116   void OnRequireSequence(const cc::SurfaceId& id, | 
| 111                          const cc::SurfaceSequence& sequence); | 117                          const cc::SurfaceSequence& sequence); | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 124   RenderWidgetHostViewChildFrame* view_; | 130   RenderWidgetHostViewChildFrame* view_; | 
| 125 | 131 | 
| 126   gfx::Rect child_frame_rect_; | 132   gfx::Rect child_frame_rect_; | 
| 127   float device_scale_factor_; | 133   float device_scale_factor_; | 
| 128 }; | 134 }; | 
| 129 | 135 | 
| 130 }  // namespace content | 136 }  // namespace content | 
| 131 | 137 | 
| 132 #endif  // CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_ | 138 #endif  // CONTENT_BROWSER_FRAME_HOST_CROSS_PROCESS_FRAME_CONNECTOR_H_ | 
| 133 | 139 | 
| OLD | NEW | 
|---|