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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2804753002: mus: Fix showing guest views in --mash and --mus. (Closed)
Patch Set: tot merge Created 3 years, 8 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 (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/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 void RenderWidgetHostViewAura::OnWindowTargetVisibilityChanged(bool visible) { 1578 void RenderWidgetHostViewAura::OnWindowTargetVisibilityChanged(bool visible) {
1579 } 1579 }
1580 1580
1581 bool RenderWidgetHostViewAura::HasHitTestMask() const { 1581 bool RenderWidgetHostViewAura::HasHitTestMask() const {
1582 return false; 1582 return false;
1583 } 1583 }
1584 1584
1585 void RenderWidgetHostViewAura::GetHitTestMask(gfx::Path* mask) const { 1585 void RenderWidgetHostViewAura::GetHitTestMask(gfx::Path* mask) const {
1586 } 1586 }
1587 1587
1588 void RenderWidgetHostViewAura::OnWindowSurfaceChanged(
1589 const cc::SurfaceInfo& surface_info) {
1590 if (!is_guest_view_hack_)
1591 return;
1592 host_->GetView()->OnSurfaceChanged(surface_info);
1593 }
1594
1588 //////////////////////////////////////////////////////////////////////////////// 1595 ////////////////////////////////////////////////////////////////////////////////
1589 // RenderWidgetHostViewAura, ui::EventHandler implementation: 1596 // RenderWidgetHostViewAura, ui::EventHandler implementation:
1590 1597
1591 void RenderWidgetHostViewAura::OnKeyEvent(ui::KeyEvent* event) { 1598 void RenderWidgetHostViewAura::OnKeyEvent(ui::KeyEvent* event) {
1592 event_handler_->OnKeyEvent(event); 1599 event_handler_->OnKeyEvent(event);
1593 } 1600 }
1594 1601
1595 void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) { 1602 void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
1596 #if defined(OS_WIN) 1603 #if defined(OS_WIN)
1597 if (event->type() == ui::ET_MOUSE_MOVED) { 1604 if (event->type() == ui::ET_MOUSE_MOVED) {
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
2362 } 2369 }
2363 2370
2364 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { 2371 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() {
2365 if (!delegated_frame_host_) 2372 if (!delegated_frame_host_)
2366 return; 2373 return;
2367 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || 2374 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ ||
2368 needs_flush_input_); 2375 needs_flush_input_);
2369 } 2376 }
2370 2377
2371 } // namespace content 2378 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698