diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2012-11-30 17:57:39 +0000 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2012-11-30 20:17:57 +0100 |
| commit | 31d188b382c06fc3854cad94f37d25555d57f607 (patch) | |
| tree | 2c46ed296cd0999843214d0a95b479123a3395e6 /Source | |
| parent | 7c08cb76c584f60b2aa85b422d456176e00978ec (diff) | |
| download | qtwebkit-31d188b382c06fc3854cad94f37d25555d57f607.tar.gz | |
Introduce setTextSizeMultiplier in the page adapter as well.
As it turns out it the bots didn't like the previous attempt.
* WebCoreSupport/QWebFrameAdapter.cpp:
(QWebFrameAdapter::setTextSizeMultiplier):
* WebCoreSupport/QWebFrameAdapter.h:
* WidgetApi/qwebframe.cpp:
(QWebFrame::setTextSizeMultiplier):
Change-Id: If8c977b8134e88f3e5c3707ce7d19df8eb279304
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136252 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/qt/ChangeLog | 14 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h | 1 | ||||
| -rw-r--r-- | Source/WebKit/qt/WidgetApi/qwebframe.cpp | 4 |
4 files changed, 22 insertions, 3 deletions
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog index f83acac41..0b72250e8 100644 --- a/Source/WebKit/qt/ChangeLog +++ b/Source/WebKit/qt/ChangeLog @@ -1,5 +1,19 @@ 2012-11-30 Pierre Rossi <pierre.rossi@gmail.com> + [Qt] Introduce setTextSizeMultiplier in the page adapter as well. + + Rubber-stamped by Simon Hausmann. + + As it turns out it the bots didn't like the previous attempt. + + * WebCoreSupport/QWebFrameAdapter.cpp: + (QWebFrameAdapter::setTextSizeMultiplier): + * WebCoreSupport/QWebFrameAdapter.h: + * WidgetApi/qwebframe.cpp: + (QWebFrame::setTextSizeMultiplier): + +2012-11-30 Pierre Rossi <pierre.rossi@gmail.com> + [Qt] Unreviewed build fix. In the same vein as r136245. Include PlatformExportMacros proper. diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp index 119da1de4..7f55da362 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp @@ -328,6 +328,12 @@ void QWebFrameAdapter::setZoomFactor(qreal factor) frame->setPageZoomFactor(factor); } +void QWebFrameAdapter::setTextSizeMultiplier(qreal factor) +{ + pageAdapter->settings->setAttribute(QWebSettings::ZoomTextOnly, true); + frame->setPageAndTextZoomFactors(1, factor); +} + qreal QWebFrameAdapter::zoomFactor() const { return pageAdapter->settings->testAttribute(QWebSettings::ZoomTextOnly) ? frame->textZoomFactor() : frame->pageZoomFactor(); diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h index c3c78eadd..322e3ed88 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h +++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h @@ -205,6 +205,7 @@ public: QSize contentsSize() const; void setZoomFactor(qreal); + void setTextSizeMultiplier(qreal); qreal zoomFactor() const; void updateBackgroundRecursively(const QColor&); diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp index f07517f93..242edb1ea 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebframe.cpp @@ -29,7 +29,6 @@ #include "qwebscriptworld.h" #include "qwebscriptworld_p.h" #include "qwebsecurityorigin.h" -#include "qwebsettings.h" #include <QMultiMap> #include <qdebug.h> #include <qevent.h> @@ -672,8 +671,7 @@ void QWebFrame::render(QPainter* painter, const QRegion& clip) */ void QWebFrame::setTextSizeMultiplier(qreal factor) { - page()->settings()->setAttribute(QWebSettings::ZoomTextOnly, true); - d->setZoomFactor(factor); + d->setTextSizeMultiplier(factor); } /*! |