-
darin@apple.com authored
Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::createPlugin): * src/WebViewImpl.cpp: (WebKit::WebViewImpl::setZoomLevel): Call functions on Frame instead of FrameView. 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * Api/qwebframe.cpp: (QWebFrame::setTextSizeMultiplier): (QWebFrame::textSizeMultiplier): (QWebFrame::setZoomFactor): (QWebFrame::zoomFactor): Call functions on Frame instead of FrameView. 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * webkit/webkitwebview.cpp: (webkit_web_view_get_zoom_level): (webkit_web_view_apply_zoom_level): (webkit_web_view_set_full_content_zoom): Call functions on Frame instead of FrameView. 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * WebView.cpp: (WebView::setZoomMultiplier): Call functions on Frame instead of FrameView. 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * WebFrame.cpp: (wxWebFrame::IncreaseTextSize): (wxWebFrame::DecreaseTextSize): (wxWebFrame::ResetTextSize): Call functions on Frame instead of FrameView. 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * WebView/WebView.mm: (-[WebView _setZoomMultiplier:isTextOnly:]): Call functions on Frame instead of FrameView. 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * ewk/ewk_frame.cpp: (ewk_frame_zoom_get): (ewk_frame_zoom_set): (ewk_frame_zoom_text_only_set): Call functions on Frame instead of FrameView. 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 Moved zoom level back from FrameView to Frame. I had forgotten that FrameView's lifetime is much shorter than Frame's, and until that is fixed it's best to leave this on Frame. * WebCore.exp.in: Updated. * css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::styleForDocument): (WebCore::CSSStyleSelector::applyProperty): (WebCore::CSSStyleSelector::getComputedSizeFromSpecifiedSize): * dom/Document.cpp: (WebCore::Document::nodesFromRect): (WebCore::Document::elementFromPoint): (WebCore::Document::caretRangeFromPoint): * dom/MouseRelatedEvent.cpp: (WebCore::contentsX): (WebCore::contentsY): (WebCore::pageZoomFactor): * dom/Node.cpp: (WebCore::Node::dispatchMouseEvent): (WebCore::Node::dispatchWheelEvent): * html/HTMLBodyElement.cpp: (WebCore::adjustForZoom): (WebCore::HTMLBodyElement::scrollLeft): (WebCore::HTMLBodyElement::setScrollLeft): (WebCore::HTMLBodyElement::scrollTop): (WebCore::HTMLBodyElement::setScrollTop): (WebCore::HTMLBodyElement::scrollHeight): (WebCore::HTMLBodyElement::scrollWidth): * html/ImageDocument.cpp: (WebCore::pageZoomFactor): (WebCore::ImageDocument::scale): (WebCore::ImageDocument::imageFitsInWindow): * page/DOMWindow.cpp: (WebCore::DOMWindow::innerHeight): (WebCore::DOMWindow::innerWidth): (WebCore::DOMWindow::scrollX): (WebCore::DOMWindow::scrollY): (WebCore::DOMWindow::scrollTo): * page/DragController.cpp: (WebCore::elementUnderMouse): * rendering/RenderView.cpp: (WebCore::RenderView::zoomFactor): * svg/SVGSVGElement.cpp: (WebCore::SVGSVGElement::currentScale): (WebCore::SVGSVGElement::setCurrentScale): Get zoom factor from Frame rather than FrameView. * page/Frame.cpp: (WebCore::parentPageZoomFactor): Moved back here from FrameView. (WebCore::parentTextZoomFactor): Ditto. (WebCore::Frame::Frame): Ditto. (WebCore::Frame::setPageZoomFactor): Ditto. (WebCore::Frame::setTextZoomFactor): Ditto. (WebCore::Frame::setPageAndTextZoomFactors): Ditto. * page/Frame.h: Moved functions and data for zooming back here from FrameView. * page/FrameView.cpp: (WebCore::FrameView::FrameView): * page/FrameView.h: Removed code from here. 2010-09-17 Daniel Bates <dbates@rim.com> Reviewed by Darin Adler. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * fast/css/preserve-user-specified-zoom-level-on-reload.html: Added. * platform/mac/fast/css/preserve-user-specified-zoom-level-on-reload-expected.checksum: Added. * platform/mac/fast/css/preserve-user-specified-zoom-level-on-reload-expected.png: Added. * platform/mac/fast/css/preserve-user-specified-zoom-level-on-reload-expected.txt: Added. 2010-09-17 Darin Adler <darin@apple.com> Reviewed by Sam Weinig. REGRESSION (r60104): Zoom level is unexpectedly reset on page reload https://bugs.webkit.org/show_bug.cgi?id=42863 * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::textZoomFactor): (WebKit::WebPage::setTextZoomFactor): (WebKit::WebPage::pageZoomFactor): (WebKit::WebPage::setPageZoomFactor): (WebKit::WebPage::setPageAndTextZoomFactors): Call functions on Frame instead of FrameView. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67762 268f45cc-cd09-0410-ab3c-d52691b4dbfc
0f442a78