Bug 125769 – [iOS] Upstream WebCore/history changes

• Status: RESOLVED
• Resolution: FIXED
• Component: History

[Daniel Bates]

Upstream the iOS related changes to WebCore/history.

[Daniel Bates]

Created attachment 219301 [details]
Patch

[Darin Adler]

Comment on attachment 219301 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=219301&action=review

> Source/WebCore/history/CachedPage.cpp:103
> +#if !PLATFORM(IOS)
>      if (Element* element = focusedDocument->focusedElement())
>          element->updateFocusAppearance(true);
> +#else
> +    if (Element* element = focusedDocument->focusedElement()) {
> +        // We don't want focused nodes changing scroll position when restoring from the cache
> +        // as it can cause ugly jumps before we manage to restore the cached position.
> +        page.mainFrame().selection().suppressScrolling();
> +        element->updateFocusAppearance(true);
> +        page.mainFrame().selection().restoreScrolling();
> +    }
> +#endif

The #if should be around the calls to suppress/restoreScrolling, not around the entire block.

[Daniel Bates]

Committed r160669: <http://trac.webkit.org/changeset/160669>