Title: [136252] trunk/Source/WebKit/qt
- Revision
- 136252
- Author
- [email protected]
- Date
- 2012-11-30 09:57:39 -0800 (Fri, 30 Nov 2012)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (136251 => 136252)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-30 17:57:18 UTC (rev 136251)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-30 17:57:39 UTC (rev 136252)
@@ -1,5 +1,19 @@
2012-11-30 Pierre Rossi <[email protected]>
+ [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 <[email protected]>
+
[Qt] Unreviewed build fix.
In the same vein as r136245. Include PlatformExportMacros proper.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp (136251 => 136252)
--- trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2012-11-30 17:57:18 UTC (rev 136251)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2012-11-30 17:57:39 UTC (rev 136252)
@@ -328,6 +328,12 @@
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();
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h (136251 => 136252)
--- trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h 2012-11-30 17:57:18 UTC (rev 136251)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h 2012-11-30 17:57:39 UTC (rev 136252)
@@ -205,6 +205,7 @@
QSize contentsSize() const;
void setZoomFactor(qreal);
+ void setTextSizeMultiplier(qreal);
qreal zoomFactor() const;
void updateBackgroundRecursively(const QColor&);
Modified: trunk/Source/WebKit/qt/WidgetApi/qwebframe.cpp (136251 => 136252)
--- trunk/Source/WebKit/qt/WidgetApi/qwebframe.cpp 2012-11-30 17:57:18 UTC (rev 136251)
+++ trunk/Source/WebKit/qt/WidgetApi/qwebframe.cpp 2012-11-30 17:57:39 UTC (rev 136252)
@@ -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::setTextSizeMultiplier(qreal factor)
{
- page()->settings()->setAttribute(QWebSettings::ZoomTextOnly, true);
- d->setZoomFactor(factor);
+ d->setTextSizeMultiplier(factor);
}
/*!
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
