diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-08-25 14:52:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-25 14:52:03 -0700 |
| commit | 240e47ec976648d0a0455123e7f1b57bfaa55f34 (patch) | |
| tree | 9cdc9acf1771730e14fd79798763bbf9afefd69f /WebKit | |
| parent | 2102c5461fd2f4b50d735db9759fbb8fb31a9b6f (diff) | |
| parent | 5c54c95ab6356ebcbf2ef44a299c3765d97eed6e (diff) | |
| download | external_webkit-240e47ec976648d0a0455123e7f1b57bfaa55f34.zip external_webkit-240e47ec976648d0a0455123e7f1b57bfaa55f34.tar.gz external_webkit-240e47ec976648d0a0455123e7f1b57bfaa55f34.tar.bz2 | |
Merge "Preserve the zoomFactor when a new frameview is created."
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 95673d7..d4f45a8 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -909,8 +909,12 @@ void FrameLoaderClientAndroid::transitionToCommittedForNewPage() { IntRect visBounds = oldWebFrameView->getVisibleBounds(); IntRect windowBounds = oldWebFrameView->getWindowBounds(); WebCore::FrameView* oldFrameView = oldWebFrameView->view(); + const float oldZoomFactor = oldFrameView->zoomFactor(); m_frame->createView(bounds.size(), oldFrameView->baseBackgroundColor(), oldFrameView->isTransparent(), oldFrameView->fixedLayoutSize(), oldFrameView->useFixedLayout()); + if (oldZoomFactor != 1.0f && oldZoomFactor != m_frame->view()->zoomFactor()) { + m_frame->view()->setZoomFactor(oldZoomFactor, ZoomTextOnly); + } // Create a new WebFrameView for the new FrameView WebFrameView* newFrameView = new WebFrameView(m_frame->view(), webViewCore); |