Title: [188223] trunk/Source/WebKit2
- Revision
- 188223
- Author
- [email protected]
- Date
- 2015-08-10 13:36:10 -0700 (Mon, 10 Aug 2015)
Log Message
Unreviewed, rolling out r187131 and r187286.
https://bugs.webkit.org/show_bug.cgi?id=147839
Causing mroe frequent crashes with invalid layer bounds
(rdar://problem/21465328) (Requested by smfr on #webkit).
Reverted changesets:
"[iOS] Menu drop down such as on nike.com does not stay"
https://bugs.webkit.org/show_bug.cgi?id=147047
http://trac.webkit.org/changeset/187131
"[iOS] REGRESSION (187131): Loading CuteOverload zooms in to
the top left corner."
https://bugs.webkit.org/show_bug.cgi?id=147251
http://trac.webkit.org/changeset/187286
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (188222 => 188223)
--- trunk/Source/WebKit2/ChangeLog 2015-08-10 20:33:38 UTC (rev 188222)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-10 20:36:10 UTC (rev 188223)
@@ -1,3 +1,22 @@
+2015-08-10 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r187131 and r187286.
+ https://bugs.webkit.org/show_bug.cgi?id=147839
+
+ Causing mroe frequent crashes with invalid layer bounds
+ (rdar://problem/21465328) (Requested by smfr on #webkit).
+
+ Reverted changesets:
+
+ "[iOS] Menu drop down such as on nike.com does not stay"
+ https://bugs.webkit.org/show_bug.cgi?id=147047
+ http://trac.webkit.org/changeset/187131
+
+ "[iOS] REGRESSION (187131): Loading CuteOverload zooms in to
+ the top left corner."
+ https://bugs.webkit.org/show_bug.cgi?id=147251
+ http://trac.webkit.org/changeset/187286
+
2015-08-07 Matt Rajca <[email protected]>
Media Session: generalize isFocusedContentMediaElementPlaying so it works with other playback attributes
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (188222 => 188223)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-10 20:33:38 UTC (rev 188222)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-10 20:36:10 UTC (rev 188223)
@@ -987,24 +987,9 @@
[_scrollView setMinimumZoomScale:layerTreeTransaction.minimumScaleFactor()];
[_scrollView setMaximumZoomScale:layerTreeTransaction.maximumScaleFactor()];
[_scrollView setZoomEnabled:layerTreeTransaction.allowsUserScaling()];
- if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom]) {
- float newPageScaleFactor = layerTreeTransaction.pageScaleFactor();
+ if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom])
+ [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
- if (!areEssentiallyEqualAsFloat(contentZoomScale(self), newPageScaleFactor)) {
- // FIXME: We need to handle stick to bottom.
- WebCore::FloatRect oldUnobscuredContentRect = _page->unobscuredContentRect();
- if (!oldUnobscuredContentRect.isEmpty() && oldUnobscuredContentRect.y() < 1) {
- CGFloat relativeHorizontalPosition = oldUnobscuredContentRect.x() / oldUnobscuredContentRect.width();
- CGPoint newTopLeft = { relativeHorizontalPosition * newContentSize.width, 0 };
- CGSize scrollViewSize = [_scrollView bounds].size;
- CGSize rectToZoomSize = CGSizeMake(scrollViewSize.width / newPageScaleFactor, scrollViewSize.height / newPageScaleFactor);
- [_scrollView zoomToRect: { newTopLeft, rectToZoomSize } animated:NO];
- ASSERT(areEssentiallyEqualAsFloat(newPageScaleFactor, contentZoomScale(self)));
- } else
- [_scrollView setZoomScale:newPageScaleFactor];
- }
- }
-
[self _updateScrollViewBackground];
if (_gestureController)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
