[ios] Fixed web-compat bug related to resetting top content inset.

[ios] Fixed web-compat bug related to resetting top content inset.

OverscrollActionsController resets top content inset every time when
scolling is finished. Before this change it assumed that bottom inset
should be always reset to 0. This is not correct for cases when soft
keyboard is displayed and bottom offset is non-zero to accomodate the
keyboard.

This CL adds resetScrollViewTopContentInset method and calls it when
scrolling is finished. Remaining fixed will be landed in separate CLs
to make changes less risky.

BUG=669908, 675763
Committed: https://crrev.com/0774dcc15d6c7f59bcca77b5c2d1288b49911707
Cr-Commit-Position: refs/heads/master@{#440273}

[Eugene But (OOO till 7-30), 2016-12-19 23:24:54]

eugenebut@chromium.org changed reviewers:
+ jif@chromium.org

[Eugene But (OOO till 7-30), 2016-12-19 23:24:55]

I'm not landing this until upstreaming is finished, but still wanted to get a
review.

[Eugene But (OOO till 7-30), 2016-12-20 01:28:03]

The CQ bit was checked by eugenebut@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-20 01:28:26]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-20 01:43:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-20 01:43:21]

Dry run: This issue passed the CQ dry run.

[Eugene But (OOO till 7-30), 2016-12-20 19:31:52]

jif?

[jif, 2016-12-21 16:39:53]

lgtm

[Eugene But (OOO till 7-30), 2016-12-21 16:41:32]

Thanks!

[Eugene But (OOO till 7-30), 2016-12-21 21:48:13]

The CQ bit was checked by eugenebut@chromium.org

[commit-bot: I haz the power, 2016-12-21 21:48:57]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-21 22:05:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-21 22:05:26]

Failed to apply patch for
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm:
While running git apply --index -p1;
  error: patch failed:
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm:590
  error:
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm: patch
does not apply

Patch:      
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
Index: ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
diff --git
a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
index
a3f360ffaf8611c7886aa0dbae8b8679c1dcf8e0..628576e4462d4f3cfa56a4a7d74bacff25e633a3
100644
--- a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
+++ b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
@@ -196,6 +196,8 @@ NSString* const kOverscollActionsDidEnd =
@"OverscollActionsDidStop";
 // Setup/tearDown methods are used to register values when the delegate is set.
 - (void)tearDown;
 - (void)setup;
+// Resets scroll view's top content inset to |self.initialContentInset|.
+- (void)resetScrollViewTopContentInset;
 // Access the headerView from the delegate.
 - (UIView<RelaxedBoundsConstraintsHitTestSupport>*)headerView;
 // Locking/unlocking methods used to disable/enable the overscroll actions
@@ -381,8 +383,7 @@ NSString* const kOverscollActionsDidEnd =
@"OverscollActionsDidStop";
   // restored to initial value.
   if (contentOffset.y >= 0 ||
       self.overscrollState == ios_internal::OverscrollState::NO_PULL_STARTED) {
-    [self setScrollViewContentInset:UIEdgeInsetsMake(self.initialContentInset,
-                                                     0, 0, 0)];
+    [self resetScrollViewTopContentInset];
   }
 
   [self triggerActionIfNeeded];
@@ -590,6 +591,12 @@ NSString* const kOverscollActionsDidEnd =
@"OverscollActionsDidStop";
     [_webViewScrollViewProxy setContentInsetFast:contentInset];
 }
 
+- (void)resetScrollViewTopContentInset {
+  UIEdgeInsets contentInset = self.scrollView.contentInset;
+  contentInset.top = self.initialContentInset;
+  [self setScrollViewContentInset:contentInset];
+}
+
 - (UIView<RelaxedBoundsConstraintsHitTestSupport>*)headerView {
   return [self.delegate headerView];
 }

[Eugene But (OOO till 7-30), 2016-12-21 22:25:37]

The CQ bit was checked by eugenebut@chromium.org

[Eugene But (OOO till 7-30), 2016-12-21 22:25:37]

The patchset sent to the CQ was uploaded after l-g-t-m from jif@chromium.org
Link to the patchset: https://codereview.chromium.org/2589973004/#ps20001
(title: "Merged with origin/master")

[commit-bot: I haz the power, 2016-12-21 22:26:18]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-21 22:40:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-21 22:41:01]

Failed to apply patch for
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm:
While running git apply --index -p1;
  error: patch failed:
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm:590
  error:
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm: patch
does not apply

Patch:      
ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
Index: ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
diff --git
a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
index
a3f360ffaf8611c7886aa0dbae8b8679c1dcf8e0..628576e4462d4f3cfa56a4a7d74bacff25e633a3
100644
--- a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
+++ b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
@@ -196,6 +196,8 @@ NSString* const kOverscollActionsDidEnd =
@"OverscollActionsDidStop";
 // Setup/tearDown methods are used to register values when the delegate is set.
 - (void)tearDown;
 - (void)setup;
+// Resets scroll view's top content inset to |self.initialContentInset|.
+- (void)resetScrollViewTopContentInset;
 // Access the headerView from the delegate.
 - (UIView<RelaxedBoundsConstraintsHitTestSupport>*)headerView;
 // Locking/unlocking methods used to disable/enable the overscroll actions
@@ -381,8 +383,7 @@ NSString* const kOverscollActionsDidEnd =
@"OverscollActionsDidStop";
   // restored to initial value.
   if (contentOffset.y >= 0 ||
       self.overscrollState == ios_internal::OverscrollState::NO_PULL_STARTED) {
-    [self setScrollViewContentInset:UIEdgeInsetsMake(self.initialContentInset,
-                                                     0, 0, 0)];
+    [self resetScrollViewTopContentInset];
   }
 
   [self triggerActionIfNeeded];
@@ -590,6 +591,12 @@ NSString* const kOverscollActionsDidEnd =
@"OverscollActionsDidStop";
     [_webViewScrollViewProxy setContentInsetFast:contentInset];
 }
 
+- (void)resetScrollViewTopContentInset {
+  UIEdgeInsets contentInset = self.scrollView.contentInset;
+  contentInset.top = self.initialContentInset;
+  [self setScrollViewContentInset:contentInset];
+}
+
 - (UIView<RelaxedBoundsConstraintsHitTestSupport>*)headerView {
   return [self.delegate headerView];
 }

[Eugene But (OOO till 7-30), 2016-12-21 23:54:52]

The CQ bit was checked by eugenebut@chromium.org

[Eugene But (OOO till 7-30), 2016-12-21 23:54:53]

The patchset sent to the CQ was uploaded after l-g-t-m from jif@chromium.org
Link to the patchset: https://codereview.chromium.org/2589973004/#ps40001
(title: "Merged with origin/master")

[commit-bot: I haz the power, 2016-12-21 23:55:19]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-22 00:07:10]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1482364492527370,
"parent_rev": "5d57d765d0ced19888f1d81a4faddfe02cfd8e7e", "commit_rev":
"b299c6f341901067fa2a496b25c2f5bbcf6c8a2a"}

[commit-bot: I haz the power, 2016-12-22 00:07:38]

Description was changed from

==========
[ios] Fixed web-compat bug related to resetting top content inset.

OverscrollActionsController resets top content inset every time when
scolling is finished. Before this change it assumed that bottom inset
should be always reset to 0. This is not correct for cases when soft
keyboard is displayed and bottom offset is non-zero to accomodate the
keyboard.

This CL adds resetScrollViewTopContentInset method and calls it when
scrolling is finished. Remaining fixed will be landed in separate CLs
to make changes less risky.

BUG=669908,675763
==========

to

==========
[ios] Fixed web-compat bug related to resetting top content inset.

OverscrollActionsController resets top content inset every time when
scolling is finished. Before this change it assumed that bottom inset
should be always reset to 0. This is not correct for cases when soft
keyboard is displayed and bottom offset is non-zero to accomodate the
keyboard.

This CL adds resetScrollViewTopContentInset method and calls it when
scrolling is finished. Remaining fixed will be landed in separate CLs
to make changes less risky.

BUG=669908,675763

Review-Url: https://codereview.chromium.org/2589973004
==========

[commit-bot: I haz the power, 2016-12-22 00:07:39]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-12-22 00:11:25]

Description was changed from

==========
[ios] Fixed web-compat bug related to resetting top content inset.

OverscrollActionsController resets top content inset every time when
scolling is finished. Before this change it assumed that bottom inset
should be always reset to 0. This is not correct for cases when soft
keyboard is displayed and bottom offset is non-zero to accomodate the
keyboard.

This CL adds resetScrollViewTopContentInset method and calls it when
scrolling is finished. Remaining fixed will be landed in separate CLs
to make changes less risky.

BUG=669908,675763

Review-Url: https://codereview.chromium.org/2589973004
==========

to

==========
[ios] Fixed web-compat bug related to resetting top content inset.

OverscrollActionsController resets top content inset every time when
scolling is finished. Before this change it assumed that bottom inset
should be always reset to 0. This is not correct for cases when soft
keyboard is displayed and bottom offset is non-zero to accomodate the
keyboard.

This CL adds resetScrollViewTopContentInset method and calls it when
scrolling is finished. Remaining fixed will be landed in separate CLs
to make changes less risky.

BUG=669908,675763

Committed: https://crrev.com/0774dcc15d6c7f59bcca77b5c2d1288b49911707
Cr-Commit-Position: refs/heads/master@{#440273}
==========

[commit-bot: I haz the power, 2016-12-22 00:11:26]

Patchset 3 (id:??) landed as
https://crrev.com/0774dcc15d6c7f59bcca77b5c2d1288b49911707
Cr-Commit-Position: refs/heads/master@{#440273}