Title: [136237] trunk/Source/WebKit/qt
- Revision
- 136237
- Author
- pierre.ro...@gmail.com
- Date
- 2012-11-30 07:17:17 -0800 (Fri, 30 Nov 2012)
Log Message
[Qt] Fix zoomIn/zoomOut related regression.
Reviewed by Simon Hausmann.
Following r136235, fix a case of refactoring gone wrong.
Implementing setTextSizeMultiplier in terms of
setZoomFactor, and not the other way around.
* WebCoreSupport/QWebFrameAdapter.cpp:
(QWebFrameAdapter::setZoomFactor):
* WidgetApi/qwebframe.cpp:
(QWebFrame::setTextSizeMultiplier):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (136236 => 136237)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-30 15:09:38 UTC (rev 136236)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-30 15:17:17 UTC (rev 136237)
@@ -1,3 +1,18 @@
+2012-11-30 Pierre Rossi <pierre.ro...@gmail.com>
+
+ [Qt] Fix zoomIn/zoomOut related regression.
+
+ Reviewed by Simon Hausmann.
+
+ Following r136235, fix a case of refactoring gone wrong.
+ Implementing setTextSizeMultiplier in terms of
+ setZoomFactor, and not the other way around.
+
+ * WebCoreSupport/QWebFrameAdapter.cpp:
+ (QWebFrameAdapter::setZoomFactor):
+ * WidgetApi/qwebframe.cpp:
+ (QWebFrame::setTextSizeMultiplier):
+
2012-11-30 Simon Hausmann <simon.hausm...@digia.com>, Pierre Rossi <pierre.ro...@digia.com>
[Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp (136236 => 136237)
--- trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2012-11-30 15:09:38 UTC (rev 136236)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2012-11-30 15:17:17 UTC (rev 136237)
@@ -322,8 +322,10 @@
void QWebFrameAdapter::setZoomFactor(qreal factor)
{
- pageAdapter->settings->setAttribute(QWebSettings::ZoomTextOnly, true);
- frame->setPageAndTextZoomFactors(1, factor);
+ if (pageAdapter->settings->testAttribute(QWebSettings::ZoomTextOnly))
+ frame->setTextZoomFactor(factor);
+ else
+ frame->setPageZoomFactor(factor);
}
qreal QWebFrameAdapter::zoomFactor() const
Modified: trunk/Source/WebKit/qt/WidgetApi/qwebframe.cpp (136236 => 136237)
--- trunk/Source/WebKit/qt/WidgetApi/qwebframe.cpp 2012-11-30 15:09:38 UTC (rev 136236)
+++ trunk/Source/WebKit/qt/WidgetApi/qwebframe.cpp 2012-11-30 15:17:17 UTC (rev 136237)
@@ -29,6 +29,7 @@
#include "qwebscriptworld.h"
#include "qwebscriptworld_p.h"
#include "qwebsecurityorigin.h"
+#include "qwebsettings.h"
#include <QMultiMap>
#include <qdebug.h>
#include <qevent.h>
@@ -671,6 +672,7 @@
*/
void QWebFrame::setTextSizeMultiplier(qreal factor)
{
+ page()->settings()->setAttribute(QWebSettings::ZoomTextOnly, true);
d->setZoomFactor(factor);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
