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

Side by Side Diff: content/renderer/render_widget.cc

Issue 2369793002: WIP: Propagate SurfaceID up window tree hierarchy
Patch Set: Fix input events: EventDispatcher ignores container windows Created 4 years, 2 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
« no previous file with comments | « content/renderer/render_widget.h ('k') | services/ui/public/cpp/tests/test_window_tree.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 OnEnableDeviceEmulation) 501 OnEnableDeviceEmulation)
502 IPC_MESSAGE_HANDLER(ViewMsg_DisableDeviceEmulation, 502 IPC_MESSAGE_HANDLER(ViewMsg_DisableDeviceEmulation,
503 OnDisableDeviceEmulation) 503 OnDisableDeviceEmulation)
504 IPC_MESSAGE_HANDLER(ViewMsg_ChangeResizeRect, OnChangeResizeRect) 504 IPC_MESSAGE_HANDLER(ViewMsg_ChangeResizeRect, OnChangeResizeRect)
505 IPC_MESSAGE_HANDLER(ViewMsg_WasHidden, OnWasHidden) 505 IPC_MESSAGE_HANDLER(ViewMsg_WasHidden, OnWasHidden)
506 IPC_MESSAGE_HANDLER(ViewMsg_WasShown, OnWasShown) 506 IPC_MESSAGE_HANDLER(ViewMsg_WasShown, OnWasShown)
507 IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnRepaint) 507 IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnRepaint)
508 IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection) 508 IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection)
509 IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck) 509 IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck)
510 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScreenRects, OnUpdateScreenRects) 510 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScreenRects, OnUpdateScreenRects)
511 IPC_MESSAGE_HANDLER(ViewMsg_SetSurfaceClientId, OnSetSurfaceClientId) 511 IPC_MESSAGE_HANDLER(ViewMsg_SetFrameSinkId, OnSetFrameSinkId)
512 IPC_MESSAGE_HANDLER(ViewMsg_WaitForNextFrameForTests, 512 IPC_MESSAGE_HANDLER(ViewMsg_WaitForNextFrameForTests,
513 OnWaitNextFrameForTests) 513 OnWaitNextFrameForTests)
514 IPC_MESSAGE_HANDLER(InputMsg_RequestCompositionUpdate, 514 IPC_MESSAGE_HANDLER(InputMsg_RequestCompositionUpdate,
515 OnRequestCompositionUpdate) 515 OnRequestCompositionUpdate)
516 #if defined(OS_ANDROID) 516 #if defined(OS_ANDROID)
517 IPC_MESSAGE_HANDLER(InputMsg_ImeEventAck, OnImeEventAck) 517 IPC_MESSAGE_HANDLER(InputMsg_ImeEventAck, OnImeEventAck)
518 IPC_MESSAGE_HANDLER(InputMsg_RequestTextInputStateUpdate, 518 IPC_MESSAGE_HANDLER(InputMsg_RequestTextInputStateUpdate,
519 OnRequestTextInputStateUpdate) 519 OnRequestTextInputStateUpdate)
520 IPC_MESSAGE_HANDLER(InputMsg_ImeBatchEdit, 520 IPC_MESSAGE_HANDLER(InputMsg_ImeBatchEdit,
521 OnImeBatchEdit) 521 OnImeBatchEdit)
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 1508
1509 void RenderWidget::OnUpdateWindowScreenRect( 1509 void RenderWidget::OnUpdateWindowScreenRect(
1510 const gfx::Rect& window_screen_rect) { 1510 const gfx::Rect& window_screen_rect) {
1511 if (screen_metrics_emulator_) { 1511 if (screen_metrics_emulator_) {
1512 screen_metrics_emulator_->OnUpdateWindowScreenRect(window_screen_rect); 1512 screen_metrics_emulator_->OnUpdateWindowScreenRect(window_screen_rect);
1513 } else { 1513 } else {
1514 window_screen_rect_ = window_screen_rect; 1514 window_screen_rect_ = window_screen_rect;
1515 } 1515 }
1516 } 1516 }
1517 1517
1518 void RenderWidget::OnSetSurfaceClientId(uint32_t surface_id_namespace) { 1518 void RenderWidget::OnSetFrameSinkId(const cc::FrameSinkId& frame_sink_id) {
1519 if (compositor_) 1519 if (compositor_)
1520 compositor_->SetSurfaceClientId(surface_id_namespace); 1520 compositor_->SetFrameSinkId(frame_sink_id);
1521 } 1521 }
1522 1522
1523 void RenderWidget::OnHandleCompositorProto(const std::vector<uint8_t>& proto) { 1523 void RenderWidget::OnHandleCompositorProto(const std::vector<uint8_t>& proto) {
1524 if (compositor_) 1524 if (compositor_)
1525 compositor_->OnHandleCompositorProto(proto); 1525 compositor_->OnHandleCompositorProto(proto);
1526 } 1526 }
1527 1527
1528 void RenderWidget::showImeIfNeeded() { 1528 void RenderWidget::showImeIfNeeded() {
1529 OnShowImeIfNeeded(); 1529 OnShowImeIfNeeded();
1530 } 1530 }
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
2154 bool RenderWidget::isPointerLocked() { 2154 bool RenderWidget::isPointerLocked() {
2155 return mouse_lock_dispatcher_->IsMouseLockedTo( 2155 return mouse_lock_dispatcher_->IsMouseLockedTo(
2156 webwidget_mouse_lock_target_.get()); 2156 webwidget_mouse_lock_target_.get());
2157 } 2157 }
2158 2158
2159 blink::WebWidget* RenderWidget::GetWebWidget() const { 2159 blink::WebWidget* RenderWidget::GetWebWidget() const {
2160 return webwidget_internal_; 2160 return webwidget_internal_;
2161 } 2161 }
2162 2162
2163 } // namespace content 2163 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_widget.h ('k') | services/ui/public/cpp/tests/test_window_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698