Title: [124912] trunk/Source/WebKit/blackberry
- Revision
- 124912
- Author
- [email protected]
- Date
- 2012-08-07 13:15:26 -0700 (Tue, 07 Aug 2012)
Log Message
[BlackBerry][FullScreen] Remove the set/reset of touch modes code when entering/leaving fullscreen
https://bugs.webkit.org/show_bug.cgi?id=92520
PR #184511
Reviewed by Yong Li.
Patch by Antonio Gomes <[email protected]>
Internally reviewed by Gen Mak.
Remove touch mode set/reset when entering/leaving fullscreen
for media elements through the new FULLSCREEN_API code path.
The client now handles it.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::WebPagePrivate):
(BlackBerry::WebKit::WebPagePrivate::enterFullScreenForElement):
(BlackBerry::WebKit::WebPagePrivate::exitFullScreenForElement):
* Api/WebPage_p.h:
(WebPagePrivate):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (124911 => 124912)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-07 20:06:01 UTC (rev 124911)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-07 20:15:26 UTC (rev 124912)
@@ -371,10 +371,7 @@
#if ENABLE(EVENT_MODE_METATAGS)
, m_cursorEventMode(ProcessedCursorEvents)
, m_touchEventMode(ProcessedTouchEvents)
-#if ENABLE(FULLSCREEN_API)
- , m_touchEventModePriorGoingFullScreen(ProcessedTouchEvents)
#endif
-#endif
#if ENABLE(FULLSCREEN_API) && ENABLE(VIDEO)
, m_scaleBeforeFullScreen(-1.0)
, m_xScrollOffsetBeforeFullScreen(-1)
@@ -6095,10 +6092,6 @@
m_xScrollOffsetBeforeFullScreen = scrollPosition.x();
m_mainFrame->view()->setScrollPosition(WebCore::IntPoint(0, scrollPosition.y()));
-#if ENABLE(EVENT_MODE_METATAGS)
- m_touchEventModePriorGoingFullScreen = m_touchEventMode;
- didReceiveTouchEventMode(PureTouchEventsWithMouseConversion);
-#endif
// The current scale can be clamped to a greater minimum scale when we relayout contents during
// the change of the viewport size. Cache the current scale so that we can restore it when
// leaving fullscreen. Otherwise, it is possible that we will use the wrong scale.
@@ -6133,10 +6126,6 @@
WebCore::IntPoint(m_xScrollOffsetBeforeFullScreen, scrollPosition.y()));
m_xScrollOffsetBeforeFullScreen = -1;
-#if ENABLE(EVENT_MODE_METATAGS)
- didReceiveTouchEventMode(m_touchEventModePriorGoingFullScreen);
- m_touchEventModePriorGoingFullScreen = ProcessedTouchEvents;
-#endif
if (m_scaleBeforeFullScreen > 0) {
// Restore the scale when leaving fullscreen. We can't use TransformationMatrix::scale(double) here, as it
// will multiply the scale rather than set the scale.
Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (124911 => 124912)
--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-08-07 20:06:01 UTC (rev 124911)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-08-07 20:15:26 UTC (rev 124912)
@@ -516,9 +516,6 @@
#endif
#if ENABLE(FULLSCREEN_API)
-#if ENABLE(EVENT_MODE_METATAGS)
- WebCore::TouchEventMode m_touchEventModePriorGoingFullScreen;
-#endif
#if ENABLE(VIDEO)
double m_scaleBeforeFullScreen;
int m_xScrollOffsetBeforeFullScreen;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (124911 => 124912)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-07 20:06:01 UTC (rev 124911)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-07 20:15:26 UTC (rev 124912)
@@ -1,3 +1,23 @@
+2012-08-07 Antonio Gomes <[email protected]>
+
+ [BlackBerry][FullScreen] Remove the set/reset of touch modes code when entering/leaving fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=92520
+ PR #184511
+
+ Reviewed by Yong Li.
+ Internally reviewed by Gen Mak.
+
+ Remove touch mode set/reset when entering/leaving fullscreen
+ for media elements through the new FULLSCREEN_API code path.
+ The client now handles it.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::WebPagePrivate):
+ (BlackBerry::WebKit::WebPagePrivate::enterFullScreenForElement):
+ (BlackBerry::WebKit::WebPagePrivate::exitFullScreenForElement):
+ * Api/WebPage_p.h:
+ (WebPagePrivate):
+
2012-08-07 Konrad Piascik <[email protected]>
[BlackBerry] Add missing include in FrameLoaderClienBlackBerry after Base64 moved.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
