[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ossy at webkit.org
ossy at webkit.org
Mon Feb 21 00:35:04 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 9d0367eab3f2bfa03e2bfc95a6b1836ead7deaee
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 1 23:50:58 2011 +0000
Unreviewed Qt buildfix after r77286.
https://bugs.webkit.org/show_bug.cgi?id=53520
Remove the physical terminology from IntRect and FloatRect.
Source/WebCore:
* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::createTiles):
Source/WebKit/qt:
* WebCoreSupport/PopupMenuQt.cpp:
(WebCore::PopupMenuQt::show):
Source/WebKit2:
* UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp:
(WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77328 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index dc627f2..264e13c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-01 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed Qt buildfix after r77286.
+
+ https://bugs.webkit.org/show_bug.cgi?id=53520
+ Remove the physical terminology from IntRect and FloatRect.
+
+ * platform/graphics/TiledBackingStore.cpp:
+ (WebCore::TiledBackingStore::createTiles):
+
2011-02-01 Sam Weinig <sam at webkit.org>
Fix Mac production builds.
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index 3f33ed9..31dfcf1 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -229,7 +229,7 @@ void TiledBackingStore::createTiles()
Vector<Tile::Coordinate> tilesToCreate;
unsigned requiredTileCount = 0;
Tile::Coordinate topLeft = tileCoordinateForPoint(coverRect.location());
- Tile::Coordinate bottomRight = tileCoordinateForPoint(IntPoint(coverRect.maxX(), dirtyRect.maxY()));
+ Tile::Coordinate bottomRight = tileCoordinateForPoint(IntPoint(coverRect.maxX(), coverRect.maxY()));
for (unsigned yCoordinate = topLeft.y(); yCoordinate < bottomRight.y(); ++yCoordinate) {
for (unsigned xCoordinate = topLeft.x(); xCoordinate < bottomRight.x(); ++xCoordinate) {
Tile::Coordinate currentCoordinate(xCoordinate, yCoordinate);
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index a80eef1..1b56da9 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-01 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed Qt buildfix after r77286.
+
+ https://bugs.webkit.org/show_bug.cgi?id=53520
+ Remove the physical terminology from IntRect and FloatRect.
+
+ * WebCoreSupport/PopupMenuQt.cpp:
+ (WebCore::PopupMenuQt::show):
+
2011-01-31 No'am Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp b/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp
index 0c0f2d7..f7c4edc 100644
--- a/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp
@@ -109,7 +109,7 @@ void PopupMenuQt::show(const IntRect& rect, FrameView* view, int index)
if (QtFallbackWebPopup* fallback = qobject_cast<QtFallbackWebPopup*>(m_popup)) {
QRect geometry(rect);
- geometry.moveTopLeft(view->contentsToWindow(rect.topLeft()));
+ geometry.moveTopLeft(view->contentsToWindow(rect.location()));
fallback->setGeometry(geometry);
fallback->setFont(m_popupClient->menuStyle().font().font());
}
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index d54d600..63275b7 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-01 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed Qt buildfix after r77286.
+
+ https://bugs.webkit.org/show_bug.cgi?id=53520
+ Remove the physical terminology from IntRect and FloatRect.
+
+ * UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp:
+ (WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore):
+
2011-02-01 Anders Carlsson <andersca at apple.com>
Reviewed by Adam Roben.
diff --git a/Source/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp b/Source/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp
index e397ea5..c323fef 100644
--- a/Source/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp
@@ -74,7 +74,7 @@ void ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore(UpdateChunk*
const IntRect& updateChunkRect = updateChunk->rect();
QPainter painter(&m_backingStoreImage);
- painter.drawImage(updateChunkRect.topLeft(), image);
+ painter.drawImage(updateChunkRect.location(), image);
m_webView->update(QRect(updateChunkRect));
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list