diff options
| author | Grace Kloba <> | 2009-04-06 10:47:25 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-06 10:47:25 -0700 |
| commit | f7d36a7e44a7cd902f83bfc42d9da0f48d2be264 (patch) | |
| tree | f91c442bf05b26d1841e8e98b42120ee2a8930fc /WebCore/loader | |
| parent | 44d3a81ac387ca3c1ebbad279e3b31d7ac961398 (diff) | |
| download | external_webkit-f7d36a7e44a7cd902f83bfc42d9da0f48d2be264.zip external_webkit-f7d36a7e44a7cd902f83bfc42d9da0f48d2be264.tar.gz external_webkit-f7d36a7e44a7cd902f83bfc42d9da0f48d2be264.tar.bz2 | |
AI 144661: Fix #175030. Preserve the zoom factor during refresh. Remove the code change in FrameLoader.cpp which was to preserve the zoom factor when we first did layout. Now we only use the initialZoomScale if it is a standard load. If it is history load, restoreScale() should be called before didFirstLayout(), in the other cases, like reload, refresh, replace, we don't change the zoom factor.
BUG=175030
Automated import of CL 144661
Diffstat (limited to 'WebCore/loader')
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 151ab37..edcdbf0 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -3492,13 +3492,7 @@ void FrameLoader::continueLoadAfterWillSubmitForm(PolicyAction) void FrameLoader::didFirstLayout() { if (Page* page = m_frame->page()) -#ifdef ANDROID_HISTORY_CLIENT - // this should match the logic in FrameStateCommittedPage, so that we - // can restore the scroll position and view state as early as possible - if ((isBackForwardLoadType(m_loadType) || m_loadType == FrameLoadTypeReload) && page->backForwardList()) -#else if (isBackForwardLoadType(m_loadType) && page->backForwardList()) -#endif restoreScrollPositionAndViewState(); m_firstLayoutDone = true; |