[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
weinig at apple.com
weinig at apple.com
Mon Feb 21 00:04:12 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit f176b1b95005fbd8313242ce6001ce31a62156e8
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 27 21:35:37 2011 +0000
2011-01-27 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
Encode/Decode hasPreciseScrollingDeltas bit in WebWheelEvent
https://bugs.webkit.org/show_bug.cgi?id=53254
* Shared/WebWheelEvent.cpp:
(WebKit::WebWheelEvent::WebWheelEvent):
Initialize m_phase and m_hasPreciseScrollingDeltas.
(WebKit::WebWheelEvent::encode):
(WebKit::WebWheelEvent::decode):
Add missing coding for m_hasPreciseScrollingDeltas.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76833 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 5ff519f..537bfd6 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-27 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Encode/Decode hasPreciseScrollingDeltas bit in WebWheelEvent
+ https://bugs.webkit.org/show_bug.cgi?id=53254
+
+ * Shared/WebWheelEvent.cpp:
+ (WebKit::WebWheelEvent::WebWheelEvent):
+ Initialize m_phase and m_hasPreciseScrollingDeltas.
+
+ (WebKit::WebWheelEvent::encode):
+ (WebKit::WebWheelEvent::decode):
+ Add missing coding for m_hasPreciseScrollingDeltas.
+
2011-01-26 Enrica Casucci <enrica at apple.com>
Reviewed by Darin Adler and Adam Roben.
diff --git a/Source/WebKit2/Shared/WebWheelEvent.cpp b/Source/WebKit2/Shared/WebWheelEvent.cpp
index c7cf938..09873d2 100644
--- a/Source/WebKit2/Shared/WebWheelEvent.cpp
+++ b/Source/WebKit2/Shared/WebWheelEvent.cpp
@@ -39,6 +39,10 @@ WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint
, m_delta(delta)
, m_wheelTicks(wheelTicks)
, m_granularity(granularity)
+#if PLATFORM(MAC)
+ , m_phase(PhaseNone)
+ , m_hasPreciseScrollingDeltas(false)
+#endif
{
ASSERT(isWheelEventType(type));
}
@@ -69,6 +73,7 @@ void WebWheelEvent::encode(CoreIPC::ArgumentEncoder* encoder) const
encoder->encode(m_granularity);
#if PLATFORM(MAC)
encoder->encode(m_phase);
+ encoder->encode(m_hasPreciseScrollingDeltas);
#endif
}
@@ -89,6 +94,8 @@ bool WebWheelEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebWheelEvent& t)
#if PLATFORM(MAC)
if (!decoder->decode(t.m_phase))
return false;
+ if (!decoder->decode(t.m_hasPreciseScrollingDeltas))
+ return false;
#endif
return true;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list