Commit 0b43edaf authored by Hajime Hoshi's avatar Hajime Hoshi Committed by Commit Bot

Use EventTarget::EnqueueAsyncEvent instead of EventQueue at WebPluginContainerImpl

This CL is a pure refacotring.

Bug: 846618
Change-Id: Ia858ad02d5ae14db59eb5bc947d6463e08f98ae8
Reviewed-on: https://chromium-review.googlesource.com/1113090Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Hajime Hoshi <hajimehoshi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569972}
parent 07be465d
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
#include "third_party/blink/renderer/core/clipboard/data_object.h" #include "third_party/blink/renderer/core/clipboard/data_object.h"
#include "third_party/blink/renderer/core/clipboard/data_transfer.h" #include "third_party/blink/renderer/core/clipboard/data_transfer.h"
#include "third_party/blink/renderer/core/clipboard/system_clipboard.h" #include "third_party/blink/renderer/core/clipboard/system_clipboard.h"
#include "third_party/blink/renderer/core/dom/events/event_queue.h"
#include "third_party/blink/renderer/core/dom/user_gesture_indicator.h" #include "third_party/blink/renderer/core/dom/user_gesture_indicator.h"
#include "third_party/blink/renderer/core/events/drag_event.h" #include "third_party/blink/renderer/core/events/drag_event.h"
#include "third_party/blink/renderer/core/events/gesture_event.h" #include "third_party/blink/renderer/core/events/gesture_event.h"
...@@ -457,10 +456,9 @@ void WebPluginContainerImpl::DispatchProgressEvent(const WebString& type, ...@@ -457,10 +456,9 @@ void WebPluginContainerImpl::DispatchProgressEvent(const WebString& type,
void WebPluginContainerImpl::EnqueueMessageEvent( void WebPluginContainerImpl::EnqueueMessageEvent(
const WebDOMMessageEvent& event) { const WebDOMMessageEvent& event) {
static_cast<Event*>(event)->SetTarget(element_);
if (!element_->GetExecutionContext()) if (!element_->GetExecutionContext())
return; return;
event_queue_->EnqueueEvent(FROM_HERE, event); element_->EnqueueAsyncEvent(event);
} }
void WebPluginContainerImpl::Invalidate() { void WebPluginContainerImpl::Invalidate() {
...@@ -737,9 +735,6 @@ WebPluginContainerImpl::WebPluginContainerImpl(HTMLPlugInElement& element, ...@@ -737,9 +735,6 @@ WebPluginContainerImpl::WebPluginContainerImpl(HTMLPlugInElement& element,
WebPlugin* web_plugin) WebPlugin* web_plugin)
: ContextClient(element.GetDocument().GetFrame()), : ContextClient(element.GetDocument().GetFrame()),
element_(element), element_(element),
event_queue_(
EventQueue::Create(element.GetDocument().GetExecutionContext(),
TaskType::kInternalDefault)),
web_plugin_(web_plugin), web_plugin_(web_plugin),
layer_(nullptr), layer_(nullptr),
touch_event_request_type_(kTouchEventRequestTypeNone), touch_event_request_type_(kTouchEventRequestTypeNone),
...@@ -785,7 +780,6 @@ void WebPluginContainerImpl::Dispose() { ...@@ -785,7 +780,6 @@ void WebPluginContainerImpl::Dispose() {
void WebPluginContainerImpl::Trace(blink::Visitor* visitor) { void WebPluginContainerImpl::Trace(blink::Visitor* visitor) {
visitor->Trace(element_); visitor->Trace(element_);
visitor->Trace(event_queue_);
ContextClient::Trace(visitor); ContextClient::Trace(visitor);
} }
......
...@@ -51,7 +51,6 @@ class Layer; ...@@ -51,7 +51,6 @@ class Layer;
namespace blink { namespace blink {
class Event; class Event;
class EventQueue;
class GestureEvent; class GestureEvent;
class HTMLFrameOwnerElement; class HTMLFrameOwnerElement;
class HTMLPlugInElement; class HTMLPlugInElement;
...@@ -238,7 +237,6 @@ class CORE_EXPORT WebPluginContainerImpl final ...@@ -238,7 +237,6 @@ class CORE_EXPORT WebPluginContainerImpl final
friend class WebPluginContainerTest; friend class WebPluginContainerTest;
Member<HTMLPlugInElement> element_; Member<HTMLPlugInElement> element_;
Member<EventQueue> event_queue_;
WebPlugin* web_plugin_; WebPlugin* web_plugin_;
cc::Layer* layer_; cc::Layer* layer_;
IntRect frame_rect_; IntRect frame_rect_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment