Title: [143226] trunk/Source/WebKit2
- Revision
- 143226
- Author
- jer.no...@apple.com
- Date
- 2013-02-18 08:49:46 -0800 (Mon, 18 Feb 2013)
Log Message
pinch-zooming webpage messes up full-screening of embedded video
https://bugs.webkit.org/show_bug.cgi?id=106115
Reviewed by Maciej Stachowiak.
Reset the page scale when entering full screen, and reset to the original scale when exiting.
* UIProcess/mac/WKFullScreenWindowController.h:
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (143225 => 143226)
--- trunk/Source/WebKit2/ChangeLog 2013-02-18 16:48:39 UTC (rev 143225)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-18 16:49:46 UTC (rev 143226)
@@ -1,3 +1,17 @@
+2013-01-04 Jer Noble <jer.no...@apple.com>
+
+ pinch-zooming webpage messes up full-screening of embedded video
+ https://bugs.webkit.org/show_bug.cgi?id=106115
+
+ Reviewed by Maciej Stachowiak.
+
+ Reset the page scale when entering full screen, and reset to the original scale when exiting.
+
+ * UIProcess/mac/WKFullScreenWindowController.h:
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]):
+ (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
+
2013-02-18 Christophe Dumez <ch.du...@sisa.samsung.com>
[EFL][WK2] Disable failing API tests
Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h (143225 => 143226)
--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h 2013-02-18 16:48:39 UTC (rev 143225)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h 2013-02-18 16:49:46 UTC (rev 143226)
@@ -57,6 +57,8 @@
BOOL _isExitingFullScreen;
BOOL _isFullScreen;
BOOL _isPlaying;
+
+ double _savedScale;
}
- (WKView*)webView;
Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (143225 => 143226)
--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2013-02-18 16:48:39 UTC (rev 143225)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2013-02-18 16:49:46 UTC (rev 143226)
@@ -262,6 +262,8 @@
[self _manager]->setAnimatingFullScreen(true);
[self _manager]->willEnterFullScreen();
+ _savedScale = [self _page]->pageScaleFactor();
+ [self _page]->scalePage(1, IntPoint());
}
- (void)beganEnterFullScreenWithInitialFrame:(const WebCore::IntRect&)initialFrame finalFrame:(const WebCore::IntRect&)finalFrame
@@ -391,7 +393,7 @@
// These messages must be sent after the swap or flashing will occur during forceRepaint:
[self _manager]->didExitFullScreen();
[self _manager]->setAnimatingFullScreen(false);
-
+ [self _page]->scalePage(_savedScale, IntPoint());
[self _page]->forceRepaint(VoidCallback::create(self, completeFinishExitFullScreenAnimationAfterRepaint));
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
