kenchris

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 0276cedc..764a578 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,24 @@
 2012-04-04  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 
+        [Qt] Further improvements of the tap gesture recognizer
+
+        Reviewed by NOBODY (OOPS!).

kenchris

 WEBKITOUTPUTDIR=/usr/local/Host/QtWebKit/ ~/swork/Qt5/webkit/Tools/Scripts/build-webkit --qt
Last built revision was unknown, now at revision 113833. Full incremental build needed.
Calling 'make incremental' in /usr/local/Host/QtWebKit/Release

make -f Makefile qmake && make -f Makefile
make[1]: Entering directory `/usr/local/Host/QtWebKit/Release'
cd Source/WTF/ && QMAKEPATH=/home/kenneth/swork/Qt5/webkit/Tools/qmake /home/kenneth/swork/Qt5/qt5/qtbase/bin/qmake /home/kenneth/swork/Qt5/webkit/Source/WTF/WTF.pro -o Makefile.WTF
cd Source/JavaScriptCore/ && QMAKEPATH=/home/kenneth/swork/Qt5/webkit/Tools/qmake /home/kenneth/swork/Qt5/qt5/qtbase/bin/qmake /home/kenneth/swork/Qt5/webkit/Source/JavaScriptCore/JavaScriptCore.pro -o Makefile.JavaScriptCore
cd Source/WebCore/ && QMAKEPATH=/home/kenneth/swork/Qt5/webkit/Tools/qmake /home/kenneth/swork/Qt5/qt5/qtbase/bin/qmake /home/kenneth/swork/Qt5/webkit/Source/WebCore/WebCore.pro -o Makefile.WebCore
cd Source/WebKit2/ && QMAKEPATH=/home/kenneth/swork/Qt5/webkit/Too

kenchris

DEBUG 1: Running project test: include(gcc-base.conf) [20]
DEBUG 1: Project Parser: include'ing file /home/kenneth/swork/Qt5/qt5/qtbase/mkspecs/common/gcc-base.conf.
DEBUG 1: Project Parser: /home/kenneth/swork/Qt5/qt5/qtbase/mkspecs/common/gcc-base.conf:34 :QMAKE_CFLAGS: :+=: (-pipe)
DEBUG 1: Project Parser: /home/kenneth/swork/Qt5/qt5/qtbase/mkspecs/common/gcc-base.conf:35 :QMAKE_CFLAGS_DEPS: :+=: (-M)
DEBUG 1: Project Parser: /home/kenneth/swork/Qt5/qt5/qtbase/mkspecs/common/gcc-base.conf:36 :QMAKE_CFLAGS_WARN_ON: :+=: (-Wall -W)
DEBUG 1: Project Parser: /home/kenneth/swork/Qt5/qt5/qtbase/mkspecs/common/gcc-base.conf:37 :QMAKE_CFLAGS_WARN_OFF: :+=: (-w)
DEBUG 1: Project Parser: /home/kenneth/swork/Qt5/qt5/qtbase/mkspecs/common/gcc-base.conf:38 :QMAKE_CFLAGS_RELEASE: :+=: (-O2)
DEBUG 1: Project Parser: /home/kenneth/swork/Qt5/qt5/qtbase/mkspecs/common/gcc-base.conf:39 :QMAKE_CFLAGS_DEBUG: :+=: (-g)
DEBUG 1: Project Parser: /home/kenneth/swork/Qt5/qt5/qtbase/mkspecs/common/gcc-base.conf:40 :QMAKE_CFLAGS_SHLI

kenchris

diff --git a/Source/WebCore/dom/ViewportArguments.cpp b/Source/WebCore/dom/ViewportArguments.cpp
index c131fcc..8600652 100644
--- a/Source/WebCore/dom/ViewportArguments.cpp
+++ b/Source/WebCore/dom/ViewportArguments.cpp
@@ -79,7 +79,7 @@ ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktop
         break;
     }
 
-    result.devicePixelRatio = float(deviceDPI / args.targetDensityDpi);
+    result.devicePixelRatio = float(deviceDPI / args.targetDensityDpi) * 1.5;

kenchris

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index 01f8da4..0d281de 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -624,18 +624,22 @@ void QQuickWebViewFlickablePrivate::didChangeViewportProperties(const WebCore::V
     WebCore::restrictMinimumScaleFactorToViewportSize(attr, viewportSize);
     WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(attr);
 
-    QtViewportInteractionEngine::Constraints newConstraints;
-    newConstraints.initialScale = attr.initialScale;

kenchris

In file included from ../../../../include/WebCore/ViewportArguments.h:1:0,
                 from /home/kenneth/swork/Qt5/webkit/Source/WebKit2/UIProcess/API/qt/qwebviewportinfo_p.h:31,
                 from ../../../../../include/QtWebKit/5.0.0/QtWebKit/private/qwebviewportinfo_p.h:1,
                 from /home/kenneth/swork/Qt5/webkit/Source/WebKit/qt/declarative/experimental/plugin.cpp:31:
/home/kenneth/swork/Qt5/webkit/Source/WebCore/dom/ViewportArguments.h:30:21: fatal error: IntSize.h: No such file or directory

kenchris

diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri
index 20d5452..add3143 100644
--- a/Source/WebKit/qt/declarative/experimental/experimental.pri
+++ b/Source/WebKit/qt/declarative/experimental/experimental.pri
@@ -35,7 +35,7 @@ SOURCES += plugin.cpp
 
 DEFINES += HAVE_WEBKIT2
 
-WEBKIT += wtf javascriptcore webkit2
+WEBKIT += wtf javascriptcore webkit2 webcore

kenchris

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index 04bb5c0..d5cd2f7 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -1159,6 +1159,10 @@ QQuickWebPage* QQuickWebViewExperimental::page()
     return q_ptr->page();
 }
 
+/*!
+   \qmlmethod WebView(Item parent)

kenchris

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 0d5c895..02f330e 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-03  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Document the QML WebViewExperimental API devicePixelRatio.
+
+        Reviewed by NOBODY (OOPS!).

kenchris

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index 4c68b4a..2527048 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -49,9 +49,11 @@
 #include "qwebviewportinfo_p.h"
 
 #include <JavaScriptCore/InitializeThreading.h>
+#include <JavaScriptCore/JSBase.h>
 #include <QDateTime>