Skip to content

Instantly share code, notes, and snippets.

View kenchris's full-sized avatar
🏠
Working from home

Kenneth Rohde Christiansen kenchris

🏠
Working from home
  • Intel Corporation
  • Denmark
View GitHub Profile
commit af0f90e234d61a1ad777c53763392ac56d19af7d
Author: Kenneth Rohde Christiansen <kenneth@webkit.org>
Date: Tue Jan 31 11:09:29 2012 +0100
temp
diff --git a/ManualTests/qt/tap-highlighting-inlines.html b/ManualTests/qt/tap-highlighting-inlines.html
index c483952..0c64a3e 100644
--- a/ManualTests/qt/tap-highlighting-inlines.html
+++ b/ManualTests/qt/tap-highlighting-inlines.html
diff --git a/ManualTests/qt/tap-highlighting-images.html b/ManualTests/qt/tap-highlighting-images.html
index bbeea1a..a5e2bf8 100644
--- a/ManualTests/qt/tap-highlighting-images.html
+++ b/ManualTests/qt/tap-highlighting-images.html
@@ -1,6 +1,6 @@
<body style="background-color: green">
<p>Two anchors, one around a pure image, the other around an image embedded in a div.</p>
- <a href=""><img src="../resources/apple.jpg"></a>
- <a href=""><div style="background-color: blue;"><img style="display: block; margin-left: auto; margin-right: auto;" src="../resources/apple.jpg"></div></a>
diff --git a/ManualTests/qt/tap-highlighting-images.html b/ManualTests/qt/tap-highlighting-images.html
index bbeea1a..a5e2bf8 100644
--- a/ManualTests/qt/tap-highlighting-images.html
+++ b/ManualTests/qt/tap-highlighting-images.html
@@ -1,6 +1,6 @@
<body style="background-color: green">
<p>Two anchors, one around a pure image, the other around an image embedded in a div.</p>
- <a href=""><img src="../resources/apple.jpg"></a>
- <a href=""><div style="background-color: blue;"><img style="display: block; margin-left: auto; margin-right: auto;" src="../resources/apple.jpg"></div></a>
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index ceb489e..7f29813 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -25,10 +25,11 @@
#include "GraphicsContext.h"
#include "TiledBackingStoreClient.h"
+#include <QtDebug>
+
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index 3b4b29c..8a0ce1b 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -68,12 +68,15 @@ void TiledBackingStore::setTileCreationDelay(double delay)
m_tileCreationDelay = delay;
}
-void TiledBackingStore::setVisibleRectTrajectoryVector(const FloatPoint& vector)
+void TiledBackingStore::coverWithTilesIfNeeded(const FloatPoint& panningTrajectoryVector)
commit 5e0d8a12f9cc2241f02dcda02f72e65335369df3
Author: Kenneth Rohde Christiansen <kenneth@webkit.org>
Date: Wed Feb 22 13:59:54 2012 +0100
Tiling WIP
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index 3b4b29c..8a0ce1b 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ba12346..328cf58 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-22 Kenneth Rohde Christiansen <kenneth@webkit.org>
+
+ Improve comments in tiling code
+
+ Rubberstamped by NOBODY (OOPS!).
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index 42e1b48..1b090dc 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -468,7 +468,7 @@ void QQuickWebViewLegacyPrivate::updateViewportSize()
// The fixed layout is handled by the FrameView and the drawing area doesn't behave differently
// whether its fixed or not. We still need to tell the drawing area which part of it
// has to be rendered on tiles, and in desktop mode it's all of it.
- webPageProxy->drawingArea()->setVisibleContentsRectAndScale(IntRect(IntPoint(), viewportSize), 1);
+ webPageProxy->drawingArea()->setVisibleContentsRectForScaling(IntRect(IntPoint(), viewportSize), 1);
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 96df3db..2be3516 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,54 @@
2012-02-23 Kenneth Rohde Christiansen <kenneth@webkit.org>
+ [Qt] Tiling: Improve the method names dealing with moving and scaling.
+
+ Rubberstamped by NOBODY (OOPS!).
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index 8f7052c..4d0fdf9 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -82,11 +82,11 @@ void TiledBackingStore::coverWithTilesIfNeeded(const FloatPoint& panningTrajecto
void TiledBackingStore::invalidate(const IntRect& contentsDirtyRect)
{
- IntRect dirtyRect(mapFromContents(contentsDirtyRect));
-