diff options
| author | Steve Block <steveblock@google.com> | 2010-09-22 14:53:38 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 18:32:25 +0100 |
| commit | a0e12fbb7d3eec607b7988fb8ff873305583acc4 (patch) | |
| tree | 6ba32d9663d913e32b6565a878300b880defdad2 /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | |
| parent | aafdd7e990ceb671441a0799ee1b1c2776de95f8 (diff) | |
| download | external_webkit-a0e12fbb7d3eec607b7988fb8ff873305583acc4.zip external_webkit-a0e12fbb7d3eec607b7988fb8ff873305583acc4.tar.gz external_webkit-a0e12fbb7d3eec607b7988fb8ff873305583acc4.tar.bz2 | |
Merge WebKit at r67908: FrameView zoom methods renamed and moved
See http://trac.webkit.org/changeset/67274 and
http://trac.webkit.org/changeset/67762
Change-Id: I3842c599327b564550a2f76ae4ae3628f70a7aff
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index fa96d40..997c421 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -905,11 +905,11 @@ void FrameLoaderClientAndroid::transitionToCommittedForNewPage() { IntRect visBounds = oldWebFrameView->getVisibleBounds(); IntRect windowBounds = oldWebFrameView->getWindowBounds(); WebCore::FrameView* oldFrameView = oldWebFrameView->view(); - const float oldZoomFactor = oldFrameView->zoomFactor(); + const float oldZoomFactor = oldFrameView->frame()->textZoomFactor(); 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); + if (oldZoomFactor != 1.0f && oldZoomFactor != m_frame->textZoomFactor()) { + m_frame->setTextZoomFactor(oldZoomFactor); } // Create a new WebFrameView for the new FrameView |