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

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

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
« no previous file with comments | « content/renderer/render_widget.h ('k') | no next file » | 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 "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 IPC_MESSAGE_HANDLER(ViewMsg_WasShown, OnWasShown) 742 IPC_MESSAGE_HANDLER(ViewMsg_WasShown, OnWasShown)
743 IPC_MESSAGE_HANDLER(ViewMsg_SetInputMethodActive, OnSetInputMethodActive) 743 IPC_MESSAGE_HANDLER(ViewMsg_SetInputMethodActive, OnSetInputMethodActive)
744 IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowShown, OnCandidateWindowShown) 744 IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowShown, OnCandidateWindowShown)
745 IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowUpdated, 745 IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowUpdated,
746 OnCandidateWindowUpdated) 746 OnCandidateWindowUpdated)
747 IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowHidden, OnCandidateWindowHidden) 747 IPC_MESSAGE_HANDLER(ViewMsg_CandidateWindowHidden, OnCandidateWindowHidden)
748 IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnRepaint) 748 IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnRepaint)
749 IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection) 749 IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection)
750 IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck) 750 IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck)
751 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScreenRects, OnUpdateScreenRects) 751 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScreenRects, OnUpdateScreenRects)
752 IPC_MESSAGE_HANDLER(ViewMsg_SetSurfaceIdNamespace, OnSetSurfaceIdNamespace)
753 #if defined(OS_ANDROID) 752 #if defined(OS_ANDROID)
754 IPC_MESSAGE_HANDLER(ViewMsg_ShowImeIfNeeded, OnShowImeIfNeeded) 753 IPC_MESSAGE_HANDLER(ViewMsg_ShowImeIfNeeded, OnShowImeIfNeeded)
755 IPC_MESSAGE_HANDLER(ViewMsg_ImeEventAck, OnImeEventAck) 754 IPC_MESSAGE_HANDLER(ViewMsg_ImeEventAck, OnImeEventAck)
756 #endif 755 #endif
757 IPC_MESSAGE_UNHANDLED(handled = false) 756 IPC_MESSAGE_UNHANDLED(handled = false)
758 IPC_END_MESSAGE_MAP() 757 IPC_END_MESSAGE_MAP()
759 return handled; 758 return handled;
760 } 759 }
761 760
762 bool RenderWidget::Send(IPC::Message* message) { 761 bool RenderWidget::Send(IPC::Message* message) {
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 if (screen_metrics_emulator_) { 1742 if (screen_metrics_emulator_) {
1744 screen_metrics_emulator_->OnUpdateScreenRectsMessage( 1743 screen_metrics_emulator_->OnUpdateScreenRectsMessage(
1745 view_screen_rect, window_screen_rect); 1744 view_screen_rect, window_screen_rect);
1746 } else { 1745 } else {
1747 view_screen_rect_ = view_screen_rect; 1746 view_screen_rect_ = view_screen_rect;
1748 window_screen_rect_ = window_screen_rect; 1747 window_screen_rect_ = window_screen_rect;
1749 } 1748 }
1750 Send(new ViewHostMsg_UpdateScreenRects_ACK(routing_id())); 1749 Send(new ViewHostMsg_UpdateScreenRects_ACK(routing_id()));
1751 } 1750 }
1752 1751
1753 void RenderWidget::OnSetSurfaceIdNamespace(uint32_t surface_id_namespace) {
1754 if (compositor_)
1755 compositor_->SetSurfaceIdNamespace(surface_id_namespace);
1756 }
1757
1758 void RenderWidget::showImeIfNeeded() { 1752 void RenderWidget::showImeIfNeeded() {
1759 OnShowImeIfNeeded(); 1753 OnShowImeIfNeeded();
1760 } 1754 }
1761 1755
1762 void RenderWidget::OnShowImeIfNeeded() { 1756 void RenderWidget::OnShowImeIfNeeded() {
1763 #if defined(OS_ANDROID) || defined(USE_AURA) 1757 #if defined(OS_ANDROID) || defined(USE_AURA)
1764 UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME); 1758 UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME);
1765 #endif 1759 #endif
1766 1760
1767 // TODO(rouslan): Fix ChromeOS and Windows 8 behavior of autofill popup with 1761 // TODO(rouslan): Fix ChromeOS and Windows 8 behavior of autofill popup with
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
2446 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { 2440 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) {
2447 video_hole_frames_.AddObserver(frame); 2441 video_hole_frames_.AddObserver(frame);
2448 } 2442 }
2449 2443
2450 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { 2444 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) {
2451 video_hole_frames_.RemoveObserver(frame); 2445 video_hole_frames_.RemoveObserver(frame);
2452 } 2446 }
2453 #endif // defined(VIDEO_HOLE) 2447 #endif // defined(VIDEO_HOLE)
2454 2448
2455 } // namespace content 2449 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698