Title: [119322] trunk/Source/WebKit/blackberry
- Revision
- 119322
- Author
- [email protected]
- Date
- 2012-06-02 07:53:19 -0700 (Sat, 02 Jun 2012)
Log Message
[BlackBerry] browser video player fullscreen mode (portrait) - out of screen/focus - cannot navigate or use the buttons on the screen (PART III)
https://bugs.webkit.org/show_bug.cgi?id=88019
Reviewed by George Staikos.
Patch by Antonio Gomes <[email protected]>
Enter 'pure-with-mouse-conversion' mode when going fullscreen, so
that it prevents user from scrolling the WebPage, pinch zooming,
touch-and-hold, enter selection mode, etc ...
Internally reviewed by Gen Mak.
* 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 (119321 => 119322)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-06-02 14:52:55 UTC (rev 119321)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-06-02 14:53:19 UTC (rev 119322)
@@ -357,7 +357,10 @@
#if ENABLE(EVENT_MODE_METATAGS)
, m_cursorEventMode(ProcessedCursorEvents)
, m_touchEventMode(ProcessedTouchEvents)
+#if ENABLE(FULLSCREEN_API)
+ , m_touchEventModePriorGoingFullScreen(ProcessedTouchEvents)
#endif
+#endif
#if ENABLE(FULLSCREEN_API)
, m_xScrollOffsetPriorGoingFullScreen(-1)
#endif
@@ -6095,6 +6098,10 @@
m_xScrollOffsetPriorGoingFullScreen = scrollPosition.x();
m_mainFrame->view()->setScrollPosition(WebCore::IntPoint(0, scrollPosition.y()));
+#if ENABLE(EVENT_MODE_METATAGS)
+ m_touchEventModePriorGoingFullScreen = m_touchEventMode;
+ didReceiveTouchEventMode(PureTouchEventsWithMouseConversion);
+#endif
// No fullscreen video widget has been made available by the Browser
// chrome, or this is not a video element. The webkitRequestFullScreen
// _javascript_ call is often made on a div element.
@@ -6122,6 +6129,10 @@
WebCore::IntPoint(m_xScrollOffsetPriorGoingFullScreen, scrollPosition.y()));
m_xScrollOffsetPriorGoingFullScreen = -1;
+#if ENABLE(EVENT_MODE_METATAGS)
+ didReceiveTouchEventMode(m_touchEventModePriorGoingFullScreen);
+ m_touchEventModePriorGoingFullScreen = ProcessedTouchEvents;
+#endif
// This is where we would restore the browser's chrome
// if hidden above.
client()->fullscreenStop();
Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (119321 => 119322)
--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-06-02 14:52:55 UTC (rev 119321)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-06-02 14:53:19 UTC (rev 119322)
@@ -491,6 +491,9 @@
#endif
#if ENABLE(FULLSCREEN_API)
+#if ENABLE(EVENT_MODE_METATAGS)
+ WebCore::TouchEventMode m_touchEventModePriorGoingFullScreen;
+#endif
int m_xScrollOffsetPriorGoingFullScreen;
#endif
Modified: trunk/Source/WebKit/blackberry/ChangeLog (119321 => 119322)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-06-02 14:52:55 UTC (rev 119321)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-06-02 14:53:19 UTC (rev 119322)
@@ -1,5 +1,25 @@
2012-06-02 Antonio Gomes <[email protected]>
+ [BlackBerry] browser video player fullscreen mode (portrait) - out of screen/focus - cannot navigate or use the buttons on the screen (PART III)
+ https://bugs.webkit.org/show_bug.cgi?id=88019
+
+ Reviewed by George Staikos.
+
+ Enter 'pure-with-mouse-conversion' mode when going fullscreen, so
+ that it prevents user from scrolling the WebPage, pinch zooming,
+ touch-and-hold, enter selection mode, etc ...
+
+ Internally reviewed by Gen Mak.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::WebPagePrivate):
+ (BlackBerry::WebKit::WebPagePrivate::enterFullScreenForElement):
+ (BlackBerry::WebKit::WebPagePrivate::exitFullScreenForElement):
+ * Api/WebPage_p.h:
+ (WebPagePrivate):
+
+2012-06-02 Antonio Gomes <[email protected]>
+
[BlackBerry] browser video player fullscreen mode (portrait) - out of screen/focus - cannot navigate or use the buttons on the screen (PART II)
https://bugs.webkit.org/show_bug.cgi?id=88019
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
