Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (204680 => 204681)
--- trunk/Source/WebCore/CMakeLists.txt 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-08-20 21:40:29 UTC (rev 204681)
@@ -607,7 +607,6 @@
loader/appcache/DOMApplicationCache.idl
- page/AbstractView.idl
page/BarProp.idl
page/Crypto.idl
page/DOMSelection.idl
Modified: trunk/Source/WebCore/ChangeLog (204680 => 204681)
--- trunk/Source/WebCore/ChangeLog 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/ChangeLog 2016-08-20 21:40:29 UTC (rev 204681)
@@ -1,3 +1,83 @@
+2016-08-20 Sam Weinig <s...@webkit.org>
+
+ Stop pretending that AbstractView is a thing, it's not
+ https://bugs.webkit.org/show_bug.cgi?id=161032
+
+ Reviewed by Dan Bernstein.
+
+ Remove AbstractView.idl, the AbstractView typedef of DOMWindow, and
+ all special casing of the name AbstractView in the JS code generator.
+
+ No change in behavior.
+
+ * DerivedSources.make:
+ * Modules/indieui/UIRequestEvent.cpp:
+ (WebCore::UIRequestEvent::createForBindings):
+ (WebCore::UIRequestEvent::create):
+ (WebCore::UIRequestEvent::UIRequestEvent):
+ * Modules/indieui/UIRequestEvent.h:
+ (WebCore::UIRequestEvent::receiver):
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (ShouldGenerateToJSDeclaration):
+ (GetImplClassName):
+ * dom/CompositionEvent.cpp:
+ (WebCore::CompositionEvent::CompositionEvent):
+ (WebCore::CompositionEvent::~CompositionEvent):
+ (WebCore::CompositionEvent::initCompositionEvent):
+ * dom/CompositionEvent.h:
+ * dom/FocusEvent.cpp:
+ (WebCore::FocusEvent::isFocusEvent):
+ (WebCore::FocusEvent::FocusEvent):
+ * dom/FocusEvent.h:
+ * dom/KeyboardEvent.cpp:
+ (WebCore::KeyboardEvent::KeyboardEvent):
+ (WebCore::KeyboardEvent::~KeyboardEvent):
+ (WebCore::KeyboardEvent::initKeyboardEvent):
+ * dom/KeyboardEvent.h:
+ * dom/MouseEvent.cpp:
+ (WebCore::MouseEvent::createForBindings):
+ (WebCore::MouseEvent::create):
+ (WebCore::MouseEvent::MouseEvent):
+ (WebCore::MouseEvent::~MouseEvent):
+ (WebCore::MouseEvent::initMouseEvent):
+ * dom/MouseEvent.h:
+ * dom/MouseRelatedEvent.cpp:
+ (WebCore::MouseRelatedEvent::MouseRelatedEvent):
+ (WebCore::contentsScrollOffset):
+ * dom/MouseRelatedEvent.h:
+ * dom/SimulatedClick.cpp:
+ * dom/TextEvent.cpp:
+ (WebCore::TextEvent::createForBindings):
+ (WebCore::TextEvent::create):
+ (WebCore::TextEvent::createForPlainTextPaste):
+ (WebCore::TextEvent::createForFragmentPaste):
+ (WebCore::TextEvent::createForDrop):
+ (WebCore::TextEvent::createForDictation):
+ (WebCore::TextEvent::TextEvent):
+ (WebCore::TextEvent::~TextEvent):
+ (WebCore::TextEvent::initTextEvent):
+ * dom/TextEvent.h:
+ * dom/TouchEvent.h:
+ * dom/UIEvent.cpp:
+ (WebCore::UIEvent::UIEvent):
+ (WebCore::UIEvent::~UIEvent):
+ (WebCore::UIEvent::initUIEvent):
+ * dom/UIEvent.h:
+ (WebCore::UIEvent::create):
+ (WebCore::UIEvent::createForBindings):
+ (WebCore::UIEvent::view):
+ (WebCore::UIEvent::detail):
+ * dom/UIEventWithKeyState.h:
+ (WebCore::UIEventWithKeyState::UIEventWithKeyState):
+ * dom/WheelEvent.cpp:
+ (WebCore::WheelEvent::WheelEvent):
+ (WebCore::WheelEvent::initWheelEvent):
+ (WebCore::WheelEvent::initWebKitWheelEvent):
+ * dom/WheelEvent.h:
+ * page/AbstractView.idl: Removed.
+
2016-08-19 Sam Weinig <s...@webkit.org>
Location.ancestorOrigins should return a FrozenArray<USVString>
Modified: trunk/Source/WebCore/DerivedSources.make (204680 => 204681)
--- trunk/Source/WebCore/DerivedSources.make 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/DerivedSources.make 2016-08-20 21:40:29 UTC (rev 204681)
@@ -512,7 +512,6 @@
$(WebCore)/inspector/CommandLineAPIHost.idl \
$(WebCore)/inspector/InspectorFrontendHost.idl \
$(WebCore)/loader/appcache/DOMApplicationCache.idl \
- $(WebCore)/page/AbstractView.idl \
$(WebCore)/page/BarProp.idl \
$(WebCore)/page/Crypto.idl \
$(WebCore)/page/DOMSelection.idl \
Modified: trunk/Source/WebCore/Modules/indieui/UIRequestEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/Modules/indieui/UIRequestEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/Modules/indieui/UIRequestEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -35,7 +35,7 @@
return adoptRef(*new UIRequestEvent(type, initializer));
}
-Ref<UIRequestEvent> UIRequestEvent::create(const AtomicString& type, bool bubbles, bool cancelable, AbstractView* view, int detail, RefPtr<EventTarget>&& receiver)
+Ref<UIRequestEvent> UIRequestEvent::create(const AtomicString& type, bool bubbles, bool cancelable, DOMWindow* view, int detail, RefPtr<EventTarget>&& receiver)
{
return adoptRef(*new UIRequestEvent(type, bubbles, cancelable, view, detail, WTFMove(receiver)));
}
@@ -46,7 +46,7 @@
{
}
-UIRequestEvent::UIRequestEvent(const AtomicString& type, bool bubbles, bool cancelable, AbstractView* view, int detail, RefPtr<EventTarget>&& receiver)
+UIRequestEvent::UIRequestEvent(const AtomicString& type, bool bubbles, bool cancelable, DOMWindow* view, int detail, RefPtr<EventTarget>&& receiver)
: UIEvent(type, bubbles, cancelable, view, detail)
, m_receiver(WTFMove(receiver))
{
Modified: trunk/Source/WebCore/Modules/indieui/UIRequestEvent.h (204680 => 204681)
--- trunk/Source/WebCore/Modules/indieui/UIRequestEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/Modules/indieui/UIRequestEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -39,7 +39,7 @@
class UIRequestEvent : public UIEvent {
public:
- static Ref<UIRequestEvent> create(const AtomicString& type, bool bubbles, bool cancelable, AbstractView*, int detail, RefPtr<EventTarget>&& receiver);
+ static Ref<UIRequestEvent> create(const AtomicString& type, bool bubbles, bool cancelable, DOMWindow*, int detail, RefPtr<EventTarget>&& receiver);
static Ref<UIRequestEvent> createForBindings(const AtomicString& eventType, const UIRequestEventInit&);
virtual ~UIRequestEvent();
@@ -47,7 +47,7 @@
EventTarget* receiver() const { return m_receiver.get(); }
protected:
- UIRequestEvent(const AtomicString& type, bool bubbles, bool cancelable, AbstractView*, int detail, RefPtr<EventTarget>&& receiver);
+ UIRequestEvent(const AtomicString& type, bool bubbles, bool cancelable, DOMWindow*, int detail, RefPtr<EventTarget>&& receiver);
UIRequestEvent(const AtomicString& type, const UIRequestEventInit&);
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204680 => 204681)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-20 21:40:29 UTC (rev 204681)
@@ -10607,7 +10607,6 @@
851EE8200ABCA58100A6AA33 /* DOMRangeException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMRangeException.h; sourceTree = "<group>"; };
85217E000A5ECD4700DB8D00 /* XSLImportRule.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XSLImportRule.cpp; sourceTree = "<group>"; };
85217E010A5ECD4700DB8D00 /* XSLImportRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XSLImportRule.h; sourceTree = "<group>"; };
- 8538F0000AD71770006A81D1 /* AbstractView.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AbstractView.idl; sourceTree = "<group>"; };
8538F0160AD718D8006A81D1 /* DOMAbstractView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMAbstractView.h; sourceTree = "<group>"; };
8538F0180AD718D8006A81D1 /* DOMAbstractViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMAbstractViewInternal.h; sourceTree = "<group>"; };
8538F0580AD722F1006A81D1 /* DOMRange.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRange.h; sourceTree = "<group>"; };
@@ -18156,7 +18155,6 @@
18A6CD6F0D8F2025001DC3CE /* ios */,
93C09A820B064F05005ABD4D /* mac */,
1AF62EE114DA22A70041556C /* scrolling */,
- 8538F0000AD71770006A81D1 /* AbstractView.idl */,
BCF48CE61370D114004E87D6 /* AdjustViewSizeOrNot.h */,
CEDA12D6152CA1CB00D9E08D /* AlternativeTextClient.h */,
45830D4B1679B4F800ACF8C3 /* AutoscrollController.cpp */,
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (204680 => 204681)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2016-08-20 21:40:29 UTC (rev 204681)
@@ -46,7 +46,7 @@
my %baseTypeHash = ("Object" => 1, "Node" => 1, "NodeList" => 1, "NamedNodeMap" => 1, "DOMImplementation" => 1,
"Event" => 1, "CSSRule" => 1, "CSSValue" => 1, "StyleSheet" => 1, "MediaList" => 1,
"Counter" => 1, "Rect" => 1, "RGBColor" => 1, "XPathExpression" => 1, "XPathResult" => 1,
- "NodeIterator" => 1, "TreeWalker" => 1, "AbstractView" => 1, "Blob" => 1, "DOMTokenList" => 1,
+ "NodeIterator" => 1, "TreeWalker" => 1, "Blob" => 1, "DOMTokenList" => 1,
"HTMLCollection" => 1, "TextTrackCue" => 1, "AnimationTimeline" => 1, "AnimationEffect" => 1);
# Only objects derived from Node are released by the DOM object cache and can be
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (204680 => 204681)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-08-20 21:40:29 UTC (rev 204681)
@@ -442,7 +442,6 @@
return 0 if ($interface->extendedAttributes->{"SuppressToJSObject"});
return 0 if not NeedsImplementationClass($interface);
- return 0 if $interface->name eq "AbstractView";
return 0 if $interface->extendedAttributes->{"CustomProxyToJSObject"};
return 1 if (!$hasParent or $interface->extendedAttributes->{"JSGenerateToJSObject"} or $interface->extendedAttributes->{"CustomToJSObject"});
return 1 if $interface->parent && $interface->parent eq "EventTarget";
@@ -729,8 +728,6 @@
{
my $name = shift;
- return "DOMWindow" if $name eq "AbstractView";
-
my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($name);
return $svgNativeType if $svgNativeType;
Modified: trunk/Source/WebCore/dom/CompositionEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/CompositionEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/CompositionEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -35,7 +35,7 @@
{
}
-CompositionEvent::CompositionEvent(const AtomicString& type, AbstractView* view, const String& data)
+CompositionEvent::CompositionEvent(const AtomicString& type, DOMWindow* view, const String& data)
: UIEvent(type, true, true, view, 0)
, m_data(data)
{
@@ -51,7 +51,7 @@
{
}
-void CompositionEvent::initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view, const String& data)
+void CompositionEvent::initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view, const String& data)
{
if (dispatched())
return;
Modified: trunk/Source/WebCore/dom/CompositionEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/CompositionEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/CompositionEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -37,7 +37,7 @@
class CompositionEvent final : public UIEvent {
public:
- static Ref<CompositionEvent> create(const AtomicString& type, AbstractView* view, const String& data)
+ static Ref<CompositionEvent> create(const AtomicString& type, DOMWindow* view, const String& data)
{
return adoptRef(*new CompositionEvent(type, view, data));
}
@@ -54,7 +54,7 @@
virtual ~CompositionEvent();
- void initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView*, const String& data);
+ void initCompositionEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*, const String& data);
String data() const { return m_data; }
@@ -62,7 +62,7 @@
private:
CompositionEvent();
- CompositionEvent(const AtomicString& type, AbstractView*, const String&);
+ CompositionEvent(const AtomicString& type, DOMWindow*, const String&);
CompositionEvent(const AtomicString& type, const CompositionEventInit&);
bool isCompositionEvent() const override;
Modified: trunk/Source/WebCore/dom/FocusEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/FocusEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/FocusEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -40,7 +40,7 @@
return true;
}
-FocusEvent::FocusEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view, int detail, RefPtr<EventTarget>&& relatedTarget)
+FocusEvent::FocusEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view, int detail, RefPtr<EventTarget>&& relatedTarget)
: UIEvent(type, canBubble, cancelable, view, detail)
, m_relatedTarget(WTFMove(relatedTarget))
{
Modified: trunk/Source/WebCore/dom/FocusEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/FocusEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/FocusEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -39,7 +39,7 @@
class FocusEvent final : public UIEvent {
public:
- static Ref<FocusEvent> create(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view, int detail, RefPtr<EventTarget>&& relatedTarget)
+ static Ref<FocusEvent> create(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view, int detail, RefPtr<EventTarget>&& relatedTarget)
{
return adoptRef(*new FocusEvent(type, canBubble, cancelable, view, detail, WTFMove(relatedTarget)));
}
@@ -55,7 +55,7 @@
EventInterface eventInterface() const override;
private:
- FocusEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView*, int, RefPtr<EventTarget>&&);
+ FocusEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*, int, RefPtr<EventTarget>&&);
FocusEvent(const AtomicString& type, const FocusEventInit&);
bool isFocusEvent() const override;
Modified: trunk/Source/WebCore/dom/KeyboardEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/KeyboardEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/KeyboardEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -100,7 +100,7 @@
{
}
-KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, AbstractView* view)
+KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, DOMWindow* view)
: UIEventWithKeyState(eventTypeForKeyboardEventType(key.type()),
true, true, key.timestamp(), view, 0, key.ctrlKey(), key.altKey(), key.shiftKey(), key.metaKey())
, m_keyEvent(std::make_unique<PlatformKeyboardEvent>(key))
@@ -139,7 +139,7 @@
{
}
-void KeyboardEvent::initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view,
+void KeyboardEvent::initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view,
const String &keyIdentifier, unsigned location,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey)
{
Modified: trunk/Source/WebCore/dom/KeyboardEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/KeyboardEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/KeyboardEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -51,7 +51,7 @@
// DOM_KEY_LOCATION_JOYSTICK = 0x05
};
- static Ref<KeyboardEvent> create(const PlatformKeyboardEvent& platformEvent, AbstractView* view)
+ static Ref<KeyboardEvent> create(const PlatformKeyboardEvent& platformEvent, DOMWindow* view)
{
return adoptRef(*new KeyboardEvent(platformEvent, view));
}
@@ -75,7 +75,7 @@
virtual ~KeyboardEvent();
- void initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView*,
+ void initKeyboardEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*,
const String& keyIdentifier, unsigned location,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey = false);
@@ -105,7 +105,7 @@
private:
WEBCORE_EXPORT KeyboardEvent();
- WEBCORE_EXPORT KeyboardEvent(const PlatformKeyboardEvent&, AbstractView*);
+ WEBCORE_EXPORT KeyboardEvent(const PlatformKeyboardEvent&, DOMWindow*);
KeyboardEvent(const AtomicString&, const KeyboardEventInit&);
// FIXME: This method should be get ride of in the future.
// DO NOT USE IT!
Modified: trunk/Source/WebCore/dom/MouseEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/MouseEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/MouseEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -38,7 +38,7 @@
return adoptRef(*new MouseEvent(type, initializer));
}
-Ref<MouseEvent> MouseEvent::create(const AtomicString& eventType, AbstractView* view, const PlatformMouseEvent& event, int detail, PassRefPtr<Node> relatedTarget)
+Ref<MouseEvent> MouseEvent::create(const AtomicString& eventType, DOMWindow* view, const PlatformMouseEvent& event, int detail, PassRefPtr<Node> relatedTarget)
{
bool isMouseEnterOrLeave = eventType == eventNames().mouseenterEvent || eventType == eventNames().mouseleaveEvent;
bool isCancelable = eventType != eventNames().mousemoveEvent && !isMouseEnterOrLeave;
@@ -53,7 +53,7 @@
relatedTarget, event.force(), event.syntheticClickType());
}
-Ref<MouseEvent> MouseEvent::create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, AbstractView* view, int detail, int screenX, int screenY, int pageX, int pageY,
+Ref<MouseEvent> MouseEvent::create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow* view, int detail, int screenX, int screenY, int pageX, int pageY,
#if ENABLE(POINTER_LOCK)
int movementX, int movementY,
#endif
@@ -68,7 +68,7 @@
ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, force, syntheticClickType, 0, false);
}
-Ref<MouseEvent> MouseEvent::create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, AbstractView* view, int detail, int screenX, int screenY, int pageX, int pageY,
+Ref<MouseEvent> MouseEvent::create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow* view, int detail, int screenX, int screenY, int pageX, int pageY,
#if ENABLE(POINTER_LOCK)
int movementX, int movementY,
#endif
@@ -82,7 +82,7 @@
ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, force, syntheticClickType, dataTransfer, isSimulated));
}
-Ref<MouseEvent> MouseEvent::create(const AtomicString& eventType, bool canBubble, bool cancelable, AbstractView* view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, unsigned short syntheticClickType, PassRefPtr<EventTarget> relatedTarget)
+Ref<MouseEvent> MouseEvent::create(const AtomicString& eventType, bool canBubble, bool cancelable, DOMWindow* view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, unsigned short syntheticClickType, PassRefPtr<EventTarget> relatedTarget)
{
return adoptRef(*new MouseEvent(eventType, canBubble, cancelable, view, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, syntheticClickType, relatedTarget));
}
@@ -93,7 +93,7 @@
{
}
-MouseEvent::MouseEvent(const AtomicString& eventType, bool canBubble, bool cancelable, double timestamp, AbstractView* view,
+MouseEvent::MouseEvent(const AtomicString& eventType, bool canBubble, bool cancelable, double timestamp, DOMWindow* view,
int detail, int screenX, int screenY, int pageX, int pageY,
#if ENABLE(POINTER_LOCK)
int movementX, int movementY,
@@ -116,7 +116,7 @@
{
}
-MouseEvent::MouseEvent(const AtomicString& eventType, bool canBubble, bool cancelable, AbstractView* view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, unsigned short syntheticClickType, PassRefPtr<EventTarget> relatedTarget)
+MouseEvent::MouseEvent(const AtomicString& eventType, bool canBubble, bool cancelable, DOMWindow* view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, unsigned short syntheticClickType, PassRefPtr<EventTarget> relatedTarget)
: MouseRelatedEvent(eventType, canBubble, cancelable, WTF::currentTime(), view, detail, IntPoint(screenX, screenY), IntPoint(0, 0),
#if ENABLE(POINTER_LOCK)
IntPoint(0, 0),
@@ -144,7 +144,7 @@
{
}
-void MouseEvent::initMouseEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view,
+void MouseEvent::initMouseEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view,
int detail, int screenX, int screenY, int clientX, int clientY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
unsigned short button, PassRefPtr<EventTarget> relatedTarget)
Modified: trunk/Source/WebCore/dom/MouseEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/MouseEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/MouseEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -40,7 +40,7 @@
class MouseEvent : public MouseRelatedEvent {
public:
- static Ref<MouseEvent> create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, AbstractView*,
+ static Ref<MouseEvent> create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow*,
int detail, int screenX, int screenY, int pageX, int pageY,
#if ENABLE(POINTER_LOCK)
int movementX, int movementY,
@@ -48,7 +48,7 @@
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
PassRefPtr<EventTarget> relatedTarget, double force, unsigned short syntheticClickType);
- WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, AbstractView*,
+ WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow*,
int detail, int screenX, int screenY, int pageX, int pageY,
#if ENABLE(POINTER_LOCK)
int movementX, int movementY,
@@ -56,9 +56,9 @@
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
PassRefPtr<EventTarget> relatedTarget, double force, unsigned short syntheticClickType, PassRefPtr<DataTransfer>, bool isSimulated = false);
- WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomicString& eventType, AbstractView*, const PlatformMouseEvent&, int detail, PassRefPtr<Node> relatedTarget);
+ WEBCORE_EXPORT static Ref<MouseEvent> create(const AtomicString& eventType, DOMWindow*, const PlatformMouseEvent&, int detail, PassRefPtr<Node> relatedTarget);
- static Ref<MouseEvent> create(const AtomicString& eventType, bool canBubble, bool cancelable, AbstractView*,
+ static Ref<MouseEvent> create(const AtomicString& eventType, bool canBubble, bool cancelable, DOMWindow*,
int detail, int screenX, int screenY, int clientX, int clientY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
unsigned short button, unsigned short syntheticClickType, PassRefPtr<EventTarget> relatedTarget);
@@ -72,7 +72,7 @@
virtual ~MouseEvent();
- void initMouseEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView*,
+ void initMouseEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*,
int detail, int screenX, int screenY, int clientX, int clientY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
unsigned short button, PassRefPtr<EventTarget> relatedTarget);
@@ -105,7 +105,7 @@
Ref<Event> cloneFor(HTMLIFrameElement*) const override;
protected:
- MouseEvent(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, AbstractView*,
+ MouseEvent(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow*,
int detail, int screenX, int screenY, int pageX, int pageY,
#if ENABLE(POINTER_LOCK)
int movementX, int movementY,
@@ -113,7 +113,7 @@
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
PassRefPtr<EventTarget> relatedTarget, double force, unsigned short syntheticClickType, PassRefPtr<DataTransfer>, bool isSimulated);
- MouseEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView*,
+ MouseEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*,
int detail, int screenX, int screenY, int clientX, int clientY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
unsigned short button, unsigned short syntheticClickType, PassRefPtr<EventTarget> relatedTarget);
Modified: trunk/Source/WebCore/dom/MouseRelatedEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/MouseRelatedEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/MouseRelatedEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -37,11 +37,11 @@
{
}
-static LayoutSize contentsScrollOffset(AbstractView* abstractView)
+static LayoutSize contentsScrollOffset(DOMWindow* DOMWindow)
{
- if (!abstractView)
+ if (!DOMWindow)
return LayoutSize();
- Frame* frame = abstractView->frame();
+ Frame* frame = DOMWindow->frame();
if (!frame)
return LayoutSize();
FrameView* frameView = frame->view();
@@ -55,13 +55,13 @@
#endif
}
-MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubble, bool cancelable, double timestamp, AbstractView* abstractView,
+MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubble, bool cancelable, double timestamp, DOMWindow* DOMWindow,
int detail, const IntPoint& screenLocation, const IntPoint& windowLocation,
#if ENABLE(POINTER_LOCK)
const IntPoint& movementDelta,
#endif
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool isSimulated)
- : UIEventWithKeyState(eventType, canBubble, cancelable, timestamp, abstractView, detail, ctrlKey, altKey, shiftKey, metaKey)
+ : UIEventWithKeyState(eventType, canBubble, cancelable, timestamp, DOMWindow, detail, ctrlKey, altKey, shiftKey, metaKey)
, m_screenLocation(screenLocation)
#if ENABLE(POINTER_LOCK)
, m_movementDelta(movementDelta)
Modified: trunk/Source/WebCore/dom/MouseRelatedEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/MouseRelatedEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/MouseRelatedEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -67,7 +67,7 @@
protected:
MouseRelatedEvent();
- MouseRelatedEvent(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, AbstractView*,
+ MouseRelatedEvent(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow*,
int detail, const IntPoint& screenLocation, const IntPoint& windowLocation,
#if ENABLE(POINTER_LOCK)
const IntPoint& movementDelta,
Modified: trunk/Source/WebCore/dom/SimulatedClick.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/SimulatedClick.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/SimulatedClick.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -38,13 +38,13 @@
class SimulatedMouseEvent final : public MouseEvent {
public:
- static Ref<SimulatedMouseEvent> create(const AtomicString& eventType, AbstractView* view, RefPtr<Event>&& underlyingEvent, Element& target)
+ static Ref<SimulatedMouseEvent> create(const AtomicString& eventType, DOMWindow* view, RefPtr<Event>&& underlyingEvent, Element& target)
{
return adoptRef(*new SimulatedMouseEvent(eventType, view, WTFMove(underlyingEvent), target));
}
private:
- SimulatedMouseEvent(const AtomicString& eventType, AbstractView* view, RefPtr<Event>&& underlyingEvent, Element& target)
+ SimulatedMouseEvent(const AtomicString& eventType, DOMWindow* view, RefPtr<Event>&& underlyingEvent, Element& target)
: MouseEvent(eventType, true, true, underlyingEvent ? underlyingEvent->timeStamp() : currentTime(), view, 0, 0, 0, 0, 0,
#if ENABLE(POINTER_LOCK)
0, 0,
Modified: trunk/Source/WebCore/dom/TextEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/TextEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/TextEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -38,27 +38,27 @@
return adoptRef(*new TextEvent);
}
-Ref<TextEvent> TextEvent::create(AbstractView* view, const String& data, TextEventInputType inputType)
+Ref<TextEvent> TextEvent::create(DOMWindow* view, const String& data, TextEventInputType inputType)
{
return adoptRef(*new TextEvent(view, data, inputType));
}
-Ref<TextEvent> TextEvent::createForPlainTextPaste(AbstractView* view, const String& data, bool shouldSmartReplace)
+Ref<TextEvent> TextEvent::createForPlainTextPaste(DOMWindow* view, const String& data, bool shouldSmartReplace)
{
return adoptRef(*new TextEvent(view, data, 0, shouldSmartReplace, false, MailBlockquoteHandling::RespectBlockquote));
}
-Ref<TextEvent> TextEvent::createForFragmentPaste(AbstractView* view, RefPtr<DocumentFragment>&& data, bool shouldSmartReplace, bool shouldMatchStyle, MailBlockquoteHandling mailBlockquoteHandling)
+Ref<TextEvent> TextEvent::createForFragmentPaste(DOMWindow* view, RefPtr<DocumentFragment>&& data, bool shouldSmartReplace, bool shouldMatchStyle, MailBlockquoteHandling mailBlockquoteHandling)
{
return adoptRef(*new TextEvent(view, emptyString(), WTFMove(data), shouldSmartReplace, shouldMatchStyle, mailBlockquoteHandling));
}
-Ref<TextEvent> TextEvent::createForDrop(AbstractView* view, const String& data)
+Ref<TextEvent> TextEvent::createForDrop(DOMWindow* view, const String& data)
{
return adoptRef(*new TextEvent(view, data, TextEventInputDrop));
}
-Ref<TextEvent> TextEvent::createForDictation(AbstractView* view, const String& data, const Vector<DictationAlternative>& dictationAlternatives)
+Ref<TextEvent> TextEvent::createForDictation(DOMWindow* view, const String& data, const Vector<DictationAlternative>& dictationAlternatives)
{
return adoptRef(*new TextEvent(view, data, dictationAlternatives));
}
@@ -71,7 +71,7 @@
{
}
-TextEvent::TextEvent(AbstractView* view, const String& data, TextEventInputType inputType)
+TextEvent::TextEvent(DOMWindow* view, const String& data, TextEventInputType inputType)
: UIEvent(eventNames().textInputEvent, true, true, view, 0)
, m_inputType(inputType)
, m_data(data)
@@ -81,7 +81,7 @@
{
}
-TextEvent::TextEvent(AbstractView* view, const String& data, RefPtr<DocumentFragment>&& pastingFragment, bool shouldSmartReplace, bool shouldMatchStyle, MailBlockquoteHandling mailBlockquoteHandling)
+TextEvent::TextEvent(DOMWindow* view, const String& data, RefPtr<DocumentFragment>&& pastingFragment, bool shouldSmartReplace, bool shouldMatchStyle, MailBlockquoteHandling mailBlockquoteHandling)
: UIEvent(eventNames().textInputEvent, true, true, view, 0)
, m_inputType(TextEventInputPaste)
, m_data(data)
@@ -92,7 +92,7 @@
{
}
-TextEvent::TextEvent(AbstractView* view, const String& data, const Vector<DictationAlternative>& dictationAlternatives)
+TextEvent::TextEvent(DOMWindow* view, const String& data, const Vector<DictationAlternative>& dictationAlternatives)
: UIEvent(eventNames().textInputEvent, true, true, view, 0)
, m_inputType(TextEventInputDictation)
, m_data(data)
@@ -107,7 +107,7 @@
{
}
-void TextEvent::initTextEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view, const String& data)
+void TextEvent::initTextEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view, const String& data)
{
if (dispatched())
return;
Modified: trunk/Source/WebCore/dom/TextEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/TextEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/TextEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -39,16 +39,16 @@
class TextEvent final : public UIEvent {
public:
- static Ref<TextEvent> create(AbstractView*, const String& data, TextEventInputType = TextEventInputKeyboard);
+ static Ref<TextEvent> create(DOMWindow*, const String& data, TextEventInputType = TextEventInputKeyboard);
static Ref<TextEvent> createForBindings();
- static Ref<TextEvent> createForPlainTextPaste(AbstractView*, const String& data, bool shouldSmartReplace);
- static Ref<TextEvent> createForFragmentPaste(AbstractView*, RefPtr<DocumentFragment>&& data, bool shouldSmartReplace, bool shouldMatchStyle, MailBlockquoteHandling);
- static Ref<TextEvent> createForDrop(AbstractView*, const String& data);
- static Ref<TextEvent> createForDictation(AbstractView*, const String& data, const Vector<DictationAlternative>& dictationAlternatives);
+ static Ref<TextEvent> createForPlainTextPaste(DOMWindow*, const String& data, bool shouldSmartReplace);
+ static Ref<TextEvent> createForFragmentPaste(DOMWindow*, RefPtr<DocumentFragment>&& data, bool shouldSmartReplace, bool shouldMatchStyle, MailBlockquoteHandling);
+ static Ref<TextEvent> createForDrop(DOMWindow*, const String& data);
+ static Ref<TextEvent> createForDictation(DOMWindow*, const String& data, const Vector<DictationAlternative>& dictationAlternatives);
virtual ~TextEvent();
- void initTextEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView*, const String& data);
+ void initTextEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*, const String& data);
String data() const { return m_data; }
@@ -70,9 +70,9 @@
private:
TextEvent();
- TextEvent(AbstractView*, const String& data, TextEventInputType = TextEventInputKeyboard);
- TextEvent(AbstractView*, const String& data, RefPtr<DocumentFragment>&&, bool shouldSmartReplace, bool shouldMatchStyle, MailBlockquoteHandling);
- TextEvent(AbstractView*, const String& data, const Vector<DictationAlternative>& dictationAlternatives);
+ TextEvent(DOMWindow*, const String& data, TextEventInputType = TextEventInputKeyboard);
+ TextEvent(DOMWindow*, const String& data, RefPtr<DocumentFragment>&&, bool shouldSmartReplace, bool shouldMatchStyle, MailBlockquoteHandling);
+ TextEvent(DOMWindow*, const String& data, const Vector<DictationAlternative>& dictationAlternatives);
bool isTextEvent() const override;
Modified: trunk/Source/WebCore/dom/TouchEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/TouchEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/TouchEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -41,7 +41,7 @@
TouchEvent::TouchEvent(TouchList* touches, TouchList* targetTouches,
TouchList* changedTouches, const AtomicString& type,
- AbstractView* view, int screenX, int screenY, int pageX, int pageY,
+ DOMWindow* view, int screenX, int screenY, int pageX, int pageY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
: MouseRelatedEvent(type, true, true, currentTime(), view, 0, IntPoint(screenX, screenY),
IntPoint(pageX, pageY),
@@ -69,7 +69,7 @@
void TouchEvent::initTouchEvent(TouchList* touches, TouchList* targetTouches,
TouchList* changedTouches, const AtomicString& type,
- AbstractView* view, int screenX, int screenY, int clientX, int clientY,
+ DOMWindow* view, int screenX, int screenY, int clientX, int clientY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
{
if (dispatched())
Modified: trunk/Source/WebCore/dom/TouchEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/TouchEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/TouchEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -48,7 +48,7 @@
static Ref<TouchEvent> create(TouchList* touches,
TouchList* targetTouches, TouchList* changedTouches,
- const AtomicString& type, AbstractView* view,
+ const AtomicString& type, DOMWindow* view,
int screenX, int screenY, int pageX, int pageY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
{
@@ -67,7 +67,7 @@
void initTouchEvent(TouchList* touches, TouchList* targetTouches,
TouchList* changedTouches, const AtomicString& type,
- AbstractView*, int screenX, int screenY,
+ DOMWindow*, int screenX, int screenY,
int clientX, int clientY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
@@ -87,7 +87,7 @@
TouchEvent();
TouchEvent(TouchList* touches, TouchList* targetTouches,
TouchList* changedTouches, const AtomicString& type,
- AbstractView*, int screenX, int screenY, int pageX,
+ DOMWindow*, int screenX, int screenY, int pageX,
int pageY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
TouchEvent(const AtomicString&, const TouchEventInit&);
Modified: trunk/Source/WebCore/dom/UIEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/UIEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/UIEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -32,7 +32,7 @@
{
}
-UIEvent::UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, AbstractView* viewArg, int detailArg)
+UIEvent::UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, DOMWindow* viewArg, int detailArg)
: Event(eventType, canBubbleArg, cancelableArg)
, m_view(viewArg)
, m_detail(detailArg)
@@ -39,7 +39,7 @@
{
}
-UIEvent::UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, double timestamp, AbstractView* viewArg, int detailArg)
+UIEvent::UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, double timestamp, DOMWindow* viewArg, int detailArg)
: Event(eventType, canBubbleArg, cancelableArg, timestamp)
, m_view(viewArg)
, m_detail(detailArg)
@@ -57,7 +57,7 @@
{
}
-void UIEvent::initUIEvent(const AtomicString& typeArg, bool canBubbleArg, bool cancelableArg, AbstractView* viewArg, int detailArg)
+void UIEvent::initUIEvent(const AtomicString& typeArg, bool canBubbleArg, bool cancelableArg, DOMWindow* viewArg, int detailArg)
{
if (dispatched())
return;
Modified: trunk/Source/WebCore/dom/UIEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/UIEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/UIEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -29,16 +29,14 @@
namespace WebCore {
-typedef DOMWindow AbstractView;
-
struct UIEventInit : public EventInit {
- RefPtr<AbstractView> view;
+ RefPtr<DOMWindow> view;
int detail { 0 };
};
class UIEvent : public Event {
public:
- static Ref<UIEvent> create(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view, int detail)
+ static Ref<UIEvent> create(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view, int detail)
{
return adoptRef(*new UIEvent(type, canBubble, cancelable, view, detail));
}
@@ -52,9 +50,9 @@
}
virtual ~UIEvent();
- void initUIEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView*, int detail);
+ void initUIEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*, int detail);
- AbstractView* view() const { return m_view.get(); }
+ DOMWindow* view() const { return m_view.get(); }
int detail() const { return m_detail; }
EventInterface eventInterface() const override;
@@ -72,14 +70,14 @@
protected:
UIEvent();
- UIEvent(const AtomicString& type, bool canBubble, bool cancelable, AbstractView*, int detail);
- UIEvent(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, AbstractView*, int detail);
+ UIEvent(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow*, int detail);
+ UIEvent(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow*, int detail);
UIEvent(const AtomicString&, const UIEventInit&);
private:
bool isUIEvent() const final;
- RefPtr<AbstractView> m_view;
+ RefPtr<DOMWindow> m_view;
int m_detail;
};
Modified: trunk/Source/WebCore/dom/UIEventWithKeyState.h (204680 => 204681)
--- trunk/Source/WebCore/dom/UIEventWithKeyState.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/UIEventWithKeyState.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -51,7 +51,7 @@
{
}
- UIEventWithKeyState(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view, int detail, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
+ UIEventWithKeyState(const AtomicString& type, bool canBubble, bool cancelable, DOMWindow* view, int detail, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
: UIEvent(type, canBubble, cancelable, view, detail)
, m_ctrlKey(ctrlKey)
, m_altKey(altKey)
@@ -60,7 +60,7 @@
{
}
- UIEventWithKeyState(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, AbstractView* view, int detail, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
+ UIEventWithKeyState(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow* view, int detail, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
: UIEvent(type, canBubble, cancelable, timestamp, view, detail)
, m_ctrlKey(ctrlKey)
, m_altKey(altKey)
Modified: trunk/Source/WebCore/dom/WheelEvent.cpp (204680 => 204681)
--- trunk/Source/WebCore/dom/WheelEvent.cpp 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/WheelEvent.cpp 2016-08-20 21:40:29 UTC (rev 204681)
@@ -65,7 +65,7 @@
{
}
-WheelEvent::WheelEvent(const PlatformWheelEvent& event, AbstractView* view)
+WheelEvent::WheelEvent(const PlatformWheelEvent& event, DOMWindow* view)
: MouseEvent(eventNames().wheelEvent, true, true, event.timestamp(), view, 0, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y()
#if ENABLE(POINTER_LOCK)
, 0, 0
@@ -81,7 +81,7 @@
{
}
-void WheelEvent::initWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
+void WheelEvent::initWheelEvent(int rawDeltaX, int rawDeltaY, DOMWindow* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
{
if (dispatched())
return;
@@ -104,7 +104,7 @@
initCoordinates(IntPoint(pageX, pageY));
}
-void WheelEvent::initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
+void WheelEvent::initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, DOMWindow* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
{
initWheelEvent(rawDeltaX, rawDeltaY, view, screenX, screenY, pageX, pageY, ctrlKey, altKey, shiftKey, metaKey);
}
Modified: trunk/Source/WebCore/dom/WheelEvent.h (204680 => 204681)
--- trunk/Source/WebCore/dom/WheelEvent.h 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/dom/WheelEvent.h 2016-08-20 21:40:29 UTC (rev 204681)
@@ -54,7 +54,7 @@
DOM_DELTA_PAGE
};
- static Ref<WheelEvent> create(const PlatformWheelEvent& event, AbstractView* view)
+ static Ref<WheelEvent> create(const PlatformWheelEvent& event, DOMWindow* view)
{
return adoptRef(*new WheelEvent(event, view));
}
@@ -69,11 +69,11 @@
return adoptRef(*new WheelEvent(type, initializer));
}
- void initWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView*,
+ void initWheelEvent(int rawDeltaX, int rawDeltaY, DOMWindow*,
int screenX, int screenY, int pageX, int pageY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
- void initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView*,
+ void initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, DOMWindow*,
int screenX, int screenY, int pageX, int pageY,
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
@@ -98,7 +98,7 @@
private:
WheelEvent();
WheelEvent(const AtomicString&, const WheelEventInit&);
- WheelEvent(const PlatformWheelEvent&, AbstractView*);
+ WheelEvent(const PlatformWheelEvent&, DOMWindow*);
bool isWheelEvent() const override;
Deleted: trunk/Source/WebCore/page/AbstractView.idl (204680 => 204681)
--- trunk/Source/WebCore/page/AbstractView.idl 2016-08-20 17:29:05 UTC (rev 204680)
+++ trunk/Source/WebCore/page/AbstractView.idl 2016-08-20 21:40:29 UTC (rev 204681)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Samuel Weinig <sam.wei...@gmail.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Introduced in DOM Level 2:
-[
- NoInterfaceObject,
- ObjCCustomImplementation,
-] interface AbstractView {
- readonly attribute Document document;
- readonly attribute StyleMedia styleMedia;
-};
-
