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

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

Issue 10910242: Makes copying layers clone external textures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 8 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/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "content/browser/renderer_host/dip_util.h" 8 #include "content/browser/renderer_host/dip_util.h"
9 #include "content/browser/renderer_host/render_view_host_factory.h" 9 #include "content/browser/renderer_host/render_view_host_factory.h"
10 #include "content/browser/web_contents/interstitial_page_impl.h" 10 #include "content/browser/web_contents/interstitial_page_impl.h"
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 web_contents_->WasHidden(); 540 web_contents_->WasHidden();
541 } 541 }
542 542
543 bool WebContentsViewAura::HasHitTestMask() const { 543 bool WebContentsViewAura::HasHitTestMask() const {
544 return false; 544 return false;
545 } 545 }
546 546
547 void WebContentsViewAura::GetHitTestMask(gfx::Path* mask) const { 547 void WebContentsViewAura::GetHitTestMask(gfx::Path* mask) const {
548 } 548 }
549 549
550 scoped_refptr<ui::Texture> WebContentsViewAura::CopyTexture() {
551 // The layer we create doesn't have an external texture, so this should never
552 // get invoked.
553 NOTREACHED();
554 return scoped_refptr<ui::Texture>();
555 }
556
550 //////////////////////////////////////////////////////////////////////////////// 557 ////////////////////////////////////////////////////////////////////////////////
551 // WebContentsViewAura, ui::EventHandler implementation: 558 // WebContentsViewAura, ui::EventHandler implementation:
552 559
553 ui::EventResult WebContentsViewAura::OnKeyEvent(ui::KeyEvent* event) { 560 ui::EventResult WebContentsViewAura::OnKeyEvent(ui::KeyEvent* event) {
554 return ui::ER_UNHANDLED; 561 return ui::ER_UNHANDLED;
555 } 562 }
556 563
557 ui::EventResult WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) { 564 ui::EventResult WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) {
558 if (!web_contents_->GetDelegate()) 565 if (!web_contents_->GetDelegate())
559 return ui::ER_UNHANDLED; 566 return ui::ER_UNHANDLED;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 OnDragEntered(event); 644 OnDragEntered(event);
638 645
639 web_contents_->GetRenderViewHost()->DragTargetDrop( 646 web_contents_->GetRenderViewHost()->DragTargetDrop(
640 event.location(), 647 event.location(),
641 gfx::Screen::GetCursorScreenPoint(), 648 gfx::Screen::GetCursorScreenPoint(),
642 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 649 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
643 if (drag_dest_delegate_) 650 if (drag_dest_delegate_)
644 drag_dest_delegate_->OnDrop(); 651 drag_dest_delegate_->OnDrop();
645 return current_drag_op_; 652 return current_drag_op_;
646 } 653 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698