| 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 108 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| 109 #include "net/http/http_util.h" | 109 #include "net/http/http_util.h" |
| 110 #include "ppapi/features/features.h" | 110 #include "ppapi/features/features.h" |
| 111 #include "skia/ext/platform_canvas.h" | 111 #include "skia/ext/platform_canvas.h" |
| 112 #include "third_party/WebKit/public/platform/FilePathConversion.h" | 112 #include "third_party/WebKit/public/platform/FilePathConversion.h" |
| 113 #include "third_party/WebKit/public/platform/URLConversion.h" | 113 #include "third_party/WebKit/public/platform/URLConversion.h" |
| 114 #include "third_party/WebKit/public/platform/WebConnectionType.h" | 114 #include "third_party/WebKit/public/platform/WebConnectionType.h" |
| 115 #include "third_party/WebKit/public/platform/WebHTTPBody.h" | 115 #include "third_party/WebKit/public/platform/WebHTTPBody.h" |
| 116 #include "third_party/WebKit/public/platform/WebImage.h" | 116 #include "third_party/WebKit/public/platform/WebImage.h" |
| 117 #include "third_party/WebKit/public/platform/WebInputEvent.h" | 117 #include "third_party/WebKit/public/platform/WebInputEvent.h" |
| 118 #include "third_party/WebKit/public/platform/WebInputEventResult.h" |
| 118 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" | 119 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" |
| 119 #include "third_party/WebKit/public/platform/WebPoint.h" | 120 #include "third_party/WebKit/public/platform/WebPoint.h" |
| 120 #include "third_party/WebKit/public/platform/WebRect.h" | 121 #include "third_party/WebKit/public/platform/WebRect.h" |
| 121 #include "third_party/WebKit/public/platform/WebSize.h" | 122 #include "third_party/WebKit/public/platform/WebSize.h" |
| 122 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" | 123 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" |
| 123 #include "third_party/WebKit/public/platform/WebString.h" | 124 #include "third_party/WebKit/public/platform/WebString.h" |
| 124 #include "third_party/WebKit/public/platform/WebURL.h" | 125 #include "third_party/WebKit/public/platform/WebURL.h" |
| 125 #include "third_party/WebKit/public/platform/WebURLError.h" | 126 #include "third_party/WebKit/public/platform/WebURLError.h" |
| 126 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 127 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
| 127 #include "third_party/WebKit/public/platform/WebURLResponse.h" | 128 #include "third_party/WebKit/public/platform/WebURLResponse.h" |
| (...skipping 2595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2723 const blink::WebInputEvent* input_event, | 2724 const blink::WebInputEvent* input_event, |
| 2724 const ui::LatencyInfo& latency_info, | 2725 const ui::LatencyInfo& latency_info, |
| 2725 InputEventDispatchType dispatch_type) { | 2726 InputEventDispatchType dispatch_type) { |
| 2726 if (!input_event || (dispatch_type != DISPATCH_TYPE_BLOCKING && | 2727 if (!input_event || (dispatch_type != DISPATCH_TYPE_BLOCKING && |
| 2727 dispatch_type != DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN)) { | 2728 dispatch_type != DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN)) { |
| 2728 return; | 2729 return; |
| 2729 } | 2730 } |
| 2730 | 2731 |
| 2731 if (dispatch_type == DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN) { | 2732 if (dispatch_type == DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN) { |
| 2732 NotifyInputEventHandled(input_event->type(), | 2733 NotifyInputEventHandled(input_event->type(), |
| 2734 blink::WebInputEventResult::NotHandled, |
| 2733 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); | 2735 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 2734 } | 2736 } |
| 2735 | 2737 |
| 2736 std::unique_ptr<InputEventAck> ack( | 2738 std::unique_ptr<InputEventAck> ack( |
| 2737 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(), | 2739 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(), |
| 2738 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); | 2740 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); |
| 2739 OnInputEventAck(std::move(ack)); | 2741 OnInputEventAck(std::move(ack)); |
| 2740 } | 2742 } |
| 2741 | 2743 |
| 2742 } // namespace content | 2744 } // namespace content |
| OLD | NEW |