[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 15:13:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cb24d18fe9b292049ceab6d0032fc219ab5c726f
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 03:20:24 2010 +0000
Move some function definitions from WebEvent.h into new .cpp files
Someday maybe we'll split the classes into their own header files,
too.
Fixes <http://webkit.org/b/48604>.
Reviewed by Anders Carlsson.
* Shared/WebEvent.h: Moved code from here...
* Shared/WebEvent.cpp: Added.
* Shared/WebKeyboardEvent.cpp: Added.
* Shared/WebMouseEvent.cpp: Added.
* Shared/WebPlatformTouchPoint.cpp: Added.
* Shared/WebTouchEvent.cpp: Added.
* Shared/WebWheelEvent.cpp: Added.
...to here. Also changed WebTouchEvent::touchPoints not to copy the
Vector.
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
Added the new files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70836 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 204a00f..1384457 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,30 @@
+2010-10-28 Adam Roben <aroben at apple.com>
+
+ Move some function definitions from WebEvent.h into new .cpp files
+
+ Someday maybe we'll split the classes into their own header files,
+ too.
+
+ Fixes <http://webkit.org/b/48604>.
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebEvent.h: Moved code from here...
+
+ * Shared/WebEvent.cpp: Added.
+ * Shared/WebKeyboardEvent.cpp: Added.
+ * Shared/WebMouseEvent.cpp: Added.
+ * Shared/WebPlatformTouchPoint.cpp: Added.
+ * Shared/WebTouchEvent.cpp: Added.
+ * Shared/WebWheelEvent.cpp: Added.
+ ...to here. Also changed WebTouchEvent::touchPoints not to copy the
+ Vector.
+
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ Added the new files.
+
2010-10-28 Anders Carlsson <andersca at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit2/Shared/WebEvent.cpp b/WebKit2/Shared/WebEvent.cpp
new file mode 100644
index 0000000..1086126
--- /dev/null
+++ b/WebKit2/Shared/WebEvent.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#include "WebEvent.h"
+
+namespace WebKit {
+
+WebEvent::WebEvent(Type type, Modifiers modifiers, double timestamp)
+ : m_type(type)
+ , m_modifiers(modifiers)
+ , m_timestamp(timestamp)
+{
+}
+
+void WebEvent::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ encoder->encode(m_type);
+ encoder->encode(m_modifiers);
+ encoder->encode(m_timestamp);
+}
+
+bool WebEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebEvent& t)
+{
+ if (!decoder->decode(t.m_type))
+ return false;
+ if (!decoder->decode(t.m_modifiers))
+ return false;
+ if (!decoder->decode(t.m_timestamp))
+ return false;
+
+ return true;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/WebEvent.h b/WebKit2/Shared/WebEvent.h
index 79fe67e..76f262a 100644
--- a/WebKit2/Shared/WebEvent.h
+++ b/WebKit2/Shared/WebEvent.h
@@ -78,35 +78,12 @@ public:
double timestamp() const { return m_timestamp; }
protected:
- WebEvent()
- {
- }
-
- WebEvent(Type type, Modifiers modifiers, double timestamp)
- : m_type(type)
- , m_modifiers(modifiers)
- , m_timestamp(timestamp)
- {
- }
-
- void encode(CoreIPC::ArgumentEncoder* encoder) const
- {
- encoder->encode(m_type);
- encoder->encode(m_modifiers);
- encoder->encode(m_timestamp);
- }
-
- static bool decode(CoreIPC::ArgumentDecoder* decoder, WebEvent& t)
- {
- if (!decoder->decode(t.m_type))
- return false;
- if (!decoder->decode(t.m_modifiers))
- return false;
- if (!decoder->decode(t.m_timestamp))
- return false;
-
- return true;
- }
+ WebEvent() { }
+
+ WebEvent(Type, Modifiers, double timestamp);
+
+ void encode(CoreIPC::ArgumentEncoder*) const;
+ static bool decode(CoreIPC::ArgumentDecoder*, WebEvent&);
private:
uint32_t m_type; // Type
@@ -114,6 +91,7 @@ private:
double m_timestamp;
};
+// FIXME: Move this class to its own header file.
class WebMouseEvent : public WebEvent {
public:
enum Button {
@@ -123,24 +101,9 @@ public:
RightButton
};
- WebMouseEvent()
- {
- }
-
- WebMouseEvent(Type type, Button button, int x, int y, int globalX, int globalY, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp)
- : WebEvent(type, modifiers, timestamp)
- , m_button(button)
- , m_positionX(x)
- , m_positionY(y)
- , m_globalPositionX(globalX)
- , m_globalPositionY(globalY)
- , m_deltaX(deltaX)
- , m_deltaY(deltaY)
- , m_deltaZ(deltaZ)
- , m_clickCount(clickCount)
- {
- ASSERT(isMouseEventType(type));
- }
+ WebMouseEvent() { }
+
+ WebMouseEvent(Type, Button, int x, int y, int globalX, int globalY, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers, double timestamp);
Button button() const { return m_button; }
int positionX() const { return m_positionX; }
@@ -152,21 +115,11 @@ public:
float deltaZ() const { return m_deltaZ; }
int clickCount() const { return m_clickCount; }
- void encode(CoreIPC::ArgumentEncoder* encoder) const
- {
- encoder->encodeBytes(reinterpret_cast<const uint8_t*>(this), sizeof(*this));
- }
-
- static bool decode(CoreIPC::ArgumentDecoder* decoder, WebMouseEvent& t)
- {
- return decoder->decodeBytes(reinterpret_cast<uint8_t*>(&t), sizeof(t));
- }
+ void encode(CoreIPC::ArgumentEncoder*) const;
+ static bool decode(CoreIPC::ArgumentDecoder*, WebMouseEvent&);
private:
- static bool isMouseEventType(Type type)
- {
- return type == MouseDown || type == MouseUp || type == MouseMove;
- }
+ static bool isMouseEventType(Type);
Button m_button;
int m_positionX;
@@ -179,6 +132,7 @@ private:
int m_clickCount;
};
+// FIXME: Move this class to its own header file.
class WebWheelEvent : public WebEvent {
public:
enum Granularity {
@@ -186,24 +140,9 @@ public:
ScrollByPixelWheelEvent
};
- WebWheelEvent()
- {
- }
-
- WebWheelEvent(Type type, int x, int y, int globalX, int globalY, float deltaX, float deltaY, float wheelTicksX, float wheelTicksY, Granularity granularity, Modifiers modifiers, double timestamp)
- : WebEvent(type, modifiers, timestamp)
- , m_positionX(x)
- , m_positionY(y)
- , m_globalPositionX(globalX)
- , m_globalPositionY(globalY)
- , m_deltaX(deltaX)
- , m_deltaY(deltaY)
- , m_wheelTicksX(wheelTicksX)
- , m_wheelTicksY(wheelTicksY)
- , m_granularity(granularity)
- {
- ASSERT(isWheelEventType(type));
- }
+ WebWheelEvent() { }
+
+ WebWheelEvent(Type, int x, int y, int globalX, int globalY, float deltaX, float deltaY, float wheelTicksX, float wheelTicksY, Granularity, Modifiers, double timestamp);
int positionX() const { return m_positionX; }
int positionY() const { return m_positionY; }
@@ -215,21 +154,11 @@ public:
float wheelTicksY() const { return m_wheelTicksY; }
Granularity granularity() const { return (Granularity)m_granularity; }
- void encode(CoreIPC::ArgumentEncoder* encoder) const
- {
- encoder->encodeBytes(reinterpret_cast<const uint8_t*>(this), sizeof(*this));
- }
-
- static bool decode(CoreIPC::ArgumentDecoder* decoder, WebWheelEvent& t)
- {
- return decoder->decodeBytes(reinterpret_cast<uint8_t*>(&t), sizeof(t));
- }
+ void encode(CoreIPC::ArgumentEncoder*) const;
+ static bool decode(CoreIPC::ArgumentDecoder*, WebWheelEvent&);
private:
- static bool isWheelEventType(Type type)
- {
- return type == Wheel;
- }
+ static bool isWheelEventType(Type);
int m_positionX;
int m_positionY;
@@ -242,25 +171,12 @@ private:
unsigned m_granularity; // Granularity
};
+// FIXME: Move this class to its own header file.
class WebKeyboardEvent : public WebEvent {
public:
- WebKeyboardEvent()
- {
- }
-
- WebKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers, double timestamp)
- : WebEvent(type, modifiers, timestamp)
- , m_text(text)
- , m_unmodifiedText(unmodifiedText)
- , m_keyIdentifier(keyIdentifier)
- , m_windowsVirtualKeyCode(windowsVirtualKeyCode)
- , m_nativeVirtualKeyCode(nativeVirtualKeyCode)
- , m_isAutoRepeat(isAutoRepeat)
- , m_isKeypad(isKeypad)
- , m_isSystemKey(isSystemKey)
- {
- ASSERT(isKeyboardEventType(type));
- }
+ WebKeyboardEvent() { }
+
+ WebKeyboardEvent(Type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers, double timestamp);
const String& text() const { return m_text; }
const String& unmodifiedText() const { return m_unmodifiedText; }
@@ -271,57 +187,10 @@ public:
bool isKeypad() const { return m_isKeypad; }
bool isSystemKey() const { return m_isSystemKey; }
- void encode(CoreIPC::ArgumentEncoder* encoder) const
- {
- WebEvent::encode(encoder);
-
- encoder->encode(m_text);
- encoder->encode(m_unmodifiedText);
- encoder->encode(m_keyIdentifier);
- encoder->encode(m_windowsVirtualKeyCode);
- encoder->encode(m_nativeVirtualKeyCode);
- encoder->encode(m_isAutoRepeat);
- encoder->encode(m_isKeypad);
- encoder->encode(m_isSystemKey);
- }
-
- static bool decode(CoreIPC::ArgumentDecoder* decoder, WebKeyboardEvent& t)
- {
- if (!WebEvent::decode(decoder, t))
- return false;
-
- String text;
- if (!decoder->decode(text))
- return false;
- t.m_text = text;
-
- String unmodifiedText;
- if (!decoder->decode(unmodifiedText))
- return false;
- t.m_unmodifiedText = unmodifiedText;
-
- String keyIdentifier;
- if (!decoder->decode(keyIdentifier))
- return false;
- t.m_keyIdentifier = keyIdentifier;
-
- if (!decoder->decode(t.m_windowsVirtualKeyCode))
- return false;
- if (!decoder->decode(t.m_nativeVirtualKeyCode))
- return false;
- if (!decoder->decode(t.m_isAutoRepeat))
- return false;
- if (!decoder->decode(t.m_isKeypad))
- return false;
- if (!decoder->decode(t.m_isSystemKey))
- return false;
- return true;
- }
-
- static bool isKeyboardEventType(Type type)
- {
- return type == RawKeyDown || type == KeyDown || type == KeyUp || type == Char;
- }
+ void encode(CoreIPC::ArgumentEncoder*) const;
+ static bool decode(CoreIPC::ArgumentDecoder*, WebKeyboardEvent&);
+
+ static bool isKeyboardEventType(Type);
private:
String m_text;
@@ -336,6 +205,9 @@ private:
#if ENABLE(TOUCH_EVENTS)
+// FIXME: Move this class to its own header file.
+// FIXME: Having "Platform" in the name makes it sound like this event is platform-specific or low-
+// level in some way. That doesn't seem to be the case.
class WebPlatformTouchPoint {
public:
enum TouchPointState {
@@ -346,19 +218,9 @@ public:
TouchCancelled
};
- WebPlatformTouchPoint()
- {
- }
+ WebPlatformTouchPoint() { }
- WebPlatformTouchPoint(unsigned id, TouchPointState state, int screenPosX, int screenPosY, int posX, int posY)
- : m_id(id)
- , m_state(state)
- , m_screenPosX(screenPosX)
- , m_screenPosY(screenPosY)
- , m_posX(posX)
- , m_posY(posY)
- {
- }
+ WebPlatformTouchPoint(unsigned id, TouchPointState, int screenPosX, int screenPosY, int posX, int posY);
unsigned id() const { return m_id; }
TouchPointState state() const { return m_state; }
@@ -370,15 +232,8 @@ public:
void setState(TouchPointState state) { m_state = state; }
- void encode(CoreIPC::ArgumentEncoder* encoder) const
- {
- encoder->encodeBytes(reinterpret_cast<const uint8_t*>(this), sizeof(*this));
- }
-
- static bool decode(CoreIPC::ArgumentDecoder* decoder, WebPlatformTouchPoint& t)
- {
- return decoder->decodeBytes(reinterpret_cast<uint8_t*>(&t), sizeof(t));
- }
+ void encode(CoreIPC::ArgumentEncoder*) const;
+ static bool decode(CoreIPC::ArgumentDecoder*, WebPlatformTouchPoint&);
private:
unsigned m_id;
@@ -388,49 +243,21 @@ private:
};
+// FIXME: Move this class to its own header file.
class WebTouchEvent : public WebEvent {
public:
-
- WebTouchEvent()
- {
- }
+ WebTouchEvent() { }
- WebTouchEvent(WebEvent::Type type, Vector<WebPlatformTouchPoint> touchPoints, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, Modifiers modifiers, double timestamp)
- : WebEvent(type, modifiers, timestamp)
- , m_type(type)
- , m_touchPoints(touchPoints)
- , m_ctrlKey(ctrlKey)
- , m_altKey(altKey)
- , m_shiftKey(shiftKey)
- , m_metaKey(metaKey)
- {
- ASSERT(isTouchEventType(type));
- }
-
- const Vector<WebPlatformTouchPoint> touchPoints() const { return m_touchPoints; }
-
- void encode(CoreIPC::ArgumentEncoder* encoder) const
- {
- WebEvent::encode(encoder);
- encoder->encode(m_touchPoints);
- }
-
- static bool decode(CoreIPC::ArgumentDecoder* decoder, WebTouchEvent& t)
- {
- if (!WebEvent::decode(decoder, t))
- return false;
-
- if (!decoder->decode(t.m_touchPoints))
- return false;
-
- return true;
- }
+ // FIXME: It would be nice not to have to copy the Vector here.
+ WebTouchEvent(Type, Vector<WebPlatformTouchPoint>, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, Modifiers, double timestamp);
+
+ const Vector<WebPlatformTouchPoint>& touchPoints() const { return m_touchPoints; }
+
+ void encode(CoreIPC::ArgumentEncoder*) const;
+ static bool decode(CoreIPC::ArgumentDecoder*, WebTouchEvent&);
private:
- static bool isTouchEventType(Type type)
- {
- return type == TouchStart || type == TouchMove || type == TouchEnd;
- }
+ static bool isTouchEventType(Type);
Type m_type;
Vector<WebPlatformTouchPoint> m_touchPoints;
@@ -440,7 +267,8 @@ private:
bool m_metaKey;
double m_timestamp;
};
-#endif
+
+#endif // ENABLE(TOUCH_EVENTS)
} // namespace WebKit
diff --git a/WebKit2/Shared/WebKeyboardEvent.cpp b/WebKit2/Shared/WebKeyboardEvent.cpp
new file mode 100644
index 0000000..c711a5b
--- /dev/null
+++ b/WebKit2/Shared/WebKeyboardEvent.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#include "WebEvent.h"
+
+namespace WebKit {
+
+WebKeyboardEvent::WebKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, Modifiers modifiers, double timestamp)
+ : WebEvent(type, modifiers, timestamp)
+ , m_text(text)
+ , m_unmodifiedText(unmodifiedText)
+ , m_keyIdentifier(keyIdentifier)
+ , m_windowsVirtualKeyCode(windowsVirtualKeyCode)
+ , m_nativeVirtualKeyCode(nativeVirtualKeyCode)
+ , m_isAutoRepeat(isAutoRepeat)
+ , m_isKeypad(isKeypad)
+ , m_isSystemKey(isSystemKey)
+{
+ ASSERT(isKeyboardEventType(type));
+}
+
+void WebKeyboardEvent::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ WebEvent::encode(encoder);
+
+ encoder->encode(m_text);
+ encoder->encode(m_unmodifiedText);
+ encoder->encode(m_keyIdentifier);
+ encoder->encode(m_windowsVirtualKeyCode);
+ encoder->encode(m_nativeVirtualKeyCode);
+ encoder->encode(m_isAutoRepeat);
+ encoder->encode(m_isKeypad);
+ encoder->encode(m_isSystemKey);
+}
+
+bool WebKeyboardEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebKeyboardEvent& t)
+{
+ if (!WebEvent::decode(decoder, t))
+ return false;
+
+ String text;
+ if (!decoder->decode(text))
+ return false;
+ t.m_text = text;
+
+ String unmodifiedText;
+ if (!decoder->decode(unmodifiedText))
+ return false;
+ t.m_unmodifiedText = unmodifiedText;
+
+ String keyIdentifier;
+ if (!decoder->decode(keyIdentifier))
+ return false;
+ t.m_keyIdentifier = keyIdentifier;
+
+ if (!decoder->decode(t.m_windowsVirtualKeyCode))
+ return false;
+ if (!decoder->decode(t.m_nativeVirtualKeyCode))
+ return false;
+ if (!decoder->decode(t.m_isAutoRepeat))
+ return false;
+ if (!decoder->decode(t.m_isKeypad))
+ return false;
+ if (!decoder->decode(t.m_isSystemKey))
+ return false;
+ return true;
+}
+
+bool WebKeyboardEvent::isKeyboardEventType(Type type)
+{
+ return type == RawKeyDown || type == KeyDown || type == KeyUp || type == Char;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/WebMouseEvent.cpp b/WebKit2/Shared/WebMouseEvent.cpp
new file mode 100644
index 0000000..7c6cff1
--- /dev/null
+++ b/WebKit2/Shared/WebMouseEvent.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#include "WebEvent.h"
+
+namespace WebKit {
+
+WebMouseEvent::WebMouseEvent(Type type, Button button, int x, int y, int globalX, int globalY, float deltaX, float deltaY, float deltaZ, int clickCount, Modifiers modifiers, double timestamp)
+ : WebEvent(type, modifiers, timestamp)
+ , m_button(button)
+ , m_positionX(x)
+ , m_positionY(y)
+ , m_globalPositionX(globalX)
+ , m_globalPositionY(globalY)
+ , m_deltaX(deltaX)
+ , m_deltaY(deltaY)
+ , m_deltaZ(deltaZ)
+ , m_clickCount(clickCount)
+{
+ ASSERT(isMouseEventType(type));
+}
+
+void WebMouseEvent::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ encoder->encodeBytes(reinterpret_cast<const uint8_t*>(this), sizeof(*this));
+}
+
+bool WebMouseEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebMouseEvent& t)
+{
+ return decoder->decodeBytes(reinterpret_cast<uint8_t*>(&t), sizeof(t));
+}
+
+bool WebMouseEvent::isMouseEventType(Type type)
+{
+ return type == MouseDown || type == MouseUp || type == MouseMove;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/WebPlatformTouchPoint.cpp b/WebKit2/Shared/WebPlatformTouchPoint.cpp
new file mode 100644
index 0000000..cfc285c
--- /dev/null
+++ b/WebKit2/Shared/WebPlatformTouchPoint.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#if ENABLE(TOUCH_EVENTS)
+
+#include "WebEvent.h"
+
+namespace WebKit {
+
+WebPlatformTouchPoint::WebPlatformTouchPoint(unsigned id, TouchPointState state, int screenPosX, int screenPosY, int posX, int posY)
+ : m_id(id)
+ , m_state(state)
+ , m_screenPosX(screenPosX)
+ , m_screenPosY(screenPosY)
+ , m_posX(posX)
+ , m_posY(posY)
+{
+}
+
+void WebPlatformTouchPoint::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ encoder->encodeBytes(reinterpret_cast<const uint8_t*>(this), sizeof(*this));
+}
+
+bool WebPlatformTouchPoint::decode(CoreIPC::ArgumentDecoder* decoder, WebPlatformTouchPoint& t)
+{
+ return decoder->decodeBytes(reinterpret_cast<uint8_t*>(&t), sizeof(t));
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(TOUCH_EVENTS)
diff --git a/WebKit2/Shared/WebTouchEvent.cpp b/WebKit2/Shared/WebTouchEvent.cpp
new file mode 100644
index 0000000..344b038
--- /dev/null
+++ b/WebKit2/Shared/WebTouchEvent.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#if ENABLE(TOUCH_EVENTS)
+
+#include "WebEvent.h"
+
+namespace WebKit {
+
+WebTouchEvent::WebTouchEvent(WebEvent::Type type, Vector<WebPlatformTouchPoint> touchPoints, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, Modifiers modifiers, double timestamp)
+ : WebEvent(type, modifiers, timestamp)
+ , m_type(type)
+ , m_touchPoints(touchPoints)
+ , m_ctrlKey(ctrlKey)
+ , m_altKey(altKey)
+ , m_shiftKey(shiftKey)
+ , m_metaKey(metaKey)
+{
+ ASSERT(isTouchEventType(type));
+}
+
+void WebTouchEvent::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ WebEvent::encode(encoder);
+ encoder->encode(m_touchPoints);
+}
+
+bool WebTouchEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebTouchEvent& t)
+{
+ if (!WebEvent::decode(decoder, t))
+ return false;
+
+ if (!decoder->decode(t.m_touchPoints))
+ return false;
+
+ return true;
+}
+
+bool WebTouchEvent::isTouchEventType(Type type)
+{
+ return type == TouchStart || type == TouchMove || type == TouchEnd;
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(TOUCH_EVENTS)
diff --git a/WebKit2/Shared/WebWheelEvent.cpp b/WebKit2/Shared/WebWheelEvent.cpp
new file mode 100644
index 0000000..7b46fca
--- /dev/null
+++ b/WebKit2/Shared/WebWheelEvent.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#include "WebEvent.h"
+
+namespace WebKit {
+
+WebWheelEvent::WebWheelEvent(Type type, int x, int y, int globalX, int globalY, float deltaX, float deltaY, float wheelTicksX, float wheelTicksY, Granularity granularity, Modifiers modifiers, double timestamp)
+ : WebEvent(type, modifiers, timestamp)
+ , m_positionX(x)
+ , m_positionY(y)
+ , m_globalPositionX(globalX)
+ , m_globalPositionY(globalY)
+ , m_deltaX(deltaX)
+ , m_deltaY(deltaY)
+ , m_wheelTicksX(wheelTicksX)
+ , m_wheelTicksY(wheelTicksY)
+ , m_granularity(granularity)
+{
+ ASSERT(isWheelEventType(type));
+}
+
+void WebWheelEvent::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+ encoder->encodeBytes(reinterpret_cast<const uint8_t*>(this), sizeof(*this));
+}
+
+bool WebWheelEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebWheelEvent& t)
+{
+ return decoder->decodeBytes(reinterpret_cast<uint8_t*>(&t), sizeof(t));
+}
+
+bool WebWheelEvent::isWheelEventType(Type type)
+{
+ return type == Wheel;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 3f8fe5f..c6fe52f 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -376,13 +376,19 @@ SOURCES += \
Shared/qt/WebURLResponseQt.cpp \
Shared/VisitedLinkTable.cpp \
Shared/WebError.cpp \
+ Shared/WebEvent.cpp \
Shared/WebEventConversion.cpp \
+ Shared/WebKeyboardEvent.cpp \
+ Shared/WebMouseEvent.cpp \
Shared/WebPageCreationParameters.cpp \
+ Shared/WebPlatformTouchPoint.cpp \
Shared/WebPopupItem.cpp \
- Shared/WebProcessCreationParameters.cpp \
Shared/WebPreferencesStore.cpp \
+ Shared/WebProcessCreationParameters.cpp \
+ Shared/WebTouchEvent.cpp \
Shared/WebURLRequest.cpp \
Shared/WebURLResponse.cpp \
+ Shared/WebWheelEvent.cpp \
UIProcess/API/C/WKBackForwardList.cpp \
UIProcess/API/C/WKContext.cpp \
UIProcess/API/C/WKFrame.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 68a488a..cd85dcb 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -458,6 +458,12 @@
BCF69FAA1176D1CB00471A52 /* WKNavigationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */; };
C01A260112662F2100C9ED55 /* BackingStoreCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C01A260012662F2100C9ED55 /* BackingStoreCG.cpp */; };
C02BFF1E1251502E009CCBEA /* NativeWebKeyboardEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C02BFF1D1251502E009CCBEA /* NativeWebKeyboardEventMac.mm */; };
+ C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */; };
+ C0337DB0127A28D0008FF4F4 /* WebMouseEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DAF127A28D0008FF4F4 /* WebMouseEvent.cpp */; };
+ C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */; };
+ C0337DD3127A2A0E008FF4F4 /* WebKeyboardEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DD2127A2A0E008FF4F4 /* WebKeyboardEvent.cpp */; };
+ C0337DD8127A51B6008FF4F4 /* WebTouchEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */; };
+ C0337DDD127A521C008FF4F4 /* WebPlatformTouchPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */; };
C06C6095124C144B0001682F /* WebPageCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06C6093124C14430001682F /* WebPageCreationParameters.cpp */; };
C09AE5E9125257C20025825D /* WKNativeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = C09AE5E8125257C20025825D /* WKNativeEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
C0CE72A01247E71D00BC0EC4 /* WebPageMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0CE729E1247E71D00BC0EC4 /* WebPageMessageReceiver.cpp */; };
@@ -969,6 +975,12 @@
C01A260012662F2100C9ED55 /* BackingStoreCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackingStoreCG.cpp; sourceTree = "<group>"; };
C02BFF1512514FD8009CCBEA /* NativeWebKeyboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebKeyboardEvent.h; sourceTree = "<group>"; };
C02BFF1D1251502E009CCBEA /* NativeWebKeyboardEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebKeyboardEventMac.mm; sourceTree = "<group>"; };
+ C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebEvent.cpp; sourceTree = "<group>"; };
+ C0337DAF127A28D0008FF4F4 /* WebMouseEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMouseEvent.cpp; sourceTree = "<group>"; };
+ C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebWheelEvent.cpp; sourceTree = "<group>"; };
+ C0337DD2127A2A0E008FF4F4 /* WebKeyboardEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKeyboardEvent.cpp; sourceTree = "<group>"; };
+ C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebTouchEvent.cpp; sourceTree = "<group>"; };
+ C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPlatformTouchPoint.cpp; sourceTree = "<group>"; };
C06C6093124C14430001682F /* WebPageCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageCreationParameters.cpp; sourceTree = "<group>"; };
C06C6094124C14430001682F /* WebPageCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageCreationParameters.h; sourceTree = "<group>"; };
C08FDE87124A851C007645BD /* messages_unittest.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = messages_unittest.py; sourceTree = "<group>"; };
@@ -1273,27 +1285,33 @@
51578B821209ECEF00A37C4A /* WebData.h */,
BC575612126E0138006F0F12 /* WebError.cpp */,
516A4A5B120A2CCD00C05B7F /* WebError.h */,
+ C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */,
BC032DAF10F4380F0058C15A /* WebEvent.h */,
BC032DB010F4380F0058C15A /* WebEventConversion.cpp */,
BC032DB110F4380F0058C15A /* WebEventConversion.h */,
+ C0337DD2127A2A0E008FF4F4 /* WebKeyboardEvent.cpp */,
+ C0337DAF127A28D0008FF4F4 /* WebMouseEvent.cpp */,
BCF69F981176CED600471A52 /* WebNavigationDataStore.h */,
BC33DD671238464600360F3F /* WebNumber.h */,
BC5744ED12638FB3006F0F12 /* WebPopupItem.cpp */,
BC5744EE12638FB3006F0F12 /* WebPopupItem.h */,
C06C6093124C14430001682F /* WebPageCreationParameters.cpp */,
C06C6094124C14430001682F /* WebPageCreationParameters.h */,
+ C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */,
BC306823125A6B9400E71278 /* WebProcessCreationParameters.cpp */,
BC306822125A6B9400E71278 /* WebProcessCreationParameters.h */,
BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
BCF04C8E11FF9F6E00F86A58 /* WebString.h */,
+ C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
BCDB86C01200FB97007254BE /* WebURL.h */,
BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */,
BCE2315B122C30CA00D5C35A /* WebURLRequest.h */,
BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */,
+ C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */,
);
path = Shared;
sourceTree = "<group>";
@@ -2520,6 +2538,12 @@
1A61614F127798B5003ACD86 /* DownloadManager.cpp in Sources */,
1A6161D51278981C003ACD86 /* Download.cpp in Sources */,
1A61639612789B2F003ACD86 /* DownloadMac.mm in Sources */,
+ C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
+ C0337DB0127A28D0008FF4F4 /* WebMouseEvent.cpp in Sources */,
+ C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */,
+ C0337DD3127A2A0E008FF4F4 /* WebKeyboardEvent.cpp in Sources */,
+ C0337DD8127A51B6008FF4F4 /* WebTouchEvent.cpp in Sources */,
+ C0337DDD127A521C008FF4F4 /* WebPlatformTouchPoint.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index c399472..9b2d479 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -505,6 +505,10 @@
>
</File>
<File
+ RelativePath="..\Shared\WebEvent.cpp"
+ >
+ </File>
+ <File
RelativePath="..\Shared\WebEvent.h"
>
</File>
@@ -517,6 +521,14 @@
>
</File>
<File
+ RelativePath="..\Shared\WebKeyboardEvent.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Shared\WebMouseEvent.cpp"
+ >
+ </File>
+ <File
RelativePath="..\Shared\WebNavigationDataStore.h"
>
</File>
@@ -533,6 +545,10 @@
>
</File>
<File
+ RelativePath="..\Shared\WebPlatformTouchPoint.cpp"
+ >
+ </File>
+ <File
RelativePath="..\Shared\WebPopupItem.cpp"
>
</File>
@@ -565,6 +581,10 @@
>
</File>
<File
+ RelativePath="..\Shared\WebTouchEvent.cpp"
+ >
+ </File>
+ <File
RelativePath="..\Shared\WebURL.h"
>
</File>
@@ -588,6 +608,10 @@
RelativePath="..\Shared\WebUserContentURLPattern.h"
>
</File>
+ <File
+ RelativePath="..\Shared\WebWheelEvent.cpp"
+ >
+ </File>
<Filter
Name="API"
>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list