OLD | NEW |
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/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
697 if (!animation_update_pending_ && !paint_aggregator_.HasPendingUpdate()) { | 697 if (!animation_update_pending_ && !paint_aggregator_.HasPendingUpdate()) { |
698 TRACE_EVENT0("renderer", "EarlyOut_NoPendingUpdate"); | 698 TRACE_EVENT0("renderer", "EarlyOut_NoPendingUpdate"); |
699 return; | 699 return; |
700 } | 700 } |
701 | 701 |
702 // Continue painting if necessary... | 702 // Continue painting if necessary... |
703 DoDeferredUpdateAndSendInputAck(); | 703 DoDeferredUpdateAndSendInputAck(); |
704 } | 704 } |
705 | 705 |
706 void RenderWidget::OnHandleInputEvent(const WebKit::WebInputEvent* input_event, | 706 void RenderWidget::OnHandleInputEvent(const WebKit::WebInputEvent* input_event, |
707 const cc::LatencyInfo& latency_info, | 707 const ui::LatencyInfo& latency_info, |
708 bool is_keyboard_shortcut) { | 708 bool is_keyboard_shortcut) { |
709 TRACE_EVENT0("renderer", "RenderWidget::OnHandleInputEvent"); | 709 TRACE_EVENT0("renderer", "RenderWidget::OnHandleInputEvent"); |
710 | 710 |
711 handling_input_event_ = true; | 711 handling_input_event_ = true; |
712 if (!input_event) { | 712 if (!input_event) { |
713 handling_input_event_ = false; | 713 handling_input_event_ = false; |
714 return; | 714 return; |
715 } | 715 } |
716 | 716 |
717 if (compositor_) | 717 if (compositor_) |
(...skipping 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2348 | 2348 |
2349 if (!context->Initialize( | 2349 if (!context->Initialize( |
2350 attributes, | 2350 attributes, |
2351 false /* bind generates resources */, | 2351 false /* bind generates resources */, |
2352 CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)
) | 2352 CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE)
) |
2353 return NULL; | 2353 return NULL; |
2354 return context.release(); | 2354 return context.release(); |
2355 } | 2355 } |
2356 | 2356 |
2357 } // namespace content | 2357 } // namespace content |
OLD | NEW |