Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(614)

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 1131673009: Revert of Pass Surface ID namespace to renderer compositors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/render_widget_host_view_base.h" 9 #include "content/browser/renderer_host/render_widget_host_view_base.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 scoped_ptr<cc::CompositorFrame> frame) override; 94 scoped_ptr<cc::CompositorFrame> frame) override;
95 void GetScreenInfo(blink::WebScreenInfo* results) override; 95 void GetScreenInfo(blink::WebScreenInfo* results) override;
96 gfx::Rect GetBoundsInRootWindow() override; 96 gfx::Rect GetBoundsInRootWindow() override;
97 gfx::GLSurfaceHandle GetCompositingSurface() override; 97 gfx::GLSurfaceHandle GetCompositingSurface() override;
98 #if defined(USE_AURA) 98 #if defined(USE_AURA)
99 void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch, 99 void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
100 InputEventAckState ack_result) override; 100 InputEventAckState ack_result) override;
101 #endif // defined(USE_AURA) 101 #endif // defined(USE_AURA)
102 bool LockMouse() override; 102 bool LockMouse() override;
103 void UnlockMouse() override; 103 void UnlockMouse() override;
104 uint32_t GetSurfaceIdNamespace() override;
105 104
106 #if defined(OS_MACOSX) 105 #if defined(OS_MACOSX)
107 // RenderWidgetHostView implementation. 106 // RenderWidgetHostView implementation.
108 void SetActive(bool active) override; 107 void SetActive(bool active) override;
109 void SetWindowVisibility(bool visible) override; 108 void SetWindowVisibility(bool visible) override;
110 void WindowFrameChanged() override; 109 void WindowFrameChanged() override;
111 void ShowDefinitionForSelection() override; 110 void ShowDefinitionForSelection() override;
112 bool SupportsSpeech() const override; 111 bool SupportsSpeech() const override;
113 void SpeakSelection() override; 112 void SpeakSelection() override;
114 bool IsSpeaking() const override; 113 bool IsSpeaking() const override;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // sent through it are routed to the embedding renderer process. 148 // sent through it are routed to the embedding renderer process.
150 CrossProcessFrameConnector* frame_connector_; 149 CrossProcessFrameConnector* frame_connector_;
151 150
152 private: 151 private:
153 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 152 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
154 }; 153 };
155 154
156 } // namespace content 155 } // namespace content
157 156
158 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 157 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/delegated_frame_host.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698