[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
luiz at webkit.org
luiz at webkit.org
Mon Feb 21 00:38:57 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit ec79107c9adac12da3006d7627bda6e0914c6bc2
Author: luiz at webkit.org <luiz at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 2 19:40:44 2011 +0000
2011-02-02 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by David Hyatt.
More conversion from right()/bottom() to maxX()/maxY().
* page/qt/FrameQt.cpp:
(WebCore::Frame::dragImageForSelection):
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::GraphicsContext::roundToDevicePixels):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77393 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 410eeeb..f91f457 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-02 Luiz Agostini <luiz.agostini at openbossa.org>
+
+ Reviewed by David Hyatt.
+
+ More conversion from right()/bottom() to maxX()/maxY().
+
+ * page/qt/FrameQt.cpp:
+ (WebCore::Frame::dragImageForSelection):
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::GraphicsContext::roundToDevicePixels):
+
2011-02-02 Kevin Ollivier <kevino at theolliviers.com>
[wx] Build fixes for wxWebKit.
diff --git a/Source/WebCore/page/qt/FrameQt.cpp b/Source/WebCore/page/qt/FrameQt.cpp
index bb577e0..4d1dd1d 100644
--- a/Source/WebCore/page/qt/FrameQt.cpp
+++ b/Source/WebCore/page/qt/FrameQt.cpp
@@ -52,7 +52,7 @@ DragImageRef Frame::dragImageForSelection()
GraphicsContext* context = buffer->context();
context->translate(-paintingRect.x(), -paintingRect.y());
- context->clip(FloatRect(0, 0, paintingRect.right(), paintingRect.bottom()));
+ context->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
PaintBehavior previousPaintBehavior = m_view->paintBehavior();
m_view->setPaintBehavior(PaintBehaviorSelectionOnly);
diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index c21c43d..a295602 100644
--- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -893,7 +893,7 @@ FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& frect)
qreal deviceScaleY = sqrtf(deviceTransform.m21() * deviceTransform.m21() + deviceTransform.m22() * deviceTransform.m22());
QPoint deviceOrigin(frect.x() * deviceScaleX, frect.y() * deviceScaleY);
- QPoint deviceLowerRight(frect.right() * deviceScaleX, frect.bottom() * deviceScaleY);
+ QPoint deviceLowerRight(frect.maxX() * deviceScaleX, frect.maxY() * deviceScaleY);
// Don't let the height or width round to 0 unless either was originally 0
if (deviceOrigin.y() == deviceLowerRight.y() && frect.height())
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list