Commit ca70b72c authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

DOM: Reduce the size of registered_event_listener.h

registered_event_listener.h is used in many popular headers such as
node.h and document.h.  This reduces their pre-processed size
by 0.55MB.

If this CL causes performance regression, it should be reverted.

This CL also adds a comment on RegisteredEventListener class.

Bug: 242216
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Id37380734d2600bc58a9b6d70672c61eff8f5c71
Reviewed-on: https://chromium-review.googlesource.com/1158104Reviewed-by: default avatarHayato Ito <hayato@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579729}
parent 4cdc1153
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "third_party/blink/renderer/core/dom/events/event_listener_map.h" #include "third_party/blink/renderer/core/dom/events/event_listener_map.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/core/dom/events/event_target.h" #include "third_party/blink/renderer/core/dom/events/event_target.h"
#include "third_party/blink/renderer/platform/wtf/std_lib_extras.h" #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h"
#include "third_party/blink/renderer/platform/wtf/vector.h" #include "third_party/blink/renderer/platform/wtf/vector.h"
......
...@@ -55,6 +55,7 @@ class DOMWindow; ...@@ -55,6 +55,7 @@ class DOMWindow;
class Event; class Event;
class EventListenerOptionsOrBoolean; class EventListenerOptionsOrBoolean;
class ExceptionState; class ExceptionState;
class ExecutionContext;
class LocalDOMWindow; class LocalDOMWindow;
class MessagePort; class MessagePort;
class Node; class Node;
......
...@@ -60,6 +60,7 @@ blink_core_sources("events") { ...@@ -60,6 +60,7 @@ blink_core_sources("events") {
"progress_event.h", "progress_event.h",
"promise_rejection_event.cc", "promise_rejection_event.cc",
"promise_rejection_event.h", "promise_rejection_event.h",
"registered_event_listener.cc",
"registered_event_listener.h", "registered_event_listener.h",
"resource_progress_event.cc", "resource_progress_event.cc",
"resource_progress_event.h", "resource_progress_event.h",
......
/*
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
* Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
* Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Apple Inc. All rights
* reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
*/
#include "third_party/blink/renderer/core/events/registered_event_listener.h"
#include "third_party/blink/renderer/core/dom/events/add_event_listener_options_resolved.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
namespace blink {
RegisteredEventListener::RegisteredEventListener()
: use_capture_(false),
passive_(false),
once_(false),
blocked_event_warning_emitted_(false),
passive_forced_for_document_target_(false),
passive_specified_(false) {}
RegisteredEventListener::RegisteredEventListener(
EventListener* listener,
const AddEventListenerOptionsResolved& options)
: callback_(listener),
use_capture_(options.capture()),
passive_(options.passive()),
once_(options.once()),
blocked_event_warning_emitted_(false),
passive_forced_for_document_target_(
options.PassiveForcedForDocumentTarget()),
passive_specified_(options.PassiveSpecified()) {}
RegisteredEventListener& RegisteredEventListener::operator=(
const RegisteredEventListener& that) = default;
void RegisteredEventListener::Trace(Visitor* visitor) {
visitor->Trace(callback_);
}
AddEventListenerOptionsResolved RegisteredEventListener::Options() const {
AddEventListenerOptionsResolved result;
result.setCapture(use_capture_);
result.setPassive(passive_);
result.SetPassiveForcedForDocumentTarget(passive_forced_for_document_target_);
result.setOnce(once_);
result.SetPassiveSpecified(passive_specified_);
return result;
}
void RegisteredEventListener::SetCallback(EventListener* listener) {
callback_ = listener;
}
bool RegisteredEventListener::Matches(
const EventListener* listener,
const EventListenerOptions& options) const {
// Equality is soley based on the listener and useCapture flags.
DCHECK(callback_);
DCHECK(listener);
return *callback_ == *listener &&
static_cast<bool>(use_capture_) == options.capture();
}
bool RegisteredEventListener::operator==(
const RegisteredEventListener& other) const {
// Equality is soley based on the listener and useCapture flags.
DCHECK(callback_);
DCHECK(other.callback_);
return *callback_ == *other.callback_ && use_capture_ == other.use_capture_;
}
} // namespace blink
...@@ -26,53 +26,34 @@ ...@@ -26,53 +26,34 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_EVENTS_REGISTERED_EVENT_LISTENER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_EVENTS_REGISTERED_EVENT_LISTENER_H_
#include "base/memory/scoped_refptr.h" #include "base/memory/scoped_refptr.h"
#include "third_party/blink/renderer/core/dom/events/add_event_listener_options_resolved.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/platform/bindings/trace_wrapper_member.h" #include "third_party/blink/renderer/platform/bindings/trace_wrapper_member.h"
namespace blink { namespace blink {
class AddEventListenerOptionsResolved;
class EventListener;
class EventListenerOptions;
// RegisteredEventListener represents 'event listener' defined in the DOM
// standard. https://dom.spec.whatwg.org/#concept-event-listener
class RegisteredEventListener final { class RegisteredEventListener final {
DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
public: public:
RegisteredEventListener() RegisteredEventListener();
: use_capture_(false),
passive_(false),
once_(false),
blocked_event_warning_emitted_(false),
passive_forced_for_document_target_(false),
passive_specified_(false) {}
RegisteredEventListener(EventListener* listener, RegisteredEventListener(EventListener* listener,
const AddEventListenerOptionsResolved& options) const AddEventListenerOptionsResolved& options);
: callback_(listener), RegisteredEventListener& operator=(const RegisteredEventListener& that);
use_capture_(options.capture()),
passive_(options.passive()), void Trace(Visitor* visitor);
once_(options.once()),
blocked_event_warning_emitted_(false), AddEventListenerOptionsResolved Options() const;
passive_forced_for_document_target_(
options.PassiveForcedForDocumentTarget()),
passive_specified_(options.PassiveSpecified()) {}
void Trace(blink::Visitor* visitor) { visitor->Trace(callback_); }
AddEventListenerOptionsResolved Options() const {
AddEventListenerOptionsResolved result;
result.setCapture(use_capture_);
result.setPassive(passive_);
result.SetPassiveForcedForDocumentTarget(
passive_forced_for_document_target_);
result.setOnce(once_);
result.SetPassiveSpecified(passive_specified_);
return result;
}
const EventListener* Callback() const { return callback_; } const EventListener* Callback() const { return callback_; }
EventListener* Callback() { return callback_; } EventListener* Callback() { return callback_; }
void SetCallback(EventListener* listener) { callback_ = listener; } void SetCallback(EventListener* listener);
bool Passive() const { return passive_; } bool Passive() const { return passive_; }
...@@ -95,20 +76,9 @@ class RegisteredEventListener final { ...@@ -95,20 +76,9 @@ class RegisteredEventListener final {
} }
bool Matches(const EventListener* listener, bool Matches(const EventListener* listener,
const EventListenerOptions& options) const { const EventListenerOptions& options) const;
// Equality is soley based on the listener and useCapture flags.
DCHECK(callback_);
DCHECK(listener);
return *callback_ == *listener &&
static_cast<bool>(use_capture_) == options.capture();
}
bool operator==(const RegisteredEventListener& other) const { bool operator==(const RegisteredEventListener& other) const;
// Equality is soley based on the listener and useCapture flags.
DCHECK(callback_);
DCHECK(other.callback_);
return *callback_ == *other.callback_ && use_capture_ == other.use_capture_;
}
private: private:
TraceWrapperMember<EventListener> callback_; TraceWrapperMember<EventListener> callback_;
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "third_party/blink/renderer/core/css/css_style_declaration.h" #include "third_party/blink/renderer/core/css/css_style_declaration.h"
#include "third_party/blink/renderer/core/css_property_names.h" #include "third_party/blink/renderer/core/css_property_names.h"
#include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/core/dom/frame_request_callback_collection.h" #include "third_party/blink/renderer/core/dom/frame_request_callback_collection.h"
#include "third_party/blink/renderer/core/dom/shadow_root.h" #include "third_party/blink/renderer/core/dom/shadow_root.h"
#include "third_party/blink/renderer/core/frame/local_dom_window.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h"
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "third_party/blink/renderer/core/css/css_color_value.h" #include "third_party/blink/renderer/core/css/css_color_value.h"
#include "third_party/blink/renderer/core/dom/events/event.h" #include "third_party/blink/renderer/core/dom/events/event.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/core/dom/raw_data_document_parser.h" #include "third_party/blink/renderer/core/dom/raw_data_document_parser.h"
#include "third_party/blink/renderer/core/events/before_unload_event.h" #include "third_party/blink/renderer/core/events/before_unload_event.h"
#include "third_party/blink/renderer/core/exported/web_plugin_container_impl.h" #include "third_party/blink/renderer/core/exported/web_plugin_container_impl.h"
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "third_party/blink/renderer/core/paint/block_painter.h" #include "third_party/blink/renderer/core/paint/block_painter.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/core/frame/local_frame_view.h" #include "third_party/blink/renderer/core/frame/local_frame_view.h"
#include "third_party/blink/renderer/core/paint/paint_controller_paint_test.h" #include "third_party/blink/renderer/core/paint/paint_controller_paint_test.h"
#include "third_party/blink/renderer/platform/graphics/paint/drawing_display_item.h" #include "third_party/blink/renderer/platform/graphics/paint/drawing_display_item.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/core/paint/pre_paint_tree_walk.h" #include "third_party/blink/renderer/core/paint/pre_paint_tree_walk.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/core/frame/local_dom_window.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h"
#include "third_party/blink/renderer/core/layout/layout_tree_as_text.h" #include "third_party/blink/renderer/core/layout/layout_tree_as_text.h"
#include "third_party/blink/renderer/core/layout/layout_view.h" #include "third_party/blink/renderer/core/layout/layout_view.h"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/public/platform/task_type.h"
#include "third_party/blink/renderer/core/dom/events/event.h" #include "third_party/blink/renderer/core/dom/events/event.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/core/html/media/html_media_element.h" #include "third_party/blink/renderer/core/html/media/html_media_element.h"
#include "third_party/blink/renderer/modules/media_controls/elements/media_control_elements_helper.h" #include "third_party/blink/renderer/modules/media_controls/elements/media_control_elements_helper.h"
#include "third_party/blink/renderer/modules/media_controls/media_controls_impl.h" #include "third_party/blink/renderer/modules/media_controls/media_controls_impl.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_testing.h" #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_testing.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/core/testing/dummy_page_holder.h" #include "third_party/blink/renderer/core/testing/dummy_page_holder.h"
#include "third_party/blink/renderer/modules/presentation/presentation_connection.h" #include "third_party/blink/renderer/modules/presentation/presentation_connection.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "third_party/blink/renderer/bindings/core/v8/script_function.h" #include "third_party/blink/renderer/bindings/core/v8/script_function.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_testing.h" #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_testing.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_remote_playback_availability_callback.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_remote_playback_availability_callback.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.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/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/core/html/media/html_media_element.h" #include "third_party/blink/renderer/core/html/media/html_media_element.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/modules/xr/xr_canvas_input_provider.h" #include "third_party/blink/renderer/modules/xr/xr_canvas_input_provider.h"
#include "third_party/blink/renderer/core/dom/events/event_listener.h"
#include "third_party/blink/renderer/core/events/mouse_event.h" #include "third_party/blink/renderer/core/events/mouse_event.h"
#include "third_party/blink/renderer/core/html/canvas/html_canvas_element.h" #include "third_party/blink/renderer/core/html/canvas/html_canvas_element.h"
#include "third_party/blink/renderer/modules/xr/xr_device.h" #include "third_party/blink/renderer/modules/xr/xr_device.h"
......
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