Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (122468 => 122469)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-07-12 16:17:46 UTC (rev 122468)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-07-12 16:35:57 UTC (rev 122469)
@@ -4129,37 +4129,7 @@
bool WebPage::touchEvent(const Platform::TouchEvent& event)
{
#if DEBUG_TOUCH_EVENTS
- switch (event.m_type) {
- case Platform::TouchEvent::TouchEnd:
- Platform::log(Platform::LogLevelCritical, "WebPage::touchEvent Touch End");
- break;
- case Platform::TouchEvent::TouchStart:
- Platform::log(Platform::LogLevelCritical, "WebPage::touchEvent Touch Start");
- break;
- case Platform::TouchEvent::TouchMove:
- Platform::log(Platform::LogLevelCritical, "WebPage::touchEvent Touch Move");
- break;
- case Platform::TouchEvent::TouchCancel:
- Platform::log(Platform::LogLevelCritical, "WebPage::touchCancel Touch Cancel");
- break;
- }
-
- for (unsigned i = 0; i < event.m_points.size(); i++) {
- switch (event.m_points[i].m_state) {
- case Platform::TouchPoint::TouchPressed:
- Platform::log(Platform::LogLevelCritical, "WebPage::touchEvent %d Touch Pressed (%d, %d)", event.m_points[i].m_id, event.m_points[i].m_pos.x(), event.m_points[i].m_pos.y());
- break;
- case Platform::TouchPoint::TouchReleased:
- Platform::log(Platform::LogLevelCritical, "WebPage::touchEvent %d Touch Released (%d, %d)", event.m_points[i].m_id, event.m_points[i].m_pos.x(), event.m_points[i].m_pos.y());
- break;
- case Platform::TouchPoint::TouchMoved:
- Platform::log(Platform::LogLevelCritical, "WebPage::touchEvent %d Touch Moved (%d, %d)", event.m_points[i].m_id, event.m_points[i].m_pos.x(), event.m_points[i].m_pos.y());
- break;
- case Platform::TouchPoint::TouchStationary:
- Platform::log(Platform::LogLevelCritical, "WebPage::touchEvent %d Touch Stationary (%d, %d)", event.m_points[i].m_id, event.m_points[i].m_pos.x(), event.m_points[i].m_pos.y());
- break;
- }
- }
+ BBLOG(LogLevelCritical, "%s", event.toString().c_str());
#endif
#if ENABLE(TOUCH_EVENTS)
Modified: trunk/Source/WebKit/blackberry/ChangeLog (122468 => 122469)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-12 16:17:46 UTC (rev 122468)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-12 16:35:57 UTC (rev 122469)
@@ -1,3 +1,17 @@
+2012-07-12 Pawel Chomicki <pchomi...@rim.com>
+
+ [BlackBerry] WebPage::touchEvent() should use Platform::TouchEvent's toString() for debugging.
+ https://bugs.webkit.org/show_bug.cgi?id=91002
+
+ Reviewed by Antonio Gomes.
+ Reviewed internally by Genevieve Mak.
+
+ Updated DEBUG_TOUCH_EVENTS section of touchEvent method to utilize
+ Platform::TouchEvent's toString method.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPage::touchEvent):
+
2012-07-12 Jonathan Dong <jonathan.d...@torchmobile.com.cn>
[BlackBerry] Cannot use digest proxy auth and NTLM auth at the same time
