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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 23444051: Move the content-dependent RecreateLayer logic from aura::Window to RWHVA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux_aura Created 7 years, 3 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 | Annotate | Revision Log
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/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after
1529 web_contents_->WasHidden(); 1529 web_contents_->WasHidden();
1530 } 1530 }
1531 1531
1532 bool WebContentsViewAura::HasHitTestMask() const { 1532 bool WebContentsViewAura::HasHitTestMask() const {
1533 return false; 1533 return false;
1534 } 1534 }
1535 1535
1536 void WebContentsViewAura::GetHitTestMask(gfx::Path* mask) const { 1536 void WebContentsViewAura::GetHitTestMask(gfx::Path* mask) const {
1537 } 1537 }
1538 1538
1539 scoped_refptr<ui::Texture> WebContentsViewAura::CopyTexture() { 1539 void WebContentsViewAura::DidRecreateLayer(ui::Layer *old_layer,
1540 // The layer we create doesn't have an external texture, so this should never 1540 ui::Layer *new_layer) {
1541 // get invoked. 1541 // The layer we create doesn't have an external texture, so we don't need to
1542 NOTREACHED(); 1542 // do anything.
1543 return scoped_refptr<ui::Texture>();
1544 } 1543 }
1545 1544
1546 //////////////////////////////////////////////////////////////////////////////// 1545 ////////////////////////////////////////////////////////////////////////////////
1547 // WebContentsViewAura, ui::EventHandler implementation: 1546 // WebContentsViewAura, ui::EventHandler implementation:
1548 1547
1549 void WebContentsViewAura::OnKeyEvent(ui::KeyEvent* event) { 1548 void WebContentsViewAura::OnKeyEvent(ui::KeyEvent* event) {
1550 } 1549 }
1551 1550
1552 void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) { 1551 void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) {
1553 if (!web_contents_->GetDelegate()) 1552 if (!web_contents_->GetDelegate())
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 event.location(), 1632 event.location(),
1634 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), 1633 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
1635 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 1634 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
1636 if (drag_dest_delegate_) 1635 if (drag_dest_delegate_)
1637 drag_dest_delegate_->OnDrop(); 1636 drag_dest_delegate_->OnDrop();
1638 current_drop_data_.reset(); 1637 current_drop_data_.reset();
1639 return current_drag_op_; 1638 return current_drag_op_;
1640 } 1639 }
1641 1640
1642 } // namespace content 1641 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698