Title: [168395] trunk/Source/WebKit2
- Revision
- 168395
- Author
- benja...@webkit.org
- Date
- 2014-05-06 17:29:29 -0700 (Tue, 06 May 2014)
Log Message
<rdar://problem/16833442> [iOS WebKit2]: Keep the order of contentView in _scrollView after rotation
https://bugs.webkit.org/show_bug.cgi?id=132634
Reviewed by Enrica Casucci.
Nice idea of Yongjun.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _beginAnimatedResizeWithUpdates:]):
(-[WKWebView _endAnimatedResize]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (168394 => 168395)
--- trunk/Source/WebKit2/ChangeLog 2014-05-07 00:17:00 UTC (rev 168394)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-07 00:29:29 UTC (rev 168395)
@@ -1,3 +1,16 @@
+2014-05-06 Benjamin Poulain <benja...@webkit.org>
+
+ <rdar://problem/16833442> [iOS WebKit2]: Keep the order of contentView in _scrollView after rotation
+ https://bugs.webkit.org/show_bug.cgi?id=132634
+
+ Reviewed by Enrica Casucci.
+
+ Nice idea of Yongjun.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+ (-[WKWebView _endAnimatedResize]):
+
2014-05-06 Timothy Hatcher <timo...@apple.com>
Take WKView's topContentInset into account when docking Web Inspector to the right.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (168394 => 168395)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-07 00:17:00 UTC (rev 168394)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-07 00:29:29 UTC (rev 168395)
@@ -1414,8 +1414,9 @@
_isAnimatingResize = YES;
_resizeAnimationTransformAdjustments = CATransform3DIdentity;
+ NSUInteger indexOfContentView = [[_scrollView subviews] indexOfObject:_contentView.get()];
_resizeAnimationView = adoptNS([[UIView alloc] init]);
- [_scrollView addSubview:_resizeAnimationView.get()];
+ [_scrollView insertSubview:_resizeAnimationView.get() atIndex:indexOfContentView];
[_resizeAnimationView addSubview:_contentView.get()];
CGRect oldBounds = self.bounds;
@@ -1490,7 +1491,8 @@
- (void)_endAnimatedResize
{
if (!_customContentView) {
- [_scrollView addSubview:_contentView.get()];
+ NSUInteger indexOfResizeAnimationView = [[_scrollView subviews] indexOfObject:_resizeAnimationView.get()];
+ [_scrollView insertSubview:_contentView.get() atIndex:indexOfResizeAnimationView];
CALayer *contentViewLayer = [_contentView layer];
CATransform3D resizeAnimationTransformAdjustements = _resizeAnimationTransformAdjustments;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
