[webkit-changes] [151208] trunk/Tools

[abecsi]

Title: [151208] trunk/Tools








Revision 151208
Author abe...@webkit.org
Date 2013-06-05 04:08:01 -0700 (Wed, 05 Jun 2013)


Log Message
[Qt][WK2] Fix layout testing with Qt 5.1
https://bugs.webkit.org/show_bug.cgi?id=117203

Reviewed by Jocelyn Turcotte.

With Qt 5.1 synchronous requests via QNetworkAccessManager do not
go into loading state but directly call handler functions for
finished state instead of relying on a connection.
Our wrapper QQuickView uses a data URI scheme to create the root
item for testing which results in a synchronous request when loading
the QML data, therefore the state of the QQuickWindow immediately
becomes Ready.
Since the final initialization of the root item depended on the
emission of QQuickView::statusChanged(QQuickView::Ready) we ended
up with a partially initialized wrapper window, thus most of our
layout tests were failing.
For compatibility with pre-5.1 Qt versions keep the old behaviour
in case the WrapperWindow is not ready in the constructor yet.

* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
(WTR::WrapperWindow::WrapperWindow):
* TestWebKitAPI/qt/PlatformWebViewQt.cpp:
(TestWebKitAPI::WrapperWindow::WrapperWindow):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp
trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp




Diff

Modified: trunk/Tools/ChangeLog (151207 => 151208)

--- trunk/Tools/ChangeLog	2013-06-05 10:46:31 UTC (rev 151207)
+++ trunk/Tools/ChangeLog	2013-06-05 11:08:01 UTC (rev 151208)
@@ -1,3 +1,29 @@
+2013-06-05  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fix layout testing with Qt 5.1
+https://bugs.webkit.org/show_bug.cgi?id=117203
+
+Reviewed by Jocelyn Turcotte.
+
+With Qt 5.1 synchronous requests via QNetworkAccessManager do not
+go into loading state but directly call handler functions for
+finished state instead of relying on a connection.
+Our wrapper QQuickView uses a data URI scheme to create the root
+item for testing which results in a synchronous request when loading
+the QML data, therefore the state of the QQuickWindow immediately
+becomes Ready.
+Since the final initialization of the root item depended on the
+emission of QQuickView::statusChanged(QQuickView::Ready) we ended
+up with a partially initialized wrapper window, thus most of our
+layout tests were failing.
+For compatibility with pre-5.1 Qt versions keep the old behaviour
+in case the WrapperWindow is not ready in the constructor yet.
+
+* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+(WTR::WrapperWindow::WrapperWindow):
+* TestWebKitAPI/qt/PlatformWebViewQt.cpp:
+(TestWebKitAPI::WrapperWindow::WrapperWindow):
+
 2013-06-05  Dariusz Frankiewicz  d.frankie...@samsung.com
 
 Bad value in tests counter at new-run-webkit-tests


Modified: trunk/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp (151207 => 151208)

--- trunk/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp	2013-06-05 10:46:31 UTC (rev 151207)
+++ trunk/Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp	2013-06-05 11:08:01 UTC (rev 151208)
@@ -48,7 +48,10 @@
 : QQuickView(QUrl(QStringLiteral(data:text/plain,import QtQuick 2.0\nItem { objectName: 'root' })))
 , m_view(view)
 {
-connect(this, SIGNAL(statusChanged(QQuickView::Status)), SLOT(handleStatusChanged(QQuickView::Status)));
+if (status() == QQuickView::Ready)
+handleStatusChanged(QQuickView::Ready);
+else
+connect(this, SIGNAL(statusChanged(QQuickView::Status)), SLOT(handleStatusChanged(QQuickView::Status)));
 }
 
 private Q_SLOTS:


Modified: trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (151207 => 151208)

--- trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp	2013-06-05 10:46:31 UTC (rev 151207)
+++ trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp	2013-06-05 11:08:01 UTC (rev 151208)
@@ -47,7 +47,10 @@
 : QQuickView(QUrl(data:text/plain,import QtQuick 2.0\nItem { objectName: 'root' }))
 , m_view(view)
 {
-connect(this, SIGNAL(statusChanged(QQuickView::Status)), SLOT(handleStatusChanged(QQuickView::Status)));
+if (status() == QQuickView::Ready)
+handleStatusChanged(QQuickView::Ready);
+else
+connect(this, SIGNAL(statusChanged(QQuickView::Status)), SLOT(handleStatusChanged(QQuickView::Status)));
 }
 
 private Q_SLOTS:






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [150178] trunk/Source/WebKit2

[abecsi]

Title: [150178] trunk/Source/WebKit2








Revision 150178
Author abe...@webkit.org
Date 2013-05-16 01:46:12 -0700 (Thu, 16 May 2013)


Log Message
[WK2] PluginInformation.cpp fails to build because of missing ENABLE(NETSCAPE_PLUGIN_API) guard
https://bugs.webkit.org/show_bug.cgi?id=116018

Rubber-stamped by Jocelyn Turcotte.

* Shared/Plugins/Netscape/PluginInformation.cpp:
(WebKit::getPluginModuleInformation):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (150177 => 150178)

--- trunk/Source/WebKit2/ChangeLog	2013-05-16 05:56:10 UTC (rev 150177)
+++ trunk/Source/WebKit2/ChangeLog	2013-05-16 08:46:12 UTC (rev 150178)
@@ -1,3 +1,13 @@
+2013-05-16  Andras Becsi  andras.be...@digia.com
+
+[WK2] PluginInformation.cpp fails to build because of missing ENABLE(NETSCAPE_PLUGIN_API) guard
+https://bugs.webkit.org/show_bug.cgi?id=116018
+
+Rubber-stamped by Jocelyn Turcotte.
+
+* Shared/Plugins/Netscape/PluginInformation.cpp:
+(WebKit::getPluginModuleInformation):
+
 2013-05-15  Simon Cooper  scoo...@apple.com
 
 Enable printing in plugins


Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp (150177 => 150178)

--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp	2013-05-16 05:56:10 UTC (rev 150177)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp	2013-05-16 08:46:12 UTC (rev 150178)
@@ -98,11 +98,13 @@
 
 void getPluginModuleInformation(const PluginModuleInfo plugin, ImmutableDictionary::MapType map)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
 map.set(pluginInformationPathKey(), WebString::create(plugin.path));
 map.set(pluginInformationDisplayNameKey(), WebString::create(plugin.info.name));
 map.set(pluginInformationDefaultLoadPolicyKey(), WebUInt64::create(toWKPluginLoadPolicy(PluginInfoStore::policyForPlugin(plugin;
 
 getPlatformPluginModuleInformation(plugin, map);
+#endif
 }
 
 PassRefPtrImmutableDictionary createPluginInformationDictionary(const PluginModuleInfo plugin)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [149726] trunk/Tools

[abecsi]

Title: [149726] trunk/Tools








Revision 149726
Author abe...@webkit.org
Date 2013-05-08 02:50:02 -0700 (Wed, 08 May 2013)


Log Message
[Qt] Build fails with clang
https://bugs.webkit.org/show_bug.cgi?id=115741

Reviewed by Benjamin Poulain.

Since r149112 std::move is used in AtomicString for compilers that
support rvalue references and this requires a standard library
implementing c++11 move semantics.
We only explicitely require c++11 for WebKit2, but since clang supports
rvalue references the build of subtargets using AtomicString fails because
of missing std::move.
It is safe to add CONFIG += c++11 for the whole project when using clang
since we explicitely disable c++11 for ANGLE that had probems with libc++.

* qmake/mkspecs/features/unix/default_pre.prf:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf




Diff

Modified: trunk/Tools/ChangeLog (149725 => 149726)

--- trunk/Tools/ChangeLog	2013-05-08 09:41:11 UTC (rev 149725)
+++ trunk/Tools/ChangeLog	2013-05-08 09:50:02 UTC (rev 149726)
@@ -1,3 +1,21 @@
+2013-05-08  Andras Becsi  andras.be...@digia.com
+
+[Qt] Build fails with clang
+https://bugs.webkit.org/show_bug.cgi?id=115741
+
+Reviewed by Benjamin Poulain.
+
+Since r149112 std::move is used in AtomicString for compilers that
+support rvalue references and this requires a standard library
+implementing c++11 move semantics.
+We only explicitely require c++11 for WebKit2, but since clang supports
+rvalue references the build of subtargets using AtomicString fails because
+of missing std::move.
+It is safe to add CONFIG += c++11 for the whole project when using clang
+since we explicitely disable c++11 for ANGLE that had probems with libc++.
+
+* qmake/mkspecs/features/unix/default_pre.prf:
+
 2013-05-08  Darin Adler  da...@apple.com
 
 Fix one more place that needed to use adoptCF/NS


Modified: trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf (149725 => 149726)

--- trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf	2013-05-08 09:41:11 UTC (rev 149725)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf	2013-05-08 09:50:02 UTC (rev 149726)
@@ -18,5 +18,6 @@
 
 # Reduce linking memory pressure on 32-bit debug builds on Linux
 linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386): CONFIG += use_all_in_one_files
+*clang: CONFIG += c++11
 
 load(default_pre)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [149731] trunk/Tools

[abecsi]

Title: [149731] trunk/Tools








Revision 149731
Author abe...@webkit.org
Date 2013-05-08 05:20:59 -0700 (Wed, 08 May 2013)


Log Message
[Qt][WTR] Fix the build on Mac after r149692

Unreviewed build fix.

* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::dumpDOMAsWebArchive):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp




Diff

Modified: trunk/Tools/ChangeLog (149730 => 149731)

--- trunk/Tools/ChangeLog	2013-05-08 11:54:16 UTC (rev 149730)
+++ trunk/Tools/ChangeLog	2013-05-08 12:20:59 UTC (rev 149731)
@@ -1,3 +1,12 @@
+2013-05-08  Andras Becsi  andras.be...@digia.com
+
+[Qt][WTR] Fix the build on Mac after r149692
+
+Unreviewed build fix.
+
+* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+(WTR::InjectedBundlePage::dumpDOMAsWebArchive):
+
 2013-05-08  Mario Sanchez Prada  mario.pr...@samsung.com
 
 Unreviewed. Added Anton Obzhirov to the list of contributors and myself


Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (149730 => 149731)

--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2013-05-08 11:54:16 UTC (rev 149730)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2013-05-08 12:20:59 UTC (rev 149731)
@@ -48,7 +48,7 @@
 #include wtf/text/CString.h
 #include wtf/text/StringBuilder.h
 
-#if USE(CF)
+#if USE(CF)  !PLATFORM(QT)
 #include WebArchiveDumpSupport.h
 #endif
 
@@ -844,7 +844,7 @@
 
 void InjectedBundlePage::dumpDOMAsWebArchive(WKBundleFrameRef frame, StringBuilder stringBuilder)
 {
-#if USE(CF)
+#if USE(CF)  !PLATFORM(QT)
 WKRetainPtrWKDataRef wkData = adoptWK(WKBundleFrameCopyWebArchive(frame));
 RetainPtrCFDataRef cfData = adoptCF(CFDataCreate(0, WKDataGetBytes(wkData.get()), WKDataGetSize(wkData.get(;
 RetainPtrCFStringRef cfString = adoptCF(createXMLStringFromWebArchiveData(cfData.get()));






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [149667] trunk/Tools

[abecsi]

Title: [149667] trunk/Tools








Revision 149667
Author abe...@webkit.org
Date 2013-05-07 04:01:55 -0700 (Tue, 07 May 2013)


Log Message
[Qt][WTR] QQuickWindowPrivate::setRenderWithoutShowing has been removed from Qt 5
https://bugs.webkit.org/show_bug.cgi?id=114808

Reviewed by Jocelyn Turcotte.

QQuickWindow::grabWindow() has been implemented for isVisible=false for Qt 5.1.
(https://codereview.qt-project.org/#change,54234)

* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
(WTR::WrapperWindow::handleStatusChanged):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp




Diff

Modified: trunk/Tools/ChangeLog (149666 => 149667)

--- trunk/Tools/ChangeLog	2013-05-07 07:42:15 UTC (rev 149666)
+++ trunk/Tools/ChangeLog	2013-05-07 11:01:55 UTC (rev 149667)
@@ -1,3 +1,16 @@
+2013-05-07  Andras Becsi  andras.be...@digia.com
+
+[Qt][WTR] QQuickWindowPrivate::setRenderWithoutShowing has been removed from Qt 5
+https://bugs.webkit.org/show_bug.cgi?id=114808
+
+Reviewed by Jocelyn Turcotte.
+
+QQuickWindow::grabWindow() has been implemented for isVisible=false for Qt 5.1.
+(https://codereview.qt-project.org/#change,54234)
+
+* WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+(WTR::WrapperWindow::handleStatusChanged):
+
 2013-05-06  Christophe Dumez  ch.du...@sisa.samsung.com
 
 Unreviewed. Add my email to EFL and BindingsScripts watchlists.


Modified: trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (149666 => 149667)

--- trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp	2013-05-07 07:42:15 UTC (rev 149666)
+++ trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp	2013-05-07 11:01:55 UTC (rev 149667)
@@ -65,7 +65,9 @@
 if (PlatformWebView::windowShapshotEnabled()) {
 setSurfaceType(OpenGLSurface);
 create();
+#if QT_VERSION  QT_VERSION_CHECK(5, 1, 0)
 QQuickWindowPrivate::get(this)-setRenderWithoutShowing(true);
+#endif
 } else
 m_view-experimental()-setRenderToOffscreenBuffer(true);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [149622] trunk/Source/JavaScriptCore

[abecsi]

Title: [149622] trunk/Source/_javascript_Core








Revision 149622
Author abe...@webkit.org
Date 2013-05-06 11:49:10 -0700 (Mon, 06 May 2013)


Log Message
Build with GCC 4.8 fails because of -Wmaybe-uninitialized
https://bugs.webkit.org/show_bug.cgi?id=115648

Reviewed by Michael Saboff.

Initialize values in Options::setOption since from
there we end up calling OptionRange::init with
uninitialized members.

* runtime/Options.cpp:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/Options.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (149621 => 149622)

--- trunk/Source/_javascript_Core/ChangeLog	2013-05-06 18:46:55 UTC (rev 149621)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-05-06 18:49:10 UTC (rev 149622)
@@ -1,3 +1,16 @@
+2013-05-06  Andras Becsi  andras.be...@digia.com
+
+Build with GCC 4.8 fails because of -Wmaybe-uninitialized
+https://bugs.webkit.org/show_bug.cgi?id=115648
+
+Reviewed by Michael Saboff.
+
+Initialize values in Options::setOption since from
+there we end up calling OptionRange::init with
+uninitialized members.
+
+* runtime/Options.cpp:
+
 2013-05-06  Gabor Rapcsanyi  rga...@webkit.org
 
 JSC ARM traditional failing on Octane NavierStokes test


Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (149621 => 149622)

--- trunk/Source/_javascript_Core/runtime/Options.cpp	2013-05-06 18:46:55 UTC (rev 149621)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp	2013-05-06 18:49:10 UTC (rev 149622)
@@ -245,6 +245,7 @@
 #define FOR_EACH_OPTION(type_, name_, defaultValue_)\
 if (!strncmp(arg, #name_, equalStr - arg)) {\
 type_ value;\
+value = 0;  \
 bool success = parse(valueStr, value);  \
 if (success) {  \
 name_() = value;\






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [148789] trunk

[abecsi]

Title: [148789] trunk








Revision 148789
Author abe...@webkit.org
Date 2013-04-20 02:53:06 -0700 (Sat, 20 Apr 2013)


Log Message
[Qt][Mac] Remove obsolete workaround for debug builds
https://bugs.webkit.org/show_bug.cgi?id=114750

Reviewed by Jocelyn Turcotte.

This workaround made default builds fail with recent Qt5 because
it removed the major version number from the library name, producing
QtWebKitWidgets, whereas the linking command line tried to link
against Qt5WebKitWidgets.
Debug builds are possible with and without framework-enabled builds
of Qt, but the debug versions of the Qt libraries have to be present.
Debug builds with a release version of Qt are not possible on Mac
since for debug builds qmake produces a linker command line where
all the Qt libraries have the _debug suffix, therefore if the debug
libraries are missing the build fails.

* Source/widgetsapi.pri:

Modified Paths

trunk/ChangeLog
trunk/Source/widgetsapi.pri




Diff

Modified: trunk/ChangeLog (148788 => 148789)

--- trunk/ChangeLog	2013-04-20 08:23:19 UTC (rev 148788)
+++ trunk/ChangeLog	2013-04-20 09:53:06 UTC (rev 148789)
@@ -1,3 +1,23 @@
+2013-04-20  Andras Becsi  andras.be...@digia.com
+
+[Qt][Mac] Remove obsolete workaround for debug builds
+https://bugs.webkit.org/show_bug.cgi?id=114750
+
+Reviewed by Jocelyn Turcotte.
+
+This workaround made default builds fail with recent Qt5 because
+it removed the major version number from the library name, producing
+QtWebKitWidgets, whereas the linking command line tried to link
+against Qt5WebKitWidgets.
+Debug builds are possible with and without framework-enabled builds
+of Qt, but the debug versions of the Qt libraries have to be present.
+Debug builds with a release version of Qt are not possible on Mac
+since for debug builds qmake produces a linker command line where
+all the Qt libraries have the _debug suffix, therefore if the debug
+libraries are missing the build fails.
+
+* Source/widgetsapi.pri:
+
 2013-04-19  Martin Robinson  mrobin...@igalia.com
 
 [GTK] JSCore.gir.in has a few problems


Modified: trunk/Source/widgetsapi.pri (148788 => 148789)

--- trunk/Source/widgetsapi.pri	2013-04-20 08:23:19 UTC (rev 148788)
+++ trunk/Source/widgetsapi.pri	2013-04-20 09:53:06 UTC (rev 148789)
@@ -73,9 +73,6 @@
 
 load(qt_module)
 
-# Allow doing a debug-only build of WebKit (not supported by Qt)
-macx:!debug_and_release:debug: TARGET = $$BASE_TARGET
-
 # Make sure the install_name of the QtWebKit library point to webkit
 force_independent:macx {
 # We do our own absolute path so that we can trick qmake into






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [148744] trunk/Tools

[abecsi]

Title: [148744] trunk/Tools








Revision 148744
Author abe...@webkit.org
Date 2013-04-19 07:32:51 -0700 (Fri, 19 Apr 2013)


Log Message
[Qt] Only use thin archives on Linux

Rubber-stamped by Jocelyn Turcotte.

Since thin archive is a feature of GNU's ar
we limit the usage to Linux to avoid problems
with other configurations (eg. macx-g++).

* qmake/mkspecs/features/default_pre.prf:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_pre.prf




Diff

Modified: trunk/Tools/ChangeLog (148743 => 148744)

--- trunk/Tools/ChangeLog	2013-04-19 13:54:27 UTC (rev 148743)
+++ trunk/Tools/ChangeLog	2013-04-19 14:32:51 UTC (rev 148744)
@@ -1,3 +1,15 @@
+2013-04-19  Andras Becsi  andras.be...@digia.com
+
+[Qt] Only use thin archives on Linux
+
+Rubber-stamped by Jocelyn Turcotte.
+
+Since thin archive is a feature of GNU's ar
+we limit the usage to Linux to avoid problems
+with other configurations (eg. macx-g++).
+
+* qmake/mkspecs/features/default_pre.prf:
+
 2013-04-19  Krzysztof Czech  k.cz...@samsung.com
 
 [GTK][WK2] accessibility/language-attribute.html is failing


Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (148743 => 148744)

--- trunk/Tools/qmake/mkspecs/features/default_pre.prf	2013-04-19 13:54:27 UTC (rev 148743)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf	2013-04-19 14:32:51 UTC (rev 148744)
@@ -88,7 +88,8 @@
 # used by bots and developers, will disable it, to enable warnings etc.
 CONFIG += production_build
 
-!debug_and_release:*-g++*: CONFIG += gnu_thin_archives
+# Limit the creation of thin archives to Linux, since only GNU's ar supports it.
+!debug_and_release:linux-g++*: CONFIG += gnu_thin_archives
 
 # Pick up Qt's defaults for debug/release/debug_and_release
 if(win32|mac):!macx-xcode {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [148204] trunk/Source/ThirdParty/ANGLE

[abecsi]

Title: [148204] trunk/Source/ThirdParty/ANGLE








Revision 148204
Author abe...@webkit.org
Date 2013-04-11 08:09:53 -0700 (Thu, 11 Apr 2013)


Log Message
[Qt][Mac] Linking fails with Qt 5.1
https://bugs.webkit.org/show_bug.cgi?id=114435

Reviewed by Tor Arne Vestbø.

Qt 5.1 enables C++11 by default when using clang on Mac
and links against the libc++ standard library. As a result
building the QtWebKit shared library fails when linking
agains the ANGLE intermediate static library because libc++
misses some symbols needed by ANGLE.
Disable C++11 for the ANGLE intermediate library to fix the build.

* ANGLE.pri:

Modified Paths

trunk/Source/ThirdParty/ANGLE/ANGLE.pri
trunk/Source/ThirdParty/ANGLE/ChangeLog




Diff

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.pri (148203 => 148204)

--- trunk/Source/ThirdParty/ANGLE/ANGLE.pri	2013-04-11 14:51:08 UTC (rev 148203)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.pri	2013-04-11 15:09:53 UTC (rev 148204)
@@ -7,6 +7,8 @@
 
 SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ThirdParty/ANGLE
 
+*clang: QT_CONFIG -= c++11
+
 INCLUDEPATH += \
 $$SOURCE_DIR/include/GLSLANG \
 $$SOURCE_DIR/include/KHR


Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (148203 => 148204)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-04-11 14:51:08 UTC (rev 148203)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-04-11 15:09:53 UTC (rev 148204)
@@ -1,3 +1,19 @@
+2013-04-11  Andras Becsi  andras.be...@digia.com
+
+[Qt][Mac] Linking fails with Qt 5.1
+https://bugs.webkit.org/show_bug.cgi?id=114435
+
+Reviewed by Tor Arne Vestbø.
+
+Qt 5.1 enables C++11 by default when using clang on Mac
+and links against the libc++ standard library. As a result
+building the QtWebKit shared library fails when linking
+agains the ANGLE intermediate static library because libc++
+misses some symbols needed by ANGLE.
+Disable C++11 for the ANGLE intermediate library to fix the build.
+
+* ANGLE.pri:
+
 2013-04-10  Benjamin Poulain  bpoul...@apple.com
 
 Mass remove all the empty directories






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [147909] trunk/Source/WebKit2

[abecsi]

Title: [147909] trunk/Source/WebKit2








Revision 147909
Author abe...@webkit.org
Date 2013-04-08 04:13:20 -0700 (Mon, 08 Apr 2013)


Log Message
[Qt][WK2] WebView's interactive property is not fully respected
https://bugs.webkit.org/show_bug.cgi?id=113066

Reviewed by Jocelyn Turcotte.

WK2 sign-off by Benjamin Poulain.

The QML WebView inherits the interactive property from Flickable
which is true by default, and disables the interaction with the
Flickable if set to false.
Resulting from the design of the WebView panning and flicking is
disabled by Flickable but to be consistent we also need to disable
double-tap gestures and pinch gestures since they would trigger
scale and position changes.

* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::pinchGestureStarted):
(WebKit::PageViewportControllerClientQt::pinchGestureRequestUpdate):
(WebKit::PageViewportControllerClientQt::pinchGestureEnded):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::handleDoubleTapEvent):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (147908 => 147909)

--- trunk/Source/WebKit2/ChangeLog	2013-04-08 10:32:59 UTC (rev 147908)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-08 11:13:20 UTC (rev 147909)
@@ -1,3 +1,27 @@
+2013-04-08  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] WebView's interactive property is not fully respected
+https://bugs.webkit.org/show_bug.cgi?id=113066
+
+Reviewed by Jocelyn Turcotte.
+
+WK2 sign-off by Benjamin Poulain.
+
+The QML WebView inherits the interactive property from Flickable
+which is true by default, and disables the interaction with the
+Flickable if set to false.
+Resulting from the design of the WebView panning and flicking is
+disabled by Flickable but to be consistent we also need to disable
+double-tap gestures and pinch gestures since they would trigger
+scale and position changes.
+
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::pinchGestureStarted):
+(WebKit::PageViewportControllerClientQt::pinchGestureRequestUpdate):
+(WebKit::PageViewportControllerClientQt::pinchGestureEnded):
+* UIProcess/qt/QtWebPageEventHandler.cpp:
+(WebKit::QtWebPageEventHandler::handleDoubleTapEvent):
+
 2013-04-07  David Kilzer  ddkil...@apple.com
 
 Remove the rest of SVG_DOM_OBJC_BINDINGS


Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (147908 => 147909)

--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-04-08 10:32:59 UTC (rev 147908)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-04-08 11:13:20 UTC (rev 147909)
@@ -430,7 +430,7 @@
 // This can only happen as a result of a user interaction.
 ASSERT(m_touchInteraction.inProgress());
 
-if (!m_controller-allowsUserScaling())
+if (!m_controller-allowsUserScaling() || !m_viewportItem-isInteractive())
 return;
 
 clearRelativeZoomState();
@@ -442,11 +442,10 @@
 
 void PageViewportControllerClientQt::pinchGestureRequestUpdate(const QPointF pinchCenterInViewportCoordinates, qreal totalScaleFactor)
 {
-ASSERT(m_scaleChange.inProgress());
-
-if (!m_controller-allowsUserScaling())
+if (!m_controller-allowsUserScaling() || !m_viewportItem-isInteractive())
 return;
 
+ASSERT(m_scaleChange.inProgress());
 ASSERT(m_pinchStartScale  0);
 //  Changes of the center position should move the page even if the zoom factor does not change.
 const qreal pinchScale = m_pinchStartScale * totalScaleFactor;
@@ -464,11 +463,10 @@
 
 void PageViewportControllerClientQt::pinchGestureEnded()
 {
-ASSERT(m_scaleChange.inProgress());
-
-if (!m_controller-allowsUserScaling())
+if (m_pinchStartScale  0)
 return;
 
+ASSERT(m_scaleChange.inProgress());
 m_pinchStartScale = -1;
 
 // This will take care of resuming the content, even if no animation was performed.


Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (147908 => 147909)

--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp	2013-04-08 10:32:59 UTC (rev 147908)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp	2013-04-08 11:13:20 UTC (rev 147909)
@@ -271,6 +271,9 @@
 
 void QtWebPageEventHandler::handleDoubleTapEvent(const QTouchEvent::TouchPoint point)
 {
+if (!m_webView-isInteractive())
+return;
+
 deactivateTapHighlight();
 QTransform fromItemTransform = m_webPage-transformFromItem();
 m_webPageProxy-findZoomableAreaForPoint(fromItemTransform.map(point.pos()).toPoint(), IntSize(point.rect().size().toSize()));

[webkit-changes] [147922] trunk/Source/WebCore

[abecsi]

Title: [147922] trunk/Source/WebCore








Revision 147922
Author abe...@webkit.org
Date 2013-04-08 10:04:30 -0700 (Mon, 08 Apr 2013)


Log Message
Fix the build with strict GCC 4.8

Unreviewed build fix.

Initialize dragImage to suppress GCC's warning about it being possibly used uninitialized,
which results is a build failure with GCC 4.8 that sets -Werror=maybe-uninitialized.

No new tests needed.

* page/DragController.cpp:
(WebCore::DragController::doImageDrag):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/DragController.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (147921 => 147922)

--- trunk/Source/WebCore/ChangeLog	2013-04-08 16:52:09 UTC (rev 147921)
+++ trunk/Source/WebCore/ChangeLog	2013-04-08 17:04:30 UTC (rev 147922)
@@ -1,3 +1,17 @@
+2013-04-08  Andras Becsi  andras.be...@digia.com
+
+Fix the build with strict GCC 4.8
+
+Unreviewed build fix.
+
+Initialize dragImage to suppress GCC's warning about it being possibly used uninitialized,
+which results is a build failure with GCC 4.8 that sets -Werror=maybe-uninitialized.
+
+No new tests needed.
+
+* page/DragController.cpp:
+(WebCore::DragController::doImageDrag):
+
 2013-04-08  Zan Dobersek  zdober...@igalia.com
 
 Remove the unused LayoutTestSupport class


Modified: trunk/Source/WebCore/page/DragController.cpp (147921 => 147922)

--- trunk/Source/WebCore/page/DragController.cpp	2013-04-08 16:52:09 UTC (rev 147921)
+++ trunk/Source/WebCore/page/DragController.cpp	2013-04-08 17:04:30 UTC (rev 147922)
@@ -867,7 +867,7 @@
 void DragController::doImageDrag(Element* element, const IntPoint dragOrigin, const IntRect rect, Clipboard* clipboard, Frame* frame, IntPoint dragImageOffset)
 {
 IntPoint mouseDownPoint = dragOrigin;
-DragImageRef dragImage;
+DragImageRef dragImage = 0;
 IntPoint origin;
 
 Image* image = getImage(element);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [147640] trunk/Source

[abecsi]

Title: [147640] trunk/Source








Revision 147640
Author abe...@webkit.org
Date 2013-04-04 09:40:41 -0700 (Thu, 04 Apr 2013)


Log Message
Fix the build with GCC 4.8
https://bugs.webkit.org/show_bug.cgi?id=113147

Reviewed by Allan Sandfeld Jensen.

Source/_javascript_Core:

Initialize JSObject* exception to suppress warnings that make
the build fail because of -Werror=maybe-uninitialized.

* runtime/Executable.cpp:
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):

Source/WTF:

Disable diagnostic warning -Wunused-local-typedefs for GCC 4.8
since dummy typedefs are commonly used in the codebase.

* wtf/Compiler.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/Executable.cpp
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Compiler.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (147639 => 147640)

--- trunk/Source/_javascript_Core/ChangeLog	2013-04-04 16:37:08 UTC (rev 147639)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-04-04 16:40:41 UTC (rev 147640)
@@ -1,3 +1,17 @@
+2013-04-04  Andras Becsi  andras.be...@digia.com
+
+Fix the build with GCC 4.8
+https://bugs.webkit.org/show_bug.cgi?id=113147
+
+Reviewed by Allan Sandfeld Jensen.
+
+Initialize JSObject* exception to suppress warnings that make
+the build fail because of -Werror=maybe-uninitialized.
+
+* runtime/Executable.cpp:
+(JSC::FunctionExecutable::compileForCallInternal):
+(JSC::FunctionExecutable::compileForConstructInternal):
+
 2013-04-02  Mark Hahnenberg  mhahnenb...@apple.com
 
 get_by_pname can become confused when iterating over objects with static properties


Modified: trunk/Source/_javascript_Core/runtime/Executable.cpp (147639 => 147640)

--- trunk/Source/_javascript_Core/runtime/Executable.cpp	2013-04-04 16:37:08 UTC (rev 147639)
+++ trunk/Source/_javascript_Core/runtime/Executable.cpp	2013-04-04 16:40:41 UTC (rev 147640)
@@ -523,7 +523,7 @@
 UNUSED_PARAM(bytecodeIndex);
 #endif
 ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);
-JSObject* exception;
+JSObject* exception = 0;
 OwnPtrFunctionCodeBlock newCodeBlock = produceCodeBlockFor(scope, CodeForCall, exception);
 if (!newCodeBlock)
 return exception;
@@ -559,7 +559,7 @@
 #endif
 
 ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);
-JSObject* exception;
+JSObject* exception = 0;
 OwnPtrFunctionCodeBlock newCodeBlock = produceCodeBlockFor(scope, CodeForConstruct, exception);
 if (!newCodeBlock)
 return exception;


Modified: trunk/Source/WTF/ChangeLog (147639 => 147640)

--- trunk/Source/WTF/ChangeLog	2013-04-04 16:37:08 UTC (rev 147639)
+++ trunk/Source/WTF/ChangeLog	2013-04-04 16:40:41 UTC (rev 147640)
@@ -1,3 +1,15 @@
+2013-04-04  Andras Becsi  andras.be...@digia.com
+
+Fix the build with GCC 4.8
+https://bugs.webkit.org/show_bug.cgi?id=113147
+
+Reviewed by Allan Sandfeld Jensen.
+
+Disable diagnostic warning -Wunused-local-typedefs for GCC 4.8
+since dummy typedefs are commonly used in the codebase.
+
+* wtf/Compiler.h:
+
 2013-04-03  Pratik Solanki  psola...@apple.com
 
 Enable HAVE_MADV_FREE_REUSE on iOS


Modified: trunk/Source/WTF/wtf/Compiler.h (147639 => 147640)

--- trunk/Source/WTF/wtf/Compiler.h	2013-04-04 16:37:08 UTC (rev 147639)
+++ trunk/Source/WTF/wtf/Compiler.h	2013-04-04 16:40:41 UTC (rev 147640)
@@ -123,6 +123,9 @@
 
 /* Specific compiler features */
 #if COMPILER(GCC)  !COMPILER(CLANG)
+#if GCC_VERSION_AT_LEAST(4, 8, 0)
+#pragma GCC diagnostic ignored -Wunused-local-typedefs
+#endif
 #if defined(__STDC_VERSION__)  __STDC_VERSION__ = 201112L
 /* C11 support */
 #define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT 1






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146914] trunk/Source/WebKit2

[abecsi]

Title: [146914] trunk/Source/WebKit2








Revision 146914
Author abe...@webkit.org
Date 2013-03-26 11:57:13 -0700 (Tue, 26 Mar 2013)


Log Message
[Qt][WK2] QML WebView asserts when double clicking a link
https://bugs.webkit.org/show_bug.cgi?id=113329

Reviewed by Jocelyn Turcotte.

Downstream bugreport: https://bugreports.qt-project.org/browse/QTBUG-30288

Remove an erroneous assert which is no longer valid if
mouse gestures are enabled.

* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::handleInputEvent):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (146913 => 146914)

--- trunk/Source/WebKit2/ChangeLog	2013-03-26 18:43:25 UTC (rev 146913)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-26 18:57:13 UTC (rev 146914)
@@ -1,3 +1,18 @@
+2013-03-26  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] QML WebView asserts when double clicking a link
+https://bugs.webkit.org/show_bug.cgi?id=113329
+
+Reviewed by Jocelyn Turcotte.
+
+Downstream bugreport: https://bugreports.qt-project.org/browse/QTBUG-30288
+
+Remove an erroneous assert which is no longer valid if
+mouse gestures are enabled.
+
+* UIProcess/qt/QtWebPageEventHandler.cpp:
+(WebKit::QtWebPageEventHandler::handleInputEvent):
+
 2013-03-26  Tim Horton  timothy_hor...@apple.com
 
 [wk2] Don't send intrinsic content size updates more than once per runloop


Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (146913 => 146914)

--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp	2013-03-26 18:43:25 UTC (rev 146913)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp	2013-03-26 18:57:13 UTC (rev 146914)
@@ -504,7 +504,6 @@
 m_isMouseButtonPressed = false;
 break;
 case QEvent::MouseButtonDblClick:
-ASSERT_NOT_REACHED();
 return;
 default:
 break;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146915] trunk/Source/WebKit2

[abecsi]

Title: [146915] trunk/Source/WebKit2








Revision 146915
Author abe...@webkit.org
Date 2013-03-26 12:01:17 -0700 (Tue, 26 Mar 2013)


Log Message
[Qt][WK2] Fails to start QtWebProcess.exe if installed in a path containing spaces
https://bugs.webkit.org/show_bug.cgi?id=113328

Reviewed by Jocelyn Turcotte.

Downstream bugreport: https://bugreports.qt-project.org/browse/QTBUG-30249

We use QProcess::start() with a commandline string to start the web process
and the string is treated by QProcess as a whitespace delimeted list of the
command and the arguments, thus we have to escape the path to the process
binaries so that if the path contains spaces we still run the appropriate
command.

* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
(WebKit::ProcessLauncher::launchProcess):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (146914 => 146915)

--- trunk/Source/WebKit2/ChangeLog	2013-03-26 18:57:13 UTC (rev 146914)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-26 19:01:17 UTC (rev 146915)
@@ -1,5 +1,23 @@
 2013-03-26  Andras Becsi  andras.be...@digia.com
 
+[Qt][WK2] Fails to start QtWebProcess.exe if installed in a path containing spaces
+https://bugs.webkit.org/show_bug.cgi?id=113328
+
+Reviewed by Jocelyn Turcotte.
+
+Downstream bugreport: https://bugreports.qt-project.org/browse/QTBUG-30249
+
+We use QProcess::start() with a commandline string to start the web process
+and the string is treated by QProcess as a whitespace delimeted list of the
+command and the arguments, thus we have to escape the path to the process
+binaries so that if the path contains spaces we still run the appropriate
+command.
+
+* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+(WebKit::ProcessLauncher::launchProcess):
+
+2013-03-26  Andras Becsi  andras.be...@digia.com
+
 [Qt][WK2] QML WebView asserts when double clicking a link
 https://bugs.webkit.org/show_bug.cgi?id=113329
 


Modified: trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp (146914 => 146915)

--- trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp	2013-03-26 18:57:13 UTC (rev 146914)
+++ trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp	2013-03-26 19:01:17 UTC (rev 146915)
@@ -114,12 +114,12 @@
 {
 QString commandLine;
 if (m_launchOptions.processType == WebProcess) {
-commandLine = QLatin1String(%1 %2 %3);
+commandLine = QLatin1String(%1 \%2\ %3);
 QByteArray webProcessPrefix = qgetenv(QT_WEBKIT2_WP_CMD_PREFIX);
 commandLine = commandLine.arg(QLatin1String(webProcessPrefix.constData())).arg(QString(executablePathOfWebProcess()));
 #if ENABLE(PLUGIN_PROCESS)
 } else if (m_launchOptions.processType == PluginProcess) {
-commandLine = QLatin1String(%1 %2 %3 %4);
+commandLine = QLatin1String(%1 \%2\ %3 %4);
 QByteArray pluginProcessPrefix = qgetenv(QT_WEBKIT2_PP_CMD_PREFIX);
 commandLine = commandLine.arg(QLatin1String(pluginProcessPrefix.constData())).arg(QString(executablePathOfPluginProcess()));
 #endif
@@ -182,7 +182,7 @@
 
 #if ENABLE(SUID_SANDBOX_LINUX)
 if (m_launchOptions.processType == WebProcess) {
-QString sandboxCommandLine = QLatin1String(%1 %2 %3);
+QString sandboxCommandLine = QLatin1String(\%1\ \%2\ %3);
 sandboxCommandLine = sandboxCommandLine.arg(QCoreApplication::applicationDirPath() + QLatin1String(/SUIDSandboxHelper));
 sandboxCommandLine = sandboxCommandLine.arg(executablePathOfWebProcess());
 sandboxCommandLine = sandboxCommandLine.arg(sockets[0]);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [146355] trunk/Source/WebKit2

[abecsi]

Title: [146355] trunk/Source/WebKit2








Revision 146355
Author abe...@webkit.org
Date 2013-03-20 09:45:17 -0700 (Wed, 20 Mar 2013)


Log Message
[Qt][WK2] Refactor handling of content suspension to properly cover corner cases
https://bugs.webkit.org/show_bug.cgi?id=111751

Reviewed by Jocelyn Turcotte.

The current suspend / resume infrastructure turned out to be insufficient to cover
all corner cases during transitions between gestures of complex gesture chains.

The requirements for robust suspend / resume handling are:
- Keep the content suspended while the user is continuously interacting,
eg. does not lift the finger between transition from a pan to a pinch gesture
and vice versa.
- The content should not be suspended unnecessarily (like for a tap gesture),
only during panning and scroll animation (flick), as well as pinch zoom and scale
animation (also includes double-tap-to-zoom).
- The content should never end up stuck in suspended state after long gesture
chains and continuous interaction.

This patch reintroduces reference counting based suspension in form of a new
ViewportInteractionTracker member class to make it possible to reliably control the
suspend / resume cycles during scrolling and scaling.
During continuous gestures, while the user is interacting, the reference count is
increased without actually suspending the content to prevent resuming unnecessarily
during continuous interaction. At the same time this also assures that the page is
not suspended for simple tap gestures, which was a side-effect of the previous
approach based on update deferrers.
The newly added functionality replaces boolean members that tried to achive the
above requirements.
Additionally this patch also removes the redundant m_hasSuspendedContent member
from the PageViewportController since WebPageProxy already keeps this information.

* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::PageViewportController):
(WebKit::PageViewportController::pageDidRequestScroll):
(WebKit::PageViewportController::updateMinimumScaleToFit):
* UIProcess/PageViewportController.h:
(PageViewportController):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::areActiveDOMObjectsAndAnimationsSuspended):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):
(WebKit::PageViewportControllerClientQt::ViewportInteractionTracker::begin):
(WebKit):
(WebKit::PageViewportControllerClientQt::ViewportInteractionTracker::end):
(WebKit::PageViewportControllerClientQt::animateContentRectVisible):
(WebKit::PageViewportControllerClientQt::flickMoveStarted):
(WebKit::PageViewportControllerClientQt::flickMoveEnded):
(WebKit::PageViewportControllerClientQt::pageItemPositionChanged):
(WebKit::PageViewportControllerClientQt::scaleAnimationStateChanged):
(WebKit::PageViewportControllerClientQt::touchBegin):
(WebKit::PageViewportControllerClientQt::touchEnd):
(WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):
(WebKit::PageViewportControllerClientQt::pinchGestureStarted):
(WebKit::PageViewportControllerClientQt::pinchGestureRequestUpdate):
(WebKit::PageViewportControllerClientQt::pinchGestureEnded):
(WebKit::PageViewportControllerClientQt::pinchGestureCancelled):
(WebKit::PageViewportControllerClientQt::didChangeContentsSize):
* UIProcess/qt/PageViewportControllerClientQt.h:
(ViewportInteractionTracker):
(WebKit::PageViewportControllerClientQt::ViewportInteractionTracker::ViewportInteractionTracker):
(WebKit::PageViewportControllerClientQt::ViewportInteractionTracker::inProgress):
(PageViewportControllerClientQt):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp
trunk/Source/WebKit2/UIProcess/PageViewportController.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (146354 => 146355)

--- trunk/Source/WebKit2/ChangeLog	2013-03-20 16:19:07 UTC (rev 146354)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-20 16:45:17 UTC (rev 146355)
@@ -1,3 +1,68 @@
+2013-03-20  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Refactor handling of content suspension to properly cover corner cases
+https://bugs.webkit.org/show_bug.cgi?id=111751
+
+Reviewed by Jocelyn Turcotte.
+
+The current suspend / resume infrastructure turned out to be insufficient to cover
+all corner cases during transitions between gestures of complex gesture chains.
+
+The requirements for robust suspend / resume handling are:
+- Keep the content suspended while the user is continuously interacting,
+eg. does not lift the finger between transition from a pan to a pinch gesture
+and vice versa.
+- The content should not be suspended unnecessarily (like for a tap 

[webkit-changes] [146356] trunk/Source/WebKit2

[abecsi]

Title: [146356] trunk/Source/WebKit2








Revision 146356
Author abe...@webkit.org
Date 2013-03-20 09:49:30 -0700 (Wed, 20 Mar 2013)


Log Message
[Qt][WK2] Clean up sanity checks related to gesture recognition
https://bugs.webkit.org/show_bug.cgi?id=112679

Reviewed by Jocelyn Turcotte.

The only callers of the panGestureActive and pinchGestureActive member
functions of the page viewport controller client are event delivery
related sanity check assers, thus they can be replaced by checking
for the corresponding internal states and therefore the superfluous
members can be removed.
Also update other asserts in the page viewport controller client to
be more accurate about the expected states.

* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::animateContentRectVisible):
(WebKit::PageViewportControllerClientQt::touchBegin):
(WebKit::PageViewportControllerClientQt::panGestureStarted):
(WebKit::PageViewportControllerClientQt::pinchGestureStarted):
* UIProcess/qt/PageViewportControllerClientQt.h:
(PageViewportControllerClientQt):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::handleInputEvent):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (146355 => 146356)

--- trunk/Source/WebKit2/ChangeLog	2013-03-20 16:45:17 UTC (rev 146355)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-20 16:49:30 UTC (rev 146356)
@@ -1,5 +1,30 @@
 2013-03-20  Andras Becsi  andras.be...@digia.com
 
+[Qt][WK2] Clean up sanity checks related to gesture recognition
+https://bugs.webkit.org/show_bug.cgi?id=112679
+
+Reviewed by Jocelyn Turcotte.
+
+The only callers of the panGestureActive and pinchGestureActive member
+functions of the page viewport controller client are event delivery
+related sanity check assers, thus they can be replaced by checking
+for the corresponding internal states and therefore the superfluous
+members can be removed.
+Also update other asserts in the page viewport controller client to
+be more accurate about the expected states.
+
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::animateContentRectVisible):
+(WebKit::PageViewportControllerClientQt::touchBegin):
+(WebKit::PageViewportControllerClientQt::panGestureStarted):
+(WebKit::PageViewportControllerClientQt::pinchGestureStarted):
+* UIProcess/qt/PageViewportControllerClientQt.h:
+(PageViewportControllerClientQt):
+* UIProcess/qt/QtWebPageEventHandler.cpp:
+(WebKit::QtWebPageEventHandler::handleInputEvent):
+
+2013-03-20  Andras Becsi  andras.be...@digia.com
+
 [Qt][WK2] Refactor handling of content suspension to properly cover corner cases
 https://bugs.webkit.org/show_bug.cgi?id=111751
 


Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (146355 => 146356)

--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-03-20 16:45:17 UTC (rev 146355)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-03-20 16:49:30 UTC (rev 146356)
@@ -125,11 +125,8 @@
 
 void PageViewportControllerClientQt::animateContentRectVisible(const QRectF contentRect)
 {
-ASSERT(m_scaleAnimation-state() == QAbstractAnimation::Stopped);
-
+ASSERT(!scaleAnimationActive());
 ASSERT(!scrollAnimationActive());
-if (scrollAnimationActive())
-return;
 
 QRectF viewportRectInContentCoords = m_viewportItem-mapRectToWebContent(m_viewportItem-boundingRect());
 if (contentRect == viewportRectInContentCoords) {
@@ -192,6 +189,10 @@
 
 void PageViewportControllerClientQt::touchBegin()
 {
+// Check for sane event delivery. At this point neither a pan gesture nor a pinch gesture should be active.
+ASSERT(!m_viewportItem-isDragging());
+ASSERT(!(m_pinchStartScale  0));
+
 m_controller-setHadUserInteraction(true);
 
 // Prevent resuming the page during transition between gestures while the user is interacting.
@@ -366,15 +367,10 @@
 return m_viewportItem-isFlicking();
 }
 
-bool PageViewportControllerClientQt::panGestureActive() const
-{
-return m_controller-hadUserInteraction()  m_viewportItem-isDragging();
-}
-
 void PageViewportControllerClientQt::panGestureStarted(const QPointF position, qint64 eventTimestampMillis)
 {
 // This can only happen as a result of a user interaction.
-ASSERT(m_controller-hadUserInteraction());
+ASSERT(m_touchInteraction.inProgress());
 
 m_viewportItem-handleFlickableMousePress(position, eventTimestampMillis);
 m_lastPinchCenterInViewportCoordinates = position;
@@ -429,15 +425,10 @@
 

[webkit-changes] [146197] trunk/Tools

[abecsi]

Title: [146197] trunk/Tools








Revision 146197
Author abe...@webkit.org
Date 2013-03-19 04:05:28 -0700 (Tue, 19 Mar 2013)


Log Message
[Qt] Fix the build of QtTestBrowser if the print preview dialog is disabled in Qt

Rubber-stamped by Csaba Osztrogonác.

Check for QT_NO_PRINTPREVIEWDIALOG instead of QT_NO_PRINTER
since the latter might not cover the former.

* QtTestBrowser/launcherwindow.cpp:
(LauncherWindow::print):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/QtTestBrowser/launcherwindow.cpp




Diff

Modified: trunk/Tools/ChangeLog (146196 => 146197)

--- trunk/Tools/ChangeLog	2013-03-19 10:05:41 UTC (rev 146196)
+++ trunk/Tools/ChangeLog	2013-03-19 11:05:28 UTC (rev 146197)
@@ -1,3 +1,15 @@
+2013-03-18  Andras Becsi  andras.be...@digia.com
+
+[Qt] Fix the build of QtTestBrowser if the print preview dialog is disabled in Qt
+
+Rubber-stamped by Csaba Osztrogonác.
+
+Check for QT_NO_PRINTPREVIEWDIALOG instead of QT_NO_PRINTER
+since the latter might not cover the former.
+
+* QtTestBrowser/launcherwindow.cpp:
+(LauncherWindow::print):
+
 2013-03-18  Simon Fraser  simon.fra...@apple.com
 
 Style tweeks to default.css.


Modified: trunk/Tools/QtTestBrowser/launcherwindow.cpp (146196 => 146197)

--- trunk/Tools/QtTestBrowser/launcherwindow.cpp	2013-03-19 10:05:41 UTC (rev 146196)
+++ trunk/Tools/QtTestBrowser/launcherwindow.cpp	2013-03-19 11:05:28 UTC (rev 146197)
@@ -51,7 +51,7 @@
 #ifndef QT_NO_SHORTCUT
 #include QMenuBar
 #endif
-#if !defined(QT_NO_PRINTER)  HAVE(QTPRINTSUPPORT)
+#if !defined(QT_NO_PRINTPREVIEWDIALOG)  HAVE(QTPRINTSUPPORT)
 #include QPrintPreviewDialog
 #endif
 #include QSlider
@@ -758,7 +758,7 @@
 
 void LauncherWindow::print()
 {
-#if !defined(QT_NO_PRINTER)  HAVE(QTPRINTSUPPORT)
+#if !defined(QT_NO_PRINTPREVIEWDIALOG)  HAVE(QTPRINTSUPPORT)
 QPrintPreviewDialog dlg(this);
 connect(dlg, SIGNAL(paintRequested(QPrinter*)),
 page()-mainFrame(), SLOT(print(QPrinter*)));






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144915] trunk/Tools

[abecsi]

Title: [144915] trunk/Tools








Revision 144915
Author abe...@webkit.org
Date 2013-03-06 06:06:40 -0800 (Wed, 06 Mar 2013)


Log Message
[Qt][MiniBrowser] Touch mocking broken for chained getures
https://bugs.webkit.org/show_bug.cgi?id=111430

Reviewed by Jocelyn Turcotte.

Make it possible again to use touch mocking to test gesture chains
like pan-pinch-pan-pinch without lifting the primary finger.
For this to work we need to track the pressed mouse buttons and
only synthesize touch release events when the ctrl key is released
if no mouse button is pressed. Else the pressed mouse button(s)
should result in a stationary touch point in a touch update event.
Since it has been fixed in Qt 5.0.1 use QGuiApplication::keyboardModifiers()
to check for the state of the ctrl key modifier instead of getting
it from the mouse events.

* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::MiniBrowserApplication):
(MiniBrowserApplication::notify):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp




Diff

Modified: trunk/Tools/ChangeLog (144914 => 144915)

--- trunk/Tools/ChangeLog	2013-03-06 14:02:38 UTC (rev 144914)
+++ trunk/Tools/ChangeLog	2013-03-06 14:06:40 UTC (rev 144915)
@@ -1,3 +1,24 @@
+2013-03-06  Andras Becsi  andras.be...@digia.com
+
+[Qt][MiniBrowser] Touch mocking broken for chained getures
+https://bugs.webkit.org/show_bug.cgi?id=111430
+
+Reviewed by Jocelyn Turcotte.
+
+Make it possible again to use touch mocking to test gesture chains
+like pan-pinch-pan-pinch without lifting the primary finger.
+For this to work we need to track the pressed mouse buttons and
+only synthesize touch release events when the ctrl key is released
+if no mouse button is pressed. Else the pressed mouse button(s)
+should result in a stationary touch point in a touch update event.
+Since it has been fixed in Qt 5.0.1 use QGuiApplication::keyboardModifiers()
+to check for the state of the ctrl key modifier instead of getting
+it from the mouse events.
+
+* MiniBrowser/qt/MiniBrowserApplication.cpp:
+(MiniBrowserApplication::MiniBrowserApplication):
+(MiniBrowserApplication::notify):
+
 2013-03-05  Dirk Pranke  dpra...@chromium.org
 
 [chromium] don't use custom freetype on linux asan for now


Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (144914 => 144915)

--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2013-03-06 14:02:38 UTC (rev 144914)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2013-03-06 14:06:40 UTC (rev 144915)
@@ -110,6 +110,8 @@
 if (!browserWindow)
 return QGuiApplication::notify(target, event);
 
+m_holdingControl = QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
+
 // In QML events are propagated through parents. But since the WebView
 // may consume key events, a shortcut might never reach the top QQuickItem.
 // Therefore we are checking here for shortcuts.
@@ -131,15 +133,17 @@
 
 if (event-type() == QEvent::KeyRelease  static_castQKeyEvent*(event)-key() == Qt::Key_Control) {
 foreach (int id, m_heldTouchPoints)
-if (m_touchPoints.contains(id))
+if (m_touchPoints.contains(id)  !QGuiApplication::mouseButtons().testFlag(Qt::MouseButton(id))) {
 m_touchPoints[id].setState(Qt::TouchPointReleased);
-m_heldTouchPoints.clear();
-sendTouchEvent(browserWindow, QEvent::TouchEnd, static_castQKeyEvent*(event)-timestamp());
+m_heldTouchPoints.remove(id);
+} else
+m_touchPoints[id].setState(Qt::TouchPointStationary);
+
+sendTouchEvent(browserWindow, m_heldTouchPoints.isEmpty() ? QEvent::TouchEnd : QEvent::TouchUpdate, static_castQKeyEvent*(event)-timestamp());
 }
 
 if (isMouseEvent(event)) {
 const QMouseEvent* const mouseEvent = static_castQMouseEvent*(event);
-m_holdingControl = mouseEvent-modifiers().testFlag(Qt::ControlModifier);
 
 QTouchEvent::TouchPoint touchPoint;
 touchPoint.setPressure(1);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144914] trunk/Source/WebKit2

[abecsi]

Title: [144914] trunk/Source/WebKit2








Revision 144914
Author abe...@webkit.org
Date 2013-03-06 06:02:38 -0800 (Wed, 06 Mar 2013)


Log Message
[Qt][WK2] Fix the Mac build after r144787
https://bugs.webkit.org/show_bug.cgi?id=111569

Reviewed by Csaba Osztrogonác.

Use uint_64 explicitly instead of size_t.

* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(CoreIPCencode):
(CoreIPCdecode):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (144913 => 144914)

--- trunk/Source/WebKit2/ChangeLog	2013-03-06 14:02:13 UTC (rev 144913)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-06 14:02:38 UTC (rev 144914)
@@ -1,3 +1,16 @@
+2013-03-06  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fix the Mac build after r144787
+https://bugs.webkit.org/show_bug.cgi?id=111569
+
+Reviewed by Csaba Osztrogonác.
+
+Use uint_64 explicitly instead of size_t.
+
+* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+(CoreIPCencode):
+(CoreIPCdecode):
+
 2013-03-05  Kent Tamura  tk...@chromium.org
 
 Rename WebCore/editing/visible_units.* to VisibleUnits.*


Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (144913 => 144914)

--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp	2013-03-06 14:02:13 UTC (rev 144913)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp	2013-03-06 14:02:38 UTC (rev 144914)
@@ -1021,7 +1021,7 @@
 
 // We need to encode WebCoordinatedSurface::Handle right after it's creation.
 // That's why we cannot use simple std::pair encoder.
-encoder  state.imagesToUpdate.size();
+encoder  static_castuint64_t(state.imagesToUpdate.size());
 
 typedef Vectorstd::pairCoordinatedImageBackingID, RefPtrCoordinatedSurface   SurfaceUpdatePairVector;
 SurfaceUpdatePairVector::const_iterator end = state.imagesToUpdate.end();
@@ -1057,11 +1057,11 @@
 if (!decoder.decode(state.layersToUpdate))
 return false;
 
-size_t sizeOfImagesToUpdate;
+uint64_t sizeOfImagesToUpdate;
 if (!decoder.decode(sizeOfImagesToUpdate))
 return false;
 
-for (size_t i = 0; i  sizeOfImagesToUpdate; i++) {
+for (uint64_t i = 0; i  sizeOfImagesToUpdate; i++) {
 CoordinatedImageBackingID imageID;
 if (!decoder.decode(imageID))
 return false;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144758] trunk/Tools

[abecsi]

Title: [144758] trunk/Tools








Revision 144758
Author abe...@webkit.org
Date 2013-03-05 07:00:00 -0800 (Tue, 05 Mar 2013)


Log Message
[Qt][MiniBrowser] Improve the update of touch indicators
https://bugs.webkit.org/show_bug.cgi?id=111429

Reviewed by Jocelyn Turcotte.

MiniBrowserApplication::sendTouchEvent sends an empty list
to BrowserWindow::updateVisualMockTouchPoints if the control
button is released, in which case the touch indicators should
be hidden so that we never end up with a leftover indicator
sticking on the screen.
This patch also simplifies the lookup of the indicator items by
replacing the findChild search in the item tree with a QHash
that stores the touch ID's and the pointers to the corresponding
indicator items.

* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::updateVisualMockTouchPoints):
* MiniBrowser/qt/BrowserWindow.h:
(BrowserWindow):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp
trunk/Tools/MiniBrowser/qt/BrowserWindow.h




Diff

Modified: trunk/Tools/ChangeLog (144757 => 144758)

--- trunk/Tools/ChangeLog	2013-03-05 14:54:08 UTC (rev 144757)
+++ trunk/Tools/ChangeLog	2013-03-05 15:00:00 UTC (rev 144758)
@@ -1,3 +1,25 @@
+2013-03-05  Andras Becsi  andras.be...@digia.com
+
+[Qt][MiniBrowser] Improve the update of touch indicators
+https://bugs.webkit.org/show_bug.cgi?id=111429
+
+Reviewed by Jocelyn Turcotte.
+
+MiniBrowserApplication::sendTouchEvent sends an empty list
+to BrowserWindow::updateVisualMockTouchPoints if the control
+button is released, in which case the touch indicators should
+be hidden so that we never end up with a leftover indicator
+sticking on the screen.
+This patch also simplifies the lookup of the indicator items by
+replacing the findChild search in the item tree with a QHash
+that stores the touch ID's and the pointers to the corresponding
+indicator items.
+
+* MiniBrowser/qt/BrowserWindow.cpp:
+(BrowserWindow::updateVisualMockTouchPoints):
+* MiniBrowser/qt/BrowserWindow.h:
+(BrowserWindow):
+
 2013-03-05  Tim Horton  timothy_hor...@apple.com, Grzegorz Czajkowski  g.czajkow...@samsung.com
 
 [WK2] WTR needs an implementation of setAsynchronousSpellCheckingEnabled


Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (144757 => 144758)

--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp	2013-03-05 14:54:08 UTC (rev 144757)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp	2013-03-05 15:00:00 UTC (rev 144758)
@@ -118,14 +118,22 @@
 
 void BrowserWindow::updateVisualMockTouchPoints(const QListQTouchEvent::TouchPoint touchPoints)
 {
+if (touchPoints.isEmpty()) {
+// Hide all touch indicator items.
+foreach (QQuickItem* item, m_activeMockComponents.values())
+item-setProperty(pressed, false);
+
+return;
+}
+
 foreach (const QTouchEvent::TouchPoint touchPoint, touchPoints) {
-QString mockTouchPointIdentifier = QString(mockTouchPoint%1).arg(touchPoint.id());
-QQuickItem* mockTouchPointItem = rootObject()-findChildQQuickItem*(mockTouchPointIdentifier, Qt::FindDirectChildrenOnly);
+QQuickItem* mockTouchPointItem = m_activeMockComponents.value(touchPoint.id());
 
 if (!mockTouchPointItem) {
 QQmlComponent touchMockPointComponent(engine(), QUrl(qrc:///qml/MockTouchPoint.qml));
 mockTouchPointItem = qobject_castQQuickItem*(touchMockPointComponent.create());
-mockTouchPointItem-setObjectName(mockTouchPointIdentifier);
+Q_ASSERT(mockTouchPointItem);
+m_activeMockComponents.insert(touchPoint.id(), mockTouchPointItem);
 mockTouchPointItem-setProperty(pointId, QVariant(touchPoint.id()));
 mockTouchPointItem-setParent(rootObject());
 mockTouchPointItem-setParentItem(rootObject());


Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.h (144757 => 144758)

--- trunk/Tools/MiniBrowser/qt/BrowserWindow.h	2013-03-05 14:54:08 UTC (rev 144757)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.h	2013-03-05 15:00:00 UTC (rev 144758)
@@ -68,6 +68,7 @@
 virtual void wheelEvent(QWheelEvent*);
 
 WindowOptions* m_windowOptions;
+QHashint, QQuickItem* m_activeMockComponents;
 QVectorqreal m_zoomLevels;
 unsigned m_currentZoomLevel;
 };






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144440] trunk/Source/WebKit2

[abecsi]

Title: [10] trunk/Source/WebKit2








Revision 10
Author abe...@webkit.org
Date 2013-03-01 04:05:16 -0800 (Fri, 01 Mar 2013)


Log Message
[Qt][WK2] Fix failing API tests after r143935
https://bugs.webkit.org/show_bug.cgi?id=111086

Reviewed by Jocelyn Turcotte.

Convert a leftorver resume call to the new resumeAndUpdateContent() call
in PageViewportControllerClientQt so that the notifications about zoom
animation state changes reach the API tests.

* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::scaleAnimationStateChanged):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (144439 => 10)

--- trunk/Source/WebKit2/ChangeLog	2013-03-01 12:04:24 UTC (rev 144439)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-01 12:05:16 UTC (rev 10)
@@ -1,3 +1,17 @@
+2013-03-01  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fix failing API tests after r143935
+https://bugs.webkit.org/show_bug.cgi?id=111086
+
+Reviewed by Jocelyn Turcotte.
+
+Convert a leftorver resume call to the new resumeAndUpdateContent() call
+in PageViewportControllerClientQt so that the notifications about zoom
+animation state changes reach the API tests.
+
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::scaleAnimationStateChanged):
+
 2013-03-01  Grzegorz Czajkowski  g.czajkow...@samsung.com, Mariusz Grzegorczyk marius...@samsung.com
 
 [WK2] Asynchronous spell checking implementation


Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (144439 => 10)

--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-03-01 12:04:24 UTC (rev 144439)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-03-01 12:05:16 UTC (rev 10)
@@ -156,7 +156,7 @@
 break;
 case QAbstractAnimation::Stopped:
 m_ignoreViewportChanges = false;
-m_controller-resumeContent();
+resumeAndUpdateContent();
 break;
 default:
 break;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144299] trunk/Tools

[abecsi]

Title: [144299] trunk/Tools








Revision 144299
Author abe...@webkit.org
Date 2013-02-28 05:41:13 -0800 (Thu, 28 Feb 2013)


Log Message
[Qt][TestWebKitAPI] The activeBuildConfig() function has been replaced with targetSubDir()

Rubber-stamped by Csaba Osztrogonác.

Besides suppressing a warning about the non-existing function this
fixes the build if there is a subdirectory (eg. debug-and-release).

* TestWebKitAPI/InjectedBundle.pri:
* TestWebKitAPI/TestWebKitAPI.pri:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/InjectedBundle.pri
trunk/Tools/TestWebKitAPI/TestWebKitAPI.pri




Diff

Modified: trunk/Tools/ChangeLog (144298 => 144299)

--- trunk/Tools/ChangeLog	2013-02-28 13:05:56 UTC (rev 144298)
+++ trunk/Tools/ChangeLog	2013-02-28 13:41:13 UTC (rev 144299)
@@ -1,3 +1,15 @@
+2013-02-28  Andras Becsi  andras.be...@digia.com
+
+[Qt][TestWebKitAPI] The activeBuildConfig() function has been replaced with targetSubDir()
+
+Rubber-stamped by Csaba Osztrogonác.
+
+Besides suppressing a warning about the non-existing function this
+fixes the build if there is a subdirectory (eg. debug-and-release).
+
+* TestWebKitAPI/InjectedBundle.pri:
+* TestWebKitAPI/TestWebKitAPI.pri:
+
 2013-02-28  Mikhail Pozdnyakov  mikhail.pozdnya...@intel.com
 
 [EFL][WTR] WTR cannot load injected bundle


Modified: trunk/Tools/TestWebKitAPI/InjectedBundle.pri (144298 => 144299)

--- trunk/Tools/TestWebKitAPI/InjectedBundle.pri	2013-02-28 13:05:56 UTC (rev 144298)
+++ trunk/Tools/TestWebKitAPI/InjectedBundle.pri	2013-02-28 13:41:13 UTC (rev 144299)
@@ -50,7 +50,7 @@
 
 CONFIG += plugin rpath compiling_thirdparty_code
 
-LIBS += -L$${ROOT_BUILD_DIR}/Source/ThirdParty/gtest/$$activeBuildConfig() -lgtest
+LIBS += -L$${ROOT_BUILD_DIR}/Source/ThirdParty/gtest/$$targetSubDir() -lgtest
 
 DEFINES += APITEST_SOURCE_DIR=\\\$$PWD\\\ \
ROOT_BUILD_DIR=\\\$${ROOT_BUILD_DIR}\\\


Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.pri (144298 => 144299)

--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.pri	2013-02-28 13:05:56 UTC (rev 144298)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.pri	2013-02-28 13:41:13 UTC (rev 144299)
@@ -16,7 +16,7 @@
 $$PWD/qt/PlatformUtilitiesQt.cpp \
 $$PWD/qt/PlatformWebViewQt.cpp
 
-LIBS += -L$${ROOT_BUILD_DIR}/Source/ThirdParty/gtest/$$activeBuildConfig() -lgtest
+LIBS += -L$${ROOT_BUILD_DIR}/Source/ThirdParty/gtest/$$targetSubDir() -lgtest
 
 DEFINES += ROOT_BUILD_DIR=\\\$${ROOT_BUILD_DIR}\\\
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144306] trunk/Tools

[abecsi]

Title: [144306] trunk/Tools








Revision 144306
Author abe...@webkit.org
Date 2013-02-28 07:03:06 -0800 (Thu, 28 Feb 2013)


Log Message
[Qt] Enable thin archives before parsing the project files

Rubber-stamped by Simon Hausmann.

The targetSubDir() function can be called before default_post.prf has been
parsed therefore the gnu_thin_archives option has to be set in default_pre.prf
which is parsed before the main project file.
This issue was revealed by r144299 and fixes the clean build.

* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/default_pre.prf:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
trunk/Tools/qmake/mkspecs/features/default_pre.prf




Diff

Modified: trunk/Tools/ChangeLog (144305 => 144306)

--- trunk/Tools/ChangeLog	2013-02-28 14:53:35 UTC (rev 144305)
+++ trunk/Tools/ChangeLog	2013-02-28 15:03:06 UTC (rev 144306)
@@ -1,3 +1,17 @@
+2013-02-28  Andras Becsi  andras.be...@digia.com
+
+[Qt] Enable thin archives before parsing the project files
+
+Rubber-stamped by Simon Hausmann.
+
+The targetSubDir() function can be called before default_post.prf has been
+parsed therefore the gnu_thin_archives option has to be set in default_pre.prf
+which is parsed before the main project file.
+This issue was revealed by r144299 and fixes the clean build.
+
+* qmake/mkspecs/features/default_post.prf:
+* qmake/mkspecs/features/default_pre.prf:
+
 2013-02-28  Allan Sandfeld Jensen  allan.jen...@digia.com
 
 [Qt] Enable CANVAS_PATH flag


Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (144305 => 144306)

--- trunk/Tools/qmake/mkspecs/features/default_post.prf	2013-02-28 14:53:35 UTC (rev 144305)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf	2013-02-28 15:03:06 UTC (rev 144306)
@@ -14,7 +14,6 @@
 # Avoid it with debug_and_release, it can cause the application to load both the debug and release
 # dependent libraries when using frameworks on Mac.
 !production_build:!debug_and_release:!buildbot:!win*:!build?(webkit2): CONFIG += force_static_libs_as_shared
-!debug_and_release:*-g++*: CONFIG += gnu_thin_archives
 
 # Don't create .prl files for intermediate libraries because their contents get used when linking against
 # them, breaking -Wl,-whole-archive -lMyIntermediateLib --Wl,-no-whole-archive


Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (144305 => 144306)

--- trunk/Tools/qmake/mkspecs/features/default_pre.prf	2013-02-28 14:53:35 UTC (rev 144305)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf	2013-02-28 15:03:06 UTC (rev 144306)
@@ -92,6 +92,8 @@
 # used by bots and developers, will disable it, to enable warnings etc.
 CONFIG += production_build
 
+!debug_and_release:*-g++*: CONFIG += gnu_thin_archives
+
 # Pick up Qt's defaults for debug/release/debug_and_release
 if(win32|mac):!macx-xcode {
 contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [144066] trunk/Source/WebKit2

[abecsi]

Title: [144066] trunk/Source/WebKit2








Revision 144066
Author abe...@webkit.org
Date 2013-02-26 09:15:38 -0800 (Tue, 26 Feb 2013)


Log Message
Remove nonexistent StringPairVector.h from Target.pri after r142839

Unreviewed gardening.

* Target.pri:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Target.pri




Diff

Modified: trunk/Source/WebKit2/ChangeLog (144065 => 144066)

--- trunk/Source/WebKit2/ChangeLog	2013-02-26 17:08:05 UTC (rev 144065)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-26 17:15:38 UTC (rev 144066)
@@ -1,3 +1,11 @@
+2013-02-26  Andras Becsi  andras.be...@digia.com
+
+Remove nonexistent StringPairVector.h from Target.pri after r142839
+
+Unreviewed gardening.
+
+* Target.pri:
+
 2013-02-26  Simon Hausmann  simon.hausm...@digia.com
 
 Unreviewed trivial !ENABLE(NETSCAPE_PLUGIN_API) build fix


Modified: trunk/Source/WebKit2/Target.pri (144065 => 144066)

--- trunk/Source/WebKit2/Target.pri	2013-02-26 17:08:05 UTC (rev 144065)
+++ trunk/Source/WebKit2/Target.pri	2013-02-26 17:15:38 UTC (rev 144066)
@@ -101,7 +101,6 @@
 Shared/SecurityOriginData.h \
 Shared/SessionState.h \
 Shared/StatisticsData.h \
-Shared/StringPairVector.h \
 Shared/UpdateInfo.h \
 Shared/UserMessageCoders.h \
 Shared/VisitedLinkTable.h \






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143935] trunk/Source/WebKit2

[abecsi]

Title: [143935] trunk/Source/WebKit2








Revision 143935
Author abe...@webkit.org
Date 2013-02-25 09:14:01 -0800 (Mon, 25 Feb 2013)


Log Message
[Qt][WK2] Remove unneeded method didResumeContent from PageViewportController clients
https://bugs.webkit.org/show_bug.cgi?id=110751

Reviewed by Jocelyn Turcotte.

This is a clean-up in the PageViewportController clients that removes leftover
code from previous design that is partially unused and unnecessary, to simplify
the interaction between PageViewportController and clients.

* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::resumeContent):
* UIProcess/PageViewportControllerClient.h:
(PageViewportControllerClient):
* UIProcess/efl/PageViewportControllerClientEfl.cpp:
* UIProcess/efl/PageViewportControllerClientEfl.h:
(PageViewportControllerClientEfl):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::animateContentRectVisible):
(WebKit::PageViewportControllerClientQt::flickMoveEnded):
(WebKit::PageViewportControllerClientQt::resumeAndUpdateContent):
(WebKit::PageViewportControllerClientQt::pinchGestureCancelled):
* UIProcess/qt/PageViewportControllerClientQt.h:
(PageViewportControllerClientQt):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp
trunk/Source/WebKit2/UIProcess/PageViewportControllerClient.h
trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp
trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (143934 => 143935)

--- trunk/Source/WebKit2/ChangeLog	2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-25 17:14:01 UTC (rev 143935)
@@ -1,3 +1,29 @@
+2013-02-25  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Remove unneeded method didResumeContent from PageViewportController clients
+https://bugs.webkit.org/show_bug.cgi?id=110751
+
+Reviewed by Jocelyn Turcotte.
+
+This is a clean-up in the PageViewportController clients that removes leftover
+code from previous design that is partially unused and unnecessary, to simplify
+the interaction between PageViewportController and clients.
+
+* UIProcess/PageViewportController.cpp:
+(WebKit::PageViewportController::resumeContent):
+* UIProcess/PageViewportControllerClient.h:
+(PageViewportControllerClient):
+* UIProcess/efl/PageViewportControllerClientEfl.cpp:
+* UIProcess/efl/PageViewportControllerClientEfl.h:
+(PageViewportControllerClientEfl):
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::animateContentRectVisible):
+(WebKit::PageViewportControllerClientQt::flickMoveEnded):
+(WebKit::PageViewportControllerClientQt::resumeAndUpdateContent):
+(WebKit::PageViewportControllerClientQt::pinchGestureCancelled):
+* UIProcess/qt/PageViewportControllerClientQt.h:
+(PageViewportControllerClientQt):
+
 2013-02-25  Andreas Kling  akl...@apple.com
 
 Reduce amount of code that includes StylePropertySet.h


Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (143934 => 143935)

--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2013-02-25 17:14:01 UTC (rev 143935)
@@ -316,8 +316,6 @@
 
 void PageViewportController::resumeContent()
 {
-m_client-didResumeContent();
-
 if (!m_hasSuspendedContent)
 return;
 


Modified: trunk/Source/WebKit2/UIProcess/PageViewportControllerClient.h (143934 => 143935)

--- trunk/Source/WebKit2/UIProcess/PageViewportControllerClient.h	2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/PageViewportControllerClient.h	2013-02-25 17:14:01 UTC (rev 143935)
@@ -41,7 +41,6 @@
 virtual void setViewportPosition(const WebCore::FloatPoint contentsPoint) = 0;
 virtual void setPageScaleFactor(float) = 0;
 
-virtual void didResumeContent() = 0;
 virtual void didChangeContentsSize(const WebCore::IntSize) = 0;
 virtual void didChangeVisibleContents() = 0;
 virtual void didChangeViewportAttributes() = 0;


Modified: trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp (143934 => 143935)

--- trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp	2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp	2013-02-25 17:14:01 UTC (rev 143935)
@@ -63,12 +63,6 @@
 m_view-setPageScaleFactor(newScale);
 }
 
-void PageViewportControllerClientEfl::didResumeContent()
-{
-ASSERT(m_controller);
-m_controller-didChangeContentsVisibility(m_contentPosition, 

[webkit-changes] [143452] trunk/Tools

[abecsi]

Title: [143452] trunk/Tools








Revision 143452
Author abe...@webkit.org
Date 2013-02-20 04:36:45 -0800 (Wed, 20 Feb 2013)


Log Message
[Qt] Make debug builds possible on 32bit Linux
https://bugs.webkit.org/show_bug.cgi?id=110231

Reviewed by Tor Arne Vestbø.

Use the stabs format for debug builds to make the object files
a bit smaller so that they can be linked on a 32bit system.

* qmake/mkspecs/features/unix/default_post.prf:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/unix/default_post.prf




Diff

Modified: trunk/Tools/ChangeLog (143451 => 143452)

--- trunk/Tools/ChangeLog	2013-02-20 12:33:20 UTC (rev 143451)
+++ trunk/Tools/ChangeLog	2013-02-20 12:36:45 UTC (rev 143452)
@@ -1,3 +1,15 @@
+2013-02-20  Andras Becsi  andras.be...@digia.com
+
+[Qt] Make debug builds possible on 32bit Linux
+https://bugs.webkit.org/show_bug.cgi?id=110231
+
+Reviewed by Tor Arne Vestbø.
+
+Use the stabs format for debug builds to make the object files
+a bit smaller so that they can be linked on a 32bit system.
+
+* qmake/mkspecs/features/unix/default_post.prf:
+
 2013-02-20  Takashi Toyoshima  toyos...@chromium.org
 
 Unreviewed. Add myself to watch lists.


Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (143451 => 143452)

--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf	2013-02-20 12:33:20 UTC (rev 143451)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf	2013-02-20 12:36:45 UTC (rev 143452)
@@ -10,6 +10,10 @@
 linux-g++*:isEqual(QT_ARCH,i386) {
 QMAKE_CFLAGS += -march=pentium4 -msse2 -mfpmath=sse
 QMAKE_CXXFLAGS += -march=pentium4 -msse2 -mfpmath=sse
+
+# Use the stabs format for 32 bit debug builds to make the object files a bit smaller.
+QMAKE_CXXFLAGS_DEBUG -= -g
+QMAKE_CXXFLAGS_DEBUG += -gstabs
 }
 
 linux-*g++* {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143462] trunk/Source/WebCore

[abecsi]

Title: [143462] trunk/Source/WebCore








Revision 143462
Author abe...@webkit.org
Date 2013-02-20 07:27:22 -0800 (Wed, 20 Feb 2013)


Log Message
[Qt] Rename AncestorChainWalker.h to EventPathWalker.h in the project file.

Unreviewed gardening.

AncestorChainWalker has been renamed to EventPathWalker in r143422.
Rename the header in the project file as well so that it shows up in QtCreator.

No new tests needed.

* Target.pri:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri




Diff

Modified: trunk/Source/WebCore/ChangeLog (143461 => 143462)

--- trunk/Source/WebCore/ChangeLog	2013-02-20 15:24:26 UTC (rev 143461)
+++ trunk/Source/WebCore/ChangeLog	2013-02-20 15:27:22 UTC (rev 143462)
@@ -1,3 +1,16 @@
+2013-02-20  Andras Becsi  andras.be...@digia.com
+
+[Qt] Rename AncestorChainWalker.h to EventPathWalker.h in the project file.
+
+Unreviewed gardening.
+
+AncestorChainWalker has been renamed to EventPathWalker in r143422.
+Rename the header in the project file as well so that it shows up in QtCreator.
+
+No new tests needed.
+
+* Target.pri:
+
 2013-02-20  Ilya Tikhonovsky  loi...@chromium.org
 
 Web Inspector: fix for frontend closure compile errors.


Modified: trunk/Source/WebCore/Target.pri (143461 => 143462)

--- trunk/Source/WebCore/Target.pri	2013-02-20 15:24:26 UTC (rev 143461)
+++ trunk/Source/WebCore/Target.pri	2013-02-20 15:27:22 UTC (rev 143462)
@@ -1589,7 +1589,6 @@
 css/WebKitCSSTransformValue.h \
 css/WebKitCSSViewportRule.h \
 dom/ActiveDOMObject.h \
-dom/AncestorChainWalker.h \
 dom/Attr.h \
 dom/Attribute.h \
 dom/BeforeTextInsertedEvent.h \
@@ -1640,6 +1639,7 @@
 dom/EventDispatchMediator.h \
 dom/EventListenerMap.h \
 dom/EventNames.h \
+dom/EventPathWalker.h \
 dom/EventQueue.h \
 dom/EventSender.h \
 dom/EventTarget.h \






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143335] trunk/Source/WebKit2

[abecsi]

Title: [143335] trunk/Source/WebKit2








Revision 143335
Author abe...@webkit.org
Date 2013-02-19 08:26:25 -0800 (Tue, 19 Feb 2013)


Log Message
[Qt][WK2] ASSERT(node) hit in WebPage::findZoomableAreaForPoint if no zoomable area found
https://bugs.webkit.org/show_bug.cgi?id=110220

Reviewed by Allan Sandfeld Jensen.

If EventHandler::bestZoomableAreaForTouchPoint was unsuccessfull, eg.
no node was found for a given point, we hit ASSERT(node).
We should only assert for a valid node if a zoomable area was found.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::findZoomableAreaForPoint):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (143334 => 143335)

--- trunk/Source/WebKit2/ChangeLog	2013-02-19 16:12:47 UTC (rev 143334)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-19 16:26:25 UTC (rev 143335)
@@ -1,3 +1,17 @@
+2013-02-19  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] ASSERT(node) hit in WebPage::findZoomableAreaForPoint if no zoomable area found
+https://bugs.webkit.org/show_bug.cgi?id=110220
+
+Reviewed by Allan Sandfeld Jensen.
+
+If EventHandler::bestZoomableAreaForTouchPoint was unsuccessfull, eg.
+no node was found for a given point, we hit ASSERT(node).
+We should only assert for a valid node if a zoomable area was found.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::findZoomableAreaForPoint):
+
 2013-02-19  Christophe Dumez  ch.du...@sisa.samsung.com
 
 Regression(r143273): Caused a lot of tests to time out


Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (143334 => 143335)

--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2013-02-19 16:12:47 UTC (rev 143334)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2013-02-19 16:26:25 UTC (rev 143335)
@@ -3015,11 +3015,12 @@
 Node* node = 0;
 IntRect zoomableArea;
 bool foundAreaForTouchPoint = m_mainFrame-coreFrame()-eventHandler()-bestZoomableAreaForTouchPoint(point, IntSize(area.width() / 2, area.height() / 2), zoomableArea, node);
-ASSERT(node);
 
 if (!foundAreaForTouchPoint)
 return;
 
+ASSERT(node);
+
 if (node-document()  node-document()-view())
 zoomableArea = node-document()-view()-contentsToWindow(zoomableArea);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143350] trunk/Source/WebCore

[abecsi]

Title: [143350] trunk/Source/WebCore








Revision 143350
Author abe...@webkit.org
Date 2013-02-19 10:07:17 -0800 (Tue, 19 Feb 2013)


Log Message
[Qt] Fix compilation if Qt was configured with -no-rtti
https://bugs.webkit.org/show_bug.cgi?id=110234

Reviewed by Noam Rosenthal.

Availability of dynamic_cast should be checked.

* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::updateBackingStoreIfNeeded):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (143349 => 143350)

--- trunk/Source/WebCore/ChangeLog	2013-02-19 18:05:47 UTC (rev 143349)
+++ trunk/Source/WebCore/ChangeLog	2013-02-19 18:07:17 UTC (rev 143350)
@@ -1,3 +1,15 @@
+2013-02-19  Andras Becsi  andras.be...@digia.com
+
+[Qt] Fix compilation if Qt was configured with -no-rtti
+https://bugs.webkit.org/show_bug.cgi?id=110234
+
+Reviewed by Noam Rosenthal.
+
+Availability of dynamic_cast should be checked.
+
+* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+(WebCore::GraphicsLayerTextureMapper::updateBackingStoreIfNeeded):
+
 2013-02-18  Alexey Proskuryakov  a...@apple.com
 
 Unregistered blob URLs have incorrect MIME type


Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (143349 => 143350)

--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2013-02-19 18:05:47 UTC (rev 143349)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2013-02-19 18:07:17 UTC (rev 143350)
@@ -581,7 +581,7 @@
 if (dirtyRect.isEmpty())
 return;
 
-#if PLATFORM(QT)
+#if PLATFORM(QT)  !defined(QT_NO_DYNAMIC_CAST)
 ASSERT(dynamic_castTextureMapperTiledBackingStore*(m_backingStore.get()));
 #endif
 TextureMapperTiledBackingStore* backingStore = static_castTextureMapperTiledBackingStore*(m_backingStore.get());






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [143195] trunk/Source/WebKit2

[abecsi]

Title: [143195] trunk/Source/WebKit2








Revision 143195
Author abe...@webkit.org
Date 2013-02-18 04:54:03 -0800 (Mon, 18 Feb 2013)


Log Message
[Qt][WK2] Changing WebView.contentY and WebView.contentX does not redraw content
https://bugs.webkit.org/show_bug.cgi?id=108337

Reviewed by Jocelyn Turcotte.

We should not ignore content position changes unless pinch zoom or bounce-back
animation is ongoing.
This way we notify the web process about visible rect changes if the contentX
and contentY properties are used to programmatically scroll the content from QML.
One important usecase for this is when implementing scrollbars.

* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):
(WebKit::PageViewportControllerClientQt::flickMoveStarted):
(WebKit::PageViewportControllerClientQt::flickMoveEnded):
(WebKit::PageViewportControllerClientQt::pageItemPositionChanged):
(WebKit::PageViewportControllerClientQt::scaleAnimationStateChanged):
(WebKit::PageViewportControllerClientQt::pinchGestureStarted):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (143194 => 143195)

--- trunk/Source/WebKit2/ChangeLog	2013-02-18 12:11:58 UTC (rev 143194)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-18 12:54:03 UTC (rev 143195)
@@ -1,3 +1,24 @@
+2013-02-18  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Changing WebView.contentY and WebView.contentX does not redraw content
+https://bugs.webkit.org/show_bug.cgi?id=108337
+
+Reviewed by Jocelyn Turcotte.
+
+We should not ignore content position changes unless pinch zoom or bounce-back
+animation is ongoing.
+This way we notify the web process about visible rect changes if the contentX
+and contentY properties are used to programmatically scroll the content from QML.
+One important usecase for this is when implementing scrollbars.
+
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):
+(WebKit::PageViewportControllerClientQt::flickMoveStarted):
+(WebKit::PageViewportControllerClientQt::flickMoveEnded):
+(WebKit::PageViewportControllerClientQt::pageItemPositionChanged):
+(WebKit::PageViewportControllerClientQt::scaleAnimationStateChanged):
+(WebKit::PageViewportControllerClientQt::pinchGestureStarted):
+
 2013-02-18  Grzegorz Czajkowski  g.czajkow...@samsung.com
 
 [WK2][EFL] Unified text checker implementation


Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (143194 => 143195)

--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-02-18 12:11:58 UTC (rev 143194)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-02-18 12:54:03 UTC (rev 143195)
@@ -46,7 +46,7 @@
 , m_lastCommittedScale(-1)
 , m_zoomOutScale(0)
 , m_isUserInteracting(false)
-, m_ignoreViewportChanges(true)
+, m_ignoreViewportChanges(false)
 {
 m_scaleAnimation-setDuration(kScaleAnimationDurationMillis);
 m_scaleAnimation-setEasingCurve(QEasingCurve::OutCubic);
@@ -124,15 +124,12 @@
 m_controller-suspendContent();
 
 m_lastScrollPosition = m_viewportItem-contentPos();
-
-m_ignoreViewportChanges = false;
 }
 
 void PageViewportControllerClientQt::flickMoveEnded()
 {
 // This method is called on the end of the pan or pan kinetic animation.
 
-m_ignoreViewportChanges = true;
 if (!m_isUserInteracting)
 m_controller-resumeContent();
 }
@@ -153,10 +150,12 @@
 {
 switch (newState) {
 case QAbstractAnimation::Running:
+m_ignoreViewportChanges = true;
 m_viewportItem-cancelFlick();
 m_controller-suspendContent();
 break;
 case QAbstractAnimation::Stopped:
+m_ignoreViewportChanges = false;
 m_controller-resumeContent();
 break;
 default:
@@ -318,8 +317,8 @@
 void PageViewportControllerClientQt::setViewportPosition(const FloatPoint contentsPoint)
 {
 QPointF newPosition((m_pageItem-position() + QPointF(contentsPoint)) * m_pageItem-contentsScale());
+// The contentX and contentY property changes trigger a visible rect update.
 m_viewportItem-setContentPos(newPosition);
-updateViewportController();
 }
 
 void PageViewportControllerClientQt::setPageScaleFactor(float localScale)
@@ -423,6 +422,7 @@
 
 clearRelativeZoomState();
 
+m_ignoreViewportChanges = true;
 m_controller-suspendContent();
 
 m_lastPinchCenterInViewportCoordinates = pinchCenterInViewportCoordinates;
@@ -457,6 +457,7 @@
 if (!m_controller-allowsUserScaling())
 return;
 
+m_ignoreViewportChanges = false;
 m_pinchStartScale = -1;
 
 // This will take care of resuming the content, even if no animation was performed.

[webkit-changes] [142088] trunk

[abecsi]

Title: [142088] trunk








Revision 142088
Author abe...@webkit.org
Date 2013-02-07 03:02:10 -0800 (Thu, 07 Feb 2013)


Log Message
[Qt] Use GNU ar's thin archive format for intermediate static libs
https://bugs.webkit.org/show_bug.cgi?id=109052

Reviewed by Jocelyn Turcotte.

Source/_javascript_Core:

Adjust project files that used activeBuildConfig()
to use targetSubDir().

* _javascript_Core.pri:
* LLIntOffsetsExtractor.pro:
* Target.pri:

Tools:

With debug builds we exceed the 4GiB limit of GNU ar when creating the WebCore
intermediate static library which results in build failure even with a x86_64
toolchain (http://sourceware.org/bugzilla/show_bug.cgi?id=14625).

When using a GNU toolchain we can use the thin archive format for these static
libraries which also has the benefit of not copying the object files, thus
drastically reducing disk usage and overall compile time.

Currently qmake does not support GNU ar's thin archive format so for
now we need to do the magic in the build system as a stopgap solution.

* qmake/mkspecs/features/configure.prf:
* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/functions.prf:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.pri
trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro
trunk/Source/_javascript_Core/Target.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/configure.prf
trunk/Tools/qmake/mkspecs/features/default_post.prf
trunk/Tools/qmake/mkspecs/features/functions.prf




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (142087 => 142088)

--- trunk/Source/_javascript_Core/ChangeLog	2013-02-07 11:01:31 UTC (rev 142087)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-02-07 11:02:10 UTC (rev 142088)
@@ -1,3 +1,17 @@
+2013-02-07  Andras Becsi  andras.be...@digia.com
+
+[Qt] Use GNU ar's thin archive format for intermediate static libs
+https://bugs.webkit.org/show_bug.cgi?id=109052
+
+Reviewed by Jocelyn Turcotte.
+
+Adjust project files that used activeBuildConfig()
+to use targetSubDir().
+
+* _javascript_Core.pri:
+* LLIntOffsetsExtractor.pro:
+* Target.pri:
+
 2013-02-06  Roger Fong  roger_f...@apple.com
 
 Unreviewed. Touchups to VS2010 WebKit solution.


Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (142087 => 142088)

--- trunk/Source/_javascript_Core/_javascript_Core.pri	2013-02-07 11:01:31 UTC (rev 142087)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri	2013-02-07 11:02:10 UTC (rev 142088)
@@ -33,7 +33,7 @@
 $$_javascript_CORE_GENERATED_SOURCES_DIR
 
 # Pick up the right version of LLIntAssembly.h
-macx: INCLUDEPATH += $$_javascript_CORE_GENERATED_SOURCES_DIR/$$activeBuildConfig()
+macx: INCLUDEPATH += $$_javascript_CORE_GENERATED_SOURCES_DIR/$$targetSubDir()
 
 win32-*: LIBS += -lwinmm
 


Modified: trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro (142087 => 142088)

--- trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro	2013-02-07 11:01:31 UTC (rev 142087)
+++ trunk/Source/_javascript_Core/LLIntOffsetsExtractor.pro	2013-02-07 11:02:10 UTC (rev 142088)
@@ -8,7 +8,7 @@
 TEMPLATE = app
 TARGET = LLIntOffsetsExtractor
 
-macx: DESTDIR = $$activeBuildConfig()
+macx: DESTDIR = $$targetSubDir()
 
 debug_and_release {
 CONFIG += force_build_all


Modified: trunk/Source/_javascript_Core/Target.pri (142087 => 142088)

--- trunk/Source/_javascript_Core/Target.pri	2013-02-07 11:01:31 UTC (rev 142087)
+++ trunk/Source/_javascript_Core/Target.pri	2013-02-07 11:02:10 UTC (rev 142088)
@@ -30,7 +30,7 @@
 
 INSTALLDEPS += all
 
-debug_and_release: INCLUDEPATH += $$_javascript_CORE_GENERATED_SOURCES_DIR/$$activeBuildConfig()
+debug_and_release: INCLUDEPATH += $$_javascript_CORE_GENERATED_SOURCES_DIR/$$targetSubDir()
 
 SOURCES += \
 API/JSBase.cpp \


Modified: trunk/Tools/ChangeLog (142087 => 142088)

--- trunk/Tools/ChangeLog	2013-02-07 11:01:31 UTC (rev 142087)
+++ trunk/Tools/ChangeLog	2013-02-07 11:02:10 UTC (rev 142088)
@@ -1,3 +1,25 @@
+2013-02-07  Andras Becsi  andras.be...@digia.com
+
+[Qt] Use GNU ar's thin archive format for intermediate static libs
+https://bugs.webkit.org/show_bug.cgi?id=109052
+
+Reviewed by Jocelyn Turcotte.
+
+With debug builds we exceed the 4GiB limit of GNU ar when creating the WebCore
+intermediate static library which results in build failure even with a x86_64
+toolchain (http://sourceware.org/bugzilla/show_bug.cgi?id=14625).
+
+When using a GNU toolchain we can use the thin archive format for these static
+libraries which also has the benefit of not copying the object files, thus
+drastically reducing disk usage and overall compile time.
+
+Currently qmake does not support GNU ar's thin archive format so for
+now we need to do the magic in the build system as a stopgap solution.
+
+* 

[webkit-changes] [140917] trunk/Source/WTF

[abecsi]

Title: [140917] trunk/Source/WTF








Revision 140917
Author abe...@webkit.org
Date 2013-01-26 14:55:56 -0800 (Sat, 26 Jan 2013)


Log Message
Unreviewed fix after r140451 to make GIT-SVN repositories happy.

* WTF.vcproj/WTF.sln:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.vcproj/WTF.sln




Diff

Modified: trunk/Source/WTF/ChangeLog (140916 => 140917)

--- trunk/Source/WTF/ChangeLog	2013-01-26 22:24:08 UTC (rev 140916)
+++ trunk/Source/WTF/ChangeLog	2013-01-26 22:55:56 UTC (rev 140917)
@@ -1,3 +1,9 @@
+2013-01-26  Andras Becsi  andras.be...@digia.com
+
+Unreviewed fix after r140451 to make GIT-SVN repositories happy.
+
+* WTF.vcproj/WTF.sln:
+
 2013-01-26  Justin Schuh  jsc...@chromium.org
 
 [CHROMIUM] Suppress more c4267 build warnings for Win64 targets


Modified: trunk/Source/WTF/WTF.vcproj/WTF.sln (140916 => 140917)

--- trunk/Source/WTF/WTF.vcproj/WTF.sln	2013-01-26 22:24:08 UTC (rev 140916)
+++ trunk/Source/WTF/WTF.vcproj/WTF.sln	2013-01-26 22:55:56 UTC (rev 140917)
@@ -1,46 +1,46 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = WTFGenerated, WTFGenerated.vcxproj, {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}
-EndProject
-Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = WTF, WTF.vcxproj, {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_All|Win32 = Debug_All|Win32
-		Debug_Cairo_CFLite|Win32 = Debug_Cairo_CFLite|Win32
-		Debug|Win32 = Debug|Win32
-		Production|Win32 = Production|Win32
-		Release_Cairo_CFLite|Win32 = Release_Cairo_CFLite|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug|Win32.Build.0 = Debug|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Production|Win32.ActiveCfg = Production|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Production|Win32.Build.0 = Production|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release|Win32.ActiveCfg = Release|Win32
-		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Release|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Production|Win32.ActiveCfg = Production|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Production|Win32.Build.0 = Production|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = WTFGenerated, WTFGenerated.vcxproj, {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}
+EndProject
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = WTF, WTF.vcxproj, {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_All|Win32 = Debug_All|Win32
+		Debug_Cairo_CFLite|Win32 = Debug_Cairo_CFLite|Win32
+		Debug|Win32 = Debug|Win32
+		Production|Win32 = Production|Win32
+		Release_Cairo_CFLite|Win32 = Release_Cairo_CFLite|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+		{5AE5F5E4-782D-4F63-B4D7-3977B52B9950}.Debug_All|Win32.Build.0 = 

[webkit-changes] [140684] trunk/Source/WebKit2

[abecsi]

Title: [140684] trunk/Source/WebKit2








Revision 140684
Author abe...@webkit.org
Date 2013-01-24 08:08:51 -0800 (Thu, 24 Jan 2013)


Log Message
Remove nonexistent header from WebKit2/Target.pri

Unreviewed cleanup after r139919.

* Target.pri:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Target.pri




Diff

Modified: trunk/Source/WebKit2/ChangeLog (140683 => 140684)

--- trunk/Source/WebKit2/ChangeLog	2013-01-24 15:48:52 UTC (rev 140683)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-24 16:08:51 UTC (rev 140684)
@@ -1,3 +1,11 @@
+2013-01-24  Andras Becsi  andras.be...@digia.com
+
+Remove nonexistent header from WebKit2/Target.pri
+
+Unreviewed cleanup after r139919.
+
+* Target.pri:
+
 2013-01-24  Michael Brüning  michael.brun...@digia.com
 
 [Qt][WK2] Pages / resources cannot be loaded from qrc files.


Modified: trunk/Source/WebKit2/Target.pri (140683 => 140684)

--- trunk/Source/WebKit2/Target.pri	2013-01-24 15:48:52 UTC (rev 140683)
+++ trunk/Source/WebKit2/Target.pri	2013-01-24 16:08:51 UTC (rev 140684)
@@ -22,7 +22,6 @@
 Platform/CoreIPC/Attachment.h \
 Platform/CoreIPC/BinarySemaphore.h \
 Platform/CoreIPC/Connection.h \
-Platform/CoreIPC/CoreIPCMessageKinds.h \
 Platform/CoreIPC/DataReference.h \
 Platform/CoreIPC/HandleMessage.h \
 Platform/CoreIPC/MessageDecoder.h \






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [139727] trunk/Tools

[abecsi]

Title: [139727] trunk/Tools








Revision 139727
Author abe...@webkit.org
Date 2013-01-15 01:33:54 -0800 (Tue, 15 Jan 2013)


Log Message
[Qt] Fix ImageDiff's image format conversion
https://bugs.webkit.org/show_bug.cgi?id=106880

Reviewed by Csaba Osztrogonác.

Besides actually doing the conversion this also silences the suspicious warning:
ignoring return value of function declared with warn_unused_result attribute.

* ImageDiff/qt/ImageDiff.cpp:
(main): QImage::convertToFormat, contrary to the assumed behaviour, returns a
copy of the image in the given format and does not alter the image itself.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/ImageDiff/qt/ImageDiff.cpp




Diff

Modified: trunk/Tools/ChangeLog (139726 => 139727)

--- trunk/Tools/ChangeLog	2013-01-15 09:06:01 UTC (rev 139726)
+++ trunk/Tools/ChangeLog	2013-01-15 09:33:54 UTC (rev 139727)
@@ -1,3 +1,17 @@
+2013-01-15  Andras Becsi  andras.be...@digia.com
+
+[Qt] Fix ImageDiff's image format conversion
+https://bugs.webkit.org/show_bug.cgi?id=106880
+
+Reviewed by Csaba Osztrogonác.
+
+Besides actually doing the conversion this also silences the suspicious warning:
+ignoring return value of function declared with warn_unused_result attribute.
+
+* ImageDiff/qt/ImageDiff.cpp:
+(main): QImage::convertToFormat, contrary to the assumed behaviour, returns a
+copy of the image in the given format and does not alter the image itself.
+
 2013-01-15  Jochen Eisinger  joc...@chromium.org
 
 [chromium] move remaining methods that just set a boolean flag to TestRunner library


Modified: trunk/Tools/ImageDiff/qt/ImageDiff.cpp (139726 => 139727)

--- trunk/Tools/ImageDiff/qt/ImageDiff.cpp	2013-01-15 09:06:01 UTC (rev 139726)
+++ trunk/Tools/ImageDiff/qt/ImageDiff.cpp	2013-01-15 09:33:54 UTC (rev 139727)
@@ -70,7 +70,7 @@
 // Convert into QImage
 QImage decodedImage;
 decodedImage.loadFromData(data.data(), PNG);
-decodedImage.convertToFormat(QImage::Format_ARGB32);
+decodedImage = decodedImage.convertToFormat(QImage::Format_ARGB32);
 
 // Place it in the right place
 if (actualImage.isNull())






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [139446] trunk/Source/WebCore

[abecsi]

Title: [139446] trunk/Source/WebCore








Revision 139446
Author abe...@webkit.org
Date 2013-01-11 07:55:02 -0800 (Fri, 11 Jan 2013)


Log Message
[Qt] Fix the build if libxslt is not available but libxml2 is
https://bugs.webkit.org/show_bug.cgi?id=106661

Reviewed by Simon Hausmann.

On Linux building the xml parser sources fails if the needed libxslt
dependencies are not installed but libxml2 is.

* WebCore.pri: add libxml2 to pkg-config if not on mac.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.pri




Diff

Modified: trunk/Source/WebCore/ChangeLog (139445 => 139446)

--- trunk/Source/WebCore/ChangeLog	2013-01-11 15:41:11 UTC (rev 139445)
+++ trunk/Source/WebCore/ChangeLog	2013-01-11 15:55:02 UTC (rev 139446)
@@ -1,3 +1,15 @@
+2013-01-11  Andras Becsi  andras.be...@digia.com
+
+[Qt] Fix the build if libxslt is not available but libxml2 is
+https://bugs.webkit.org/show_bug.cgi?id=106661
+
+Reviewed by Simon Hausmann.
+
+On Linux building the xml parser sources fails if the needed libxslt
+dependencies are not installed but libxml2 is.
+
+* WebCore.pri: add libxml2 to pkg-config if not on mac.
+
 2013-01-11  Stephen Chenney  schen...@chromium.org
 Objects can be re-added to the AXObjectCache during removal
 https://bugs.webkit.org/show_bug.cgi?id=104171


Modified: trunk/Source/WebCore/WebCore.pri (139445 => 139446)

--- trunk/Source/WebCore/WebCore.pri	2013-01-11 15:41:11 UTC (rev 139445)
+++ trunk/Source/WebCore/WebCore.pri	2013-01-11 15:55:02 UTC (rev 139446)
@@ -116,6 +116,8 @@
 } else {
 QT *= xmlpatterns
 }
+} else:!mac:use?(LIBXML2) {
+PKGCONFIG += libxml-2.0
 }
 
 use?(ZLIB) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [139189] trunk/Source/WebKit2

[abecsi]

Title: [139189] trunk/Source/WebKit2








Revision 139189
Author abe...@webkit.org
Date 2013-01-09 05:59:48 -0800 (Wed, 09 Jan 2013)


Log Message
[Qt][EFL][WK2] Remove redundant device pixel ratio adjustment from PageViewportController
https://bugs.webkit.org/show_bug.cgi?id=106355

Reviewed by Kenneth Rohde Christiansen.

Since r137597 Qt uses the device pixel ratio of the underlying
platform window as the device pixel ratio in WebCore.
The tiles are rendered with the effective scale (scale adjusted with
the device scale factor) and the projection matrix is also adjusted
with the device pixel ratio when painting.
As a result we can follow the same approach as QtQuick and all the
coordinates in PageViewportController need to be in device independent
pixels (UI pixels) thus we do no longer need to adjust with the device
pixel ratio when calculating the viewport attributes.
This simplifies the logic significantly and increases robustness,
but does not allow to set a custom device pixel ratio different from
the factor of the underlying platform (eg. for testing purposes).
This patch is conceptually a follow-up of r137597 and fixes layout
and canvas size on retina display.

* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::PageViewportController):
(WebKit::PageViewportController::innerBoundedViewportScale):
(WebKit::PageViewportController::outerBoundedViewportScale):
(WebKit::PageViewportController::pixelAlignedFloatPoint):
(WebKit::PageViewportController::boundContentsPosition):
(WebKit::PageViewportController::didRenderFrame):
(WebKit::PageViewportController::pageTransitionViewportReady):
(WebKit::PageViewportController::didChangeContentsVisibility):
(WebKit::PageViewportController::syncVisibleContents):
(WebKit::PageViewportController::visibleContentsSize):
(WebKit::PageViewportController::applyScaleAfterRenderingContents):
(WebKit::PageViewportController::updateMinimumScaleToFit):
* UIProcess/PageViewportController.h:
(WebKit::PageViewportController::currentContentsScale):
(PageViewportController):
* UIProcess/efl/PageViewportControllerClientEfl.cpp:
(WebKit::PageViewportControllerClientEfl::updateViewportSize):
Adjust the viewport size with the device pixel ratio to keep previous
behaviour.
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::focusEditableArea):
(WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):
* UIProcess/qt/QtWebPageSGNode.cpp:
(WebKit::ContentsSGNode::clipRect):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::sendViewportAttributesChanged):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp
trunk/Source/WebKit2/UIProcess/PageViewportController.h
trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (139188 => 139189)

--- trunk/Source/WebKit2/ChangeLog	2013-01-09 13:33:47 UTC (rev 139188)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-09 13:59:48 UTC (rev 139189)
@@ -1,3 +1,53 @@
+2013-01-09  Andras Becsi  andras.be...@digia.com
+
+[Qt][EFL][WK2] Remove redundant device pixel ratio adjustment from PageViewportController
+https://bugs.webkit.org/show_bug.cgi?id=106355
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Since r137597 Qt uses the device pixel ratio of the underlying
+platform window as the device pixel ratio in WebCore.
+The tiles are rendered with the effective scale (scale adjusted with
+the device scale factor) and the projection matrix is also adjusted
+with the device pixel ratio when painting.
+As a result we can follow the same approach as QtQuick and all the
+coordinates in PageViewportController need to be in device independent
+pixels (UI pixels) thus we do no longer need to adjust with the device
+pixel ratio when calculating the viewport attributes.
+This simplifies the logic significantly and increases robustness,
+but does not allow to set a custom device pixel ratio different from
+the factor of the underlying platform (eg. for testing purposes).
+This patch is conceptually a follow-up of r137597 and fixes layout
+and canvas size on retina display.
+
+* UIProcess/PageViewportController.cpp:
+(WebKit::PageViewportController::PageViewportController):
+(WebKit::PageViewportController::innerBoundedViewportScale):
+(WebKit::PageViewportController::outerBoundedViewportScale):
+(WebKit::PageViewportController::pixelAlignedFloatPoint):
+(WebKit::PageViewportController::boundContentsPosition):
+(WebKit::PageViewportController::didRenderFrame):
+

[webkit-changes] [139215] trunk/Source/WebKit2

[abecsi]

Title: [139215] trunk/Source/WebKit2








Revision 139215
Author abe...@webkit.org
Date 2013-01-09 11:36:21 -0800 (Wed, 09 Jan 2013)


Log Message
[Qt][WK2] Fix a typo in in the double-tap-to-zoom logic

Rubber-stamped by Csaba Osztrogonác.

The qMin for the upper boundary of the scale was accidentally
changed to qMax in r139189, change it back to fix the Qt API tests.

* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (139214 => 139215)

--- trunk/Source/WebKit2/ChangeLog	2013-01-09 19:36:06 UTC (rev 139214)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-09 19:36:21 UTC (rev 139215)
@@ -1,5 +1,17 @@
 2013-01-09  Andras Becsi  andras.be...@digia.com
 
+[Qt][WK2] Fix a typo in in the double-tap-to-zoom logic
+
+Rubber-stamped by Csaba Osztrogonác.
+
+The qMin for the upper boundary of the scale was accidentally
+changed to qMax in r139189, change it back to fix the Qt API tests.
+
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):
+
+2013-01-09  Andras Becsi  andras.be...@digia.com
+
 [Qt][EFL][WK2] Remove redundant device pixel ratio adjustment from PageViewportController
 https://bugs.webkit.org/show_bug.cgi?id=106355
 


Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (139214 => 139215)

--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-01-09 19:36:06 UTC (rev 139214)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2013-01-09 19:36:21 UTC (rev 139215)
@@ -228,7 +228,7 @@
 
 const qreal minViewportScale = qreal(2.5);
 qreal targetScale = viewportRect.size().width() / endArea.size().width();
-targetScale = m_controller-innerBoundedViewportScale(qMax(minViewportScale, targetScale));
+targetScale = m_controller-innerBoundedViewportScale(qMin(minViewportScale, targetScale));
 qreal currentScale = m_pageItem-contentsScale();
 
 // We want to end up with the target area filling the whole width of the viewport (if possible),






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [137597] trunk

[abecsi]

Title: [137597] trunk








Revision 137597
Author abe...@webkit.org
Date 2012-12-13 08:08:49 -0800 (Thu, 13 Dec 2012)


Log Message
[Qt][WK2] Fix painting on Mac with retina display
https://bugs.webkit.org/show_bug.cgi?id=104574

Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

Since HiDPI support has been added and enabled in Qt we ended up
painting incorrectly scaled content on high-resolution screens.
Because the intrinsic device pixel ratio is always taken into
account by Qt when painting to high-resolution screens we should
automatically obtain the scale ratio from the window in which the
item is rendered instead of setting it in QML.

Qt does not make it possible to override the device pixel ratio
of the native window, therefore our experimental QML API for setting
a custom value is of no use any more and should be removed.

This patch fixes the scaling issue on Mac retina display by querying
the underlying window for the device scale factor and applying it to
the backing store and the scene-graph rendering of the content node.
Additionally removes the experimental API and related API tests.

* UIProcess/API/qt/qquickwebpage.cpp:
(QQuickWebPage::updatePaintNode):
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::QQuickWebViewPrivate):
(QQuickWebViewLegacyPrivate::updateViewportSize):
(QQuickWebViewFlickablePrivate::onComponentComplete):
* UIProcess/API/qt/qquickwebview_p.h:
* UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
(tst_QQuickWebView::newWebView):
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
(WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
(WebKit::CoordinatedLayerTreeHostProxy::deviceScaleFactor):
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:
(CoordinatedLayerTreeHostProxy):
* UIProcess/qt/QtWebPageSGNode.cpp:
(WebKit::ContentsSGNode::ContentsSGNode):
(WebKit::ContentsSGNode::render):
(WebKit::ContentsSGNode::clipRect):
(ContentsSGNode):
(WebKit::QtWebPageSGNode::QtWebPageSGNode):
(WebKit::QtWebPageSGNode::devicePixelRatio):
(WebKit):
(WebKit::QtWebPageSGNode::setRenderer):
* UIProcess/qt/QtWebPageSGNode.h:
(QtWebPageSGNode):

Tools:

Remove setting the devicePixelRatio experimental property
since the value is now automatically picked up from Qt.

* MiniBrowser/qt/qml/BrowserWindow.qml:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp
trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h
trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml




Diff

Modified: trunk/Source/WebKit2/ChangeLog (137596 => 137597)

--- trunk/Source/WebKit2/ChangeLog	2012-12-13 15:43:38 UTC (rev 137596)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-13 16:08:49 UTC (rev 137597)
@@ -1,3 +1,52 @@
+2012-12-13  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fix painting on Mac with retina display
+https://bugs.webkit.org/show_bug.cgi?id=104574
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Since HiDPI support has been added and enabled in Qt we ended up
+painting incorrectly scaled content on high-resolution screens.
+Because the intrinsic device pixel ratio is always taken into
+account by Qt when painting to high-resolution screens we should
+automatically obtain the scale ratio from the window in which the
+item is rendered instead of setting it in QML.
+
+Qt does not make it possible to override the device pixel ratio
+of the native window, therefore our experimental QML API for setting
+a custom value is of no use any more and should be removed.
+
+This patch fixes the scaling issue on Mac retina display by querying
+the underlying window for the device scale factor and applying it to
+the backing store and the scene-graph rendering of the content node.
+Additionally removes the experimental API and related API tests.
+
+* UIProcess/API/qt/qquickwebpage.cpp:
+(QQuickWebPage::updatePaintNode):
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::QQuickWebViewPrivate):
+(QQuickWebViewLegacyPrivate::updateViewportSize):
+(QQuickWebViewFlickablePrivate::onComponentComplete):
+* UIProcess/API/qt/qquickwebview_p.h:
+* UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
+(tst_QQuickWebView::newWebView):
+* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
+

[webkit-changes] [137605] trunk/Source/WebKit2

[abecsi]

Title: [137605] trunk/Source/WebKit2








Revision 137605
Author abe...@webkit.org
Date 2012-12-13 09:41:29 -0800 (Thu, 13 Dec 2012)


Log Message
[EFL] Update the way we set the cookies policy
https://bugs.webkit.org/show_bug.cgi?id=104915

Patch by Thiago Marcos P. Santos thiago.san...@intel.com on 2012-12-13
Reviewed by Kenneth Rohde Christiansen.

We are mistakenly assigning the cookie policy to the persistent storage
type which is not correct. This was caused by r137432 and is making
the unit tests fail.

* UIProcess/efl/WebContextEfl.cpp:
(WebKit::WebContext::platformInitializeWebProcess):

Modified Paths

trunk/Source/WebKit2/ChangeLog


Removed Paths

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml




Diff

Modified: trunk/Source/WebKit2/ChangeLog (137604 => 137605)

--- trunk/Source/WebKit2/ChangeLog	2012-12-13 17:37:33 UTC (rev 137604)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-13 17:41:29 UTC (rev 137605)
@@ -17,6 +17,17 @@
 [Qt][WK2] Fix painting on Mac with retina display
 https://bugs.webkit.org/show_bug.cgi?id=104574
 
+Unreviewed, removing leftover API test.
+
+This hunk somehow did not make it into the final patch.
+
+* UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml: Removed.
+
+2012-12-13  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fix painting on Mac with retina display
+https://bugs.webkit.org/show_bug.cgi?id=104574
+
 Reviewed by Kenneth Rohde Christiansen.
 
 Since HiDPI support has been added and enabled in Qt we ended up


Deleted: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml (137604 => 137605)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml	2012-12-13 17:37:33 UTC (rev 137604)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml	2012-12-13 17:41:29 UTC (rev 137605)
@@ -1,62 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
-import ../common
-
-
-TestWebView {
-id: webView
-property variant lastResult
-width: 400
-height: 300
-focus: true
-
-SignalSpy {
-id: resultSpy
-target: webView
-signalName: lastResultChanged
-}
-
-TestCase {
-name: DevicePixelRatio
-
-function init() {
-resultSpy.clear()
-webView.lastResult = null
-}
-
-function test_devicePixelRatio() {
-resultSpy.clear()
-webView.url = ""
-webView.experimental.devicePixelRatio = 2.0
-verify(webView.waitForLoadSucceeded())
-
-webView.experimental.evaluateJavaScript(
-(function() { return window.devicePixelRatio })(),
-function(result) {
-webView.lastResult = result
-})
-
-resultSpy.wait()
-compare(webView.lastResult, 2.0)
-compare(webView.lastResult, webView.experimental.devicePixelRatio)
-}
-
-function test_devicePixelRatioMediaQuery() {
-resultSpy.clear()
-webView.url = ""
-webView.experimental.devicePixelRatio = 2.0
-verify(webView.waitForLoadSucceeded())
-
-webView.experimental.evaluateJavaScript(
-(function() { return window.matchMedia(\(-webkit-device-pixel-ratio: 2)\).matches })(),
-function(result) {
-webView.lastResult = result
-})
-
-resultSpy.wait()
-verify(webView.lastResult)
-}
-}
-}






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [137495] trunk/Source/WebKit2

[abecsi]

Title: [137495] trunk/Source/WebKit2








Revision 137495
Author abe...@webkit.org
Date 2012-12-12 11:44:24 -0800 (Wed, 12 Dec 2012)


Log Message
[Qt][WK2] Fix the build on Mac

Unreviewed build fix.

Add missing virtual destructor with empty
definition to fix missing vtable error
in test util's LoadStartedCatcher.

* UIProcess/API/qt/tests/util.h:
(LoadStartedCatcher::~LoadStartedCatcher):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (137494 => 137495)

--- trunk/Source/WebKit2/ChangeLog	2012-12-12 19:43:45 UTC (rev 137494)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-12 19:44:24 UTC (rev 137495)
@@ -1,3 +1,16 @@
+2012-12-12  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fix the build on Mac
+
+Unreviewed build fix.
+
+Add missing virtual destructor with empty
+definition to fix missing vtable error
+in test util's LoadStartedCatcher.
+
+* UIProcess/API/qt/tests/util.h:
+(LoadStartedCatcher::~LoadStartedCatcher):
+
 2012-12-12  Alexey Proskuryakov  a...@apple.com
 
 Make LOG() work in WebProcess and NetworkProcess


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (137494 => 137495)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h	2012-12-12 19:43:45 UTC (rev 137494)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h	2012-12-12 19:44:24 UTC (rev 137495)
@@ -42,6 +42,7 @@
 Q_OBJECT
 public:
 LoadStartedCatcher(QQuickWebView* webView);
+virtual ~LoadStartedCatcher() { }
 public Q_SLOTS:
 void onLoadingChanged(QWebLoadRequest* loadRequest);
 Q_SIGNALS:






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [136851] trunk/Source/WebKit2

[abecsi]

Title: [136851] trunk/Source/WebKit2








Revision 136851
Author abe...@webkit.org
Date 2012-12-06 09:53:26 -0800 (Thu, 06 Dec 2012)


Log Message
[Qt][WK2] Fix QWebKitTest's notification of device pixel ratio change
https://bugs.webkit.org/show_bug.cgi?id=104269

Reviewed by Kenneth Rohde Christiansen.

Since the ViewportInfoItem of MiniBrowser is created before the
WebView finishes construction, thus before the viewport controller
has been instantiated, the shown device pixel ratio was incorrect.
Additionally QWebKitTest's notification signal was also not emitted
when the value changed.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::QQuickWebViewPrivate):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (136850 => 136851)

--- trunk/Source/WebKit2/ChangeLog	2012-12-06 17:52:50 UTC (rev 136850)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-06 17:53:26 UTC (rev 136851)
@@ -1,3 +1,21 @@
+2012-12-06  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fix QWebKitTest's notification of device pixel ratio change
+https://bugs.webkit.org/show_bug.cgi?id=104269
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Since the ViewportInfoItem of MiniBrowser is created before the
+WebView finishes construction, thus before the viewport controller
+has been instantiated, the shown device pixel ratio was incorrect.
+Additionally QWebKitTest's notification signal was also not emitted
+when the value changed.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::QQuickWebViewPrivate):
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):
+
 2012-12-06  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r136788.


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (136850 => 136851)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-12-06 17:52:50 UTC (rev 136850)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-12-06 17:53:26 UTC (rev 136851)
@@ -280,6 +280,7 @@
 viewport-setPixelAligned(true);
 QObject::connect(viewport, SIGNAL(visibleChanged()), viewport, SLOT(_q_onVisibleChanged()));
 QObject::connect(viewport, SIGNAL(urlChanged()), viewport, SLOT(_q_onUrlChanged()));
+QObject::connect(experimental, SIGNAL(devicePixelRatioChanged()), experimental-test(), SIGNAL(devicePixelRatioChanged()));
 pageView.reset(new QQuickWebPage(viewport));
 }
 


Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (136850 => 136851)

--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2012-12-06 17:52:50 UTC (rev 136850)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2012-12-06 17:53:26 UTC (rev 136851)
@@ -59,6 +59,11 @@
 
 connect(m_scaleAnimation, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)),
 SLOT(scaleAnimationStateChanged(QAbstractAnimation::State, QAbstractAnimation::State)));
+
+// Notify about device pixel ratio here because due to the delayed instantiation
+// of the viewport controller the correct value might not have reached QWebKitTest
+// in time it was used from QML.
+emit m_viewportItem-experimental()-test()-devicePixelRatioChanged();
 }
 
 void PageViewportControllerClientQt::ScaleAnimation::updateCurrentValue(const QVariant value)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [136859] trunk/Source/WebKit2

[abecsi]

Title: [136859] trunk/Source/WebKit2








Revision 136859
Author abe...@webkit.org
Date 2012-12-06 11:21:14 -0800 (Thu, 06 Dec 2012)


Log Message
[Qt][WK2] Fix QWebKitTest's notification of device pixel ratio change
https://bugs.webkit.org/show_bug.cgi?id=104269

Unreviewed, trivialy fixing last minute change.

Move signal emission to the correct place.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::onComponentComplete):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (136858 => 136859)

--- trunk/Source/WebKit2/ChangeLog	2012-12-06 19:06:31 UTC (rev 136858)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-06 19:21:14 UTC (rev 136859)
@@ -3,6 +3,20 @@
 [Qt][WK2] Fix QWebKitTest's notification of device pixel ratio change
 https://bugs.webkit.org/show_bug.cgi?id=104269
 
+Unreviewed, trivialy fixing last minute change.
+
+Move signal emission to the correct place.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewFlickablePrivate::onComponentComplete):
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::PageViewportControllerClientQt):
+
+2012-12-06  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fix QWebKitTest's notification of device pixel ratio change
+https://bugs.webkit.org/show_bug.cgi?id=104269
+
 Reviewed by Kenneth Rohde Christiansen.
 
 Since the ViewportInfoItem of MiniBrowser is created before the


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (136858 => 136859)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-12-06 19:06:31 UTC (rev 136858)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-12-06 19:21:14 UTC (rev 136859)
@@ -868,6 +868,11 @@
 m_pageViewportController.reset(new PageViewportController(webPageProxy.get(), m_pageViewportControllerClient.data()));
 pageView-eventHandler()-setViewportController(m_pageViewportControllerClient.data());
 
+// Notify about device pixel ratio here because due to the delayed instantiation
+// of the viewport controller the correct value might not have reached QWebKitTest
+// in time it was used from QML.
+emit experimental-test()-devicePixelRatioChanged();
+
 // Trigger setting of correct visibility flags after everything was allocated and initialized.
 _q_onVisibleChanged();
 }


Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (136858 => 136859)

--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2012-12-06 19:06:31 UTC (rev 136858)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp	2012-12-06 19:21:14 UTC (rev 136859)
@@ -59,11 +59,6 @@
 
 connect(m_scaleAnimation, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)),
 SLOT(scaleAnimationStateChanged(QAbstractAnimation::State, QAbstractAnimation::State)));
-
-// Notify about device pixel ratio here because due to the delayed instantiation
-// of the viewport controller the correct value might not have reached QWebKitTest
-// in time it was used from QML.
-emit m_viewportItem-experimental()-test()-devicePixelRatioChanged();
 }
 
 void PageViewportControllerClientQt::ScaleAnimation::updateCurrentValue(const QVariant value)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [136668] trunk/Source/WebKit2

[abecsi]

Title: [136668] trunk/Source/WebKit2








Revision 136668
Author abe...@webkit.org
Date 2012-12-05 04:32:00 -0800 (Wed, 05 Dec 2012)


Log Message
[Qt][WK2] REGRESSION(r135399): It made qmltests::DoubleTapToZoom::test_double_zoomInAndBack() API test fail
https://bugs.webkit.org/show_bug.cgi?id=103889

Reviewed by Jocelyn Turcotte.

The client should always be notified in PageViewportController::didChangeViewportAttributes
about the changed attributes not only if the minimum scale changed. This ensures that these
changes are propagated to QWebKitTest and the zoom stack of double-tap-to-zoom is reset correctly.
Also increase precision of scale comparisons since the current value resulted in flakyness in
scale related API tests.

* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::didChangeViewportAttributes):
(WebKit::PageViewportController::updateMinimumScaleToFit):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (136667 => 136668)

--- trunk/Source/WebKit2/ChangeLog	2012-12-05 12:09:51 UTC (rev 136667)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-05 12:32:00 UTC (rev 136668)
@@ -1,3 +1,20 @@
+2012-12-05  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] REGRESSION(r135399): It made qmltests::DoubleTapToZoom::test_double_zoomInAndBack() API test fail
+https://bugs.webkit.org/show_bug.cgi?id=103889
+
+Reviewed by Jocelyn Turcotte.
+
+The client should always be notified in PageViewportController::didChangeViewportAttributes
+about the changed attributes not only if the minimum scale changed. This ensures that these
+changes are propagated to QWebKitTest and the zoom stack of double-tap-to-zoom is reset correctly.
+Also increase precision of scale comparisons since the current value resulted in flakyness in
+scale related API tests.
+
+* UIProcess/PageViewportController.cpp:
+(WebKit::PageViewportController::didChangeViewportAttributes):
+(WebKit::PageViewportController::updateMinimumScaleToFit):
+
 2012-12-05  Christophe Dumez  christophe.du...@intel.com
 
 [CoordinatedGraphics] Use unsigned integers for CoordinatedTile IDs


Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (136667 => 136668)

--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2012-12-05 12:09:51 UTC (rev 136667)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2012-12-05 12:32:00 UTC (rev 136668)
@@ -232,8 +232,8 @@
 if (!m_initiallyFitToViewport)
 WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(m_rawAttributes);
 
-if (updateMinimumScaleToFit(true))
-m_client-didChangeViewportAttributes();
+updateMinimumScaleToFit(true);
+m_client-didChangeViewportAttributes();
 }
 
 WebCore::FloatSize PageViewportController::viewportSizeInContentsCoordinates() const
@@ -280,14 +280,14 @@
 if (m_viewportSize.isEmpty() || m_contentsSize.isEmpty())
 return false;
 
-bool currentlyScaledToFit = fuzzyCompare(m_effectiveScale, toViewportScale(m_minimumScaleToFit), 0.001);
+bool currentlyScaledToFit = fuzzyCompare(m_effectiveScale, toViewportScale(m_minimumScaleToFit), 0.0001);
 
 float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, WebCore::roundedIntSize(m_viewportSize), WebCore::roundedIntSize(m_contentsSize), devicePixelRatio());
 
 if (minimumScale = 0)
 return false;
 
-if (!fuzzyCompare(minimumScale, m_minimumScaleToFit, 0.001)) {
+if (!fuzzyCompare(minimumScale, m_minimumScaleToFit, 0.0001)) {
 m_minimumScaleToFit = minimumScale;
 
 if (!hasSuspendedContent()) {
@@ -296,7 +296,7 @@
 else {
 // Ensure the effective scale stays within bounds.
 float boundedScale = innerBoundedViewportScale(m_effectiveScale);
-if (!fuzzyCompare(boundedScale, m_effectiveScale, 0.001))
+if (!fuzzyCompare(boundedScale, m_effectiveScale, 0.0001))
 applyScaleAfterRenderingContents(boundedScale);
 }
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [136500] trunk/Source/WebKit2

[abecsi]

Title: [136500] trunk/Source/WebKit2








Revision 136500
Author abe...@webkit.org
Date 2012-12-04 03:40:15 -0800 (Tue, 04 Dec 2012)


Log Message
[Qt][WK2] Do not override previously set flags of QQuickWebView when enabling dragdrop
https://bugs.webkit.org/show_bug.cgi?id=103901

Reviewed by Jocelyn Turcotte.

Setting the specific flag instead of resetting all the flags
when enabling QQuickItem::ItemAcceptsDrops.
This fixes clipping of the contents of QQuickWebView.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (136499 => 136500)

--- trunk/Source/WebKit2/ChangeLog	2012-12-04 11:36:33 UTC (rev 136499)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-04 11:40:15 UTC (rev 136500)
@@ -1,3 +1,17 @@
+2012-12-04  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Do not override previously set flags of QQuickWebView when enabling dragdrop
+https://bugs.webkit.org/show_bug.cgi?id=103901
+
+Reviewed by Jocelyn Turcotte.
+
+Setting the specific flag instead of resetting all the flags
+when enabling QQuickItem::ItemAcceptsDrops.
+This fixes clipping of the contents of QQuickWebView.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::initialize):
+
 2012-12-04  Carlos Garcia Campos  cgar...@igalia.com
 
 [GTK] Avoid unnecessary heap allocations during drag and drop operations


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (136499 => 136500)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-12-04 11:36:33 UTC (rev 136499)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-12-04 11:40:15 UTC (rev 136500)
@@ -326,7 +326,7 @@
 
 q_ptr-setAcceptedMouseButtons(Qt::MouseButtonMask);
 q_ptr-setAcceptHoverEvents(true);
-q_ptr-setFlags(QQuickItem::ItemAcceptsDrops);
+q_ptr-setFlag(QQuickItem::ItemAcceptsDrops, true);
 }
 
 void QQuickWebViewPrivate::loadDidStop()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [135857] trunk/Tools

[abecsi]

Title: [135857] trunk/Tools








Revision 135857
Author abe...@webkit.org
Date 2012-11-27 06:11:16 -0800 (Tue, 27 Nov 2012)


Log Message
[Qt] Fix the build with new Qt5 hash
https://bugs.webkit.org/show_bug.cgi?id=103406

Reviewed by Csaba Osztrogonác.

Remove references to deprecated QApplication::GuiServer which
has been removed, and use QStyleFactory::create instead of
instantiating a QWindowsStyle directly since it is about to
become an internal class.

* DumpRenderTree/qt/DumpRenderTreeMain.cpp:
(main):
* QtTestBrowser/qttestbrowser.cpp:
(LauncherApplication::LauncherApplication):
* WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp:
(WTR::InjectedBundle::platformInitialize):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp
trunk/Tools/QtTestBrowser/qttestbrowser.cpp
trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp




Diff

Modified: trunk/Tools/ChangeLog (135856 => 135857)

--- trunk/Tools/ChangeLog	2012-11-27 14:10:27 UTC (rev 135856)
+++ trunk/Tools/ChangeLog	2012-11-27 14:11:16 UTC (rev 135857)
@@ -1,3 +1,22 @@
+2012-11-27  Andras Becsi  andras.be...@digia.com
+
+[Qt] Fix the build with new Qt5 hash
+https://bugs.webkit.org/show_bug.cgi?id=103406
+
+Reviewed by Csaba Osztrogonác.
+
+Remove references to deprecated QApplication::GuiServer which
+has been removed, and use QStyleFactory::create instead of
+instantiating a QWindowsStyle directly since it is about to
+become an internal class.
+
+* DumpRenderTree/qt/DumpRenderTreeMain.cpp:
+(main):
+* QtTestBrowser/qttestbrowser.cpp:
+(LauncherApplication::LauncherApplication):
+* WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp:
+(WTR::InjectedBundle::platformInitialize):
+
 2012-11-27  Sadrul Habib Chowdhury  sad...@chromium.org
 
 [style] Add a style-check for enum-member names


Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp (135856 => 135857)

--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp	2012-11-27 14:10:27 UTC (rev 135856)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp	2012-11-27 14:11:16 UTC (rev 135857)
@@ -35,11 +35,12 @@
 #include qdir.h
 #include qfont.h
 #include qstringlist.h
+#include qstylefactory.h
 #include qtimer.h
 #include qurl.h
 #include qwebdatabase.h
-#include qwindowsstyle.h
 
+
 #include wtf/AlwaysInline.h
 #include wtf/ExportMacros.h
 
@@ -116,7 +117,7 @@
 
 WebKit::QtTestSupport::initializeTestFonts();
 
-QApplication::setStyle(new QWindowsStyle);
+QApplication::setStyle(QStyleFactory::create(QLatin1String(windows)));
 QApplication::setDesktopSettingsAware(false);
 
 QApplication app(argc, argv);


Modified: trunk/Tools/QtTestBrowser/qttestbrowser.cpp (135856 => 135857)

--- trunk/Tools/QtTestBrowser/qttestbrowser.cpp	2012-11-27 14:10:27 UTC (rev 135856)
+++ trunk/Tools/QtTestBrowser/qttestbrowser.cpp	2012-11-27 14:11:16 UTC (rev 135857)
@@ -88,7 +88,7 @@
 }
 
 LauncherApplication::LauncherApplication(int argc, char** argv)
-: QApplication(argc, argv, QApplication::GuiServer)
+: QApplication(argc, argv)
 , m_isRobotized(false)
 , m_robotTimeoutSeconds(0)
 , m_robotExtraTimeSeconds(0)


Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp (135856 => 135857)

--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp	2012-11-27 14:10:27 UTC (rev 135856)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp	2012-11-27 14:11:16 UTC (rev 135857)
@@ -28,7 +28,8 @@
 #include InjectedBundle.h
 #include QApplication
 #include QByteArray
-#include QWindowsStyle
+#include QStyle
+#include QStyleFactory
 #include stdio.h
 #include stdlib.h
 #include wtf/AlwaysInline.h
@@ -38,7 +39,7 @@
 
 void InjectedBundle::platformInitialize(WKTypeRef)
 {
-QWindowsStyle* styleForTests = new QWindowsStyle;
+QStyle* styleForTests = QStyleFactory::create(QLatin1String(windows));
 QApplication::setStyle(styleForTests);
 // Force Qt to use the style's standard palette, instead of platform default palette. This is needed
 // because we are setting the style after QApplication is instantiated.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [135399] trunk/Source/WebKit2

[abecsi]

Title: [135399] trunk/Source/WebKit2








Revision 135399
Author abe...@webkit.org
Date 2012-11-21 07:08:02 -0800 (Wed, 21 Nov 2012)


Log Message
[WK2] Viewport meta tag broken after r134801
https://bugs.webkit.org/show_bug.cgi?id=102801

Reviewed by Kenneth Rohde Christiansen.

If the initial-scale attribute is not explicitly specified it is left -1 by the
viewport meta algorithm and if the content is not scalable the min and max scales
are restricted by restrictScaleFactorToInitialScaleIfNotUserScalable() which resulted
in negative scales on the UI side.
Make sure that the minimum scale to fit the viewport is calculated before restricting
the scales and use this scale as the initial scale if no explicit initial scale was set.

* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::PageViewportController):
(WebKit::PageViewportController::pageTransitionViewportReady):
(WebKit::PageViewportController::didChangeViewportAttributes):
(WebKit::PageViewportController::updateMinimumScaleToFit):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (135398 => 135399)

--- trunk/Source/WebKit2/ChangeLog	2012-11-21 15:07:55 UTC (rev 135398)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-21 15:08:02 UTC (rev 135399)
@@ -1,3 +1,23 @@
+2012-11-21  Andras Becsi  andras.be...@digia.com
+
+[WK2] Viewport meta tag broken after r134801
+https://bugs.webkit.org/show_bug.cgi?id=102801
+
+Reviewed by Kenneth Rohde Christiansen.
+
+If the initial-scale attribute is not explicitly specified it is left -1 by the
+viewport meta algorithm and if the content is not scalable the min and max scales
+are restricted by restrictScaleFactorToInitialScaleIfNotUserScalable() which resulted
+in negative scales on the UI side.
+Make sure that the minimum scale to fit the viewport is calculated before restricting
+the scales and use this scale as the initial scale if no explicit initial scale was set.
+
+* UIProcess/PageViewportController.cpp:
+(WebKit::PageViewportController::PageViewportController):
+(WebKit::PageViewportController::pageTransitionViewportReady):
+(WebKit::PageViewportController::didChangeViewportAttributes):
+(WebKit::PageViewportController::updateMinimumScaleToFit):
+
 2012-11-21  Gyuyoung Kim  gyuyoung@samsung.com
 
 [EFL][WK2] Support Context Menu


Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (135398 => 135399)

--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2012-11-21 15:07:55 UTC (rev 135398)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2012-11-21 15:08:02 UTC (rev 135399)
@@ -52,11 +52,15 @@
 {
 // Initializing Viewport Raw Attributes to avoid random negative or infinity scale factors
 // if there is a race condition between the first layout and setting the viewport attributes for the first time.
-m_rawAttributes.initialScale = 1;
 m_rawAttributes.minimumScale = 1;
 m_rawAttributes.maximumScale = 1;
 m_rawAttributes.userScalable = m_allowsUserScaling;
 
+// The initial scale might be implicit and set to -1, in this case we have to infer it
+// using the viewport size and the final layout size.
+// To be able to assert for valid scale we initialize it to -1.
+m_rawAttributes.initialScale = -1;
+
 ASSERT(m_client);
 m_client-setController(this);
 }
@@ -145,8 +149,8 @@
 {
 if (!m_rawAttributes.layoutSize.isEmpty()) {
 m_hadUserInteraction = false;
-float initialScale = (m_rawAttributes.initialScale  0) ? m_minimumScaleToFit : m_rawAttributes.initialScale;
-applyScaleAfterRenderingContents(innerBoundedViewportScale(toViewportScale(initialScale)));
+ASSERT(m_rawAttributes.initialScale  0);
+applyScaleAfterRenderingContents(innerBoundedViewportScale(toViewportScale(m_rawAttributes.initialScale)));
 }
 
 // At this point we should already have received the first viewport arguments and the requested scroll
@@ -213,11 +217,19 @@
 return;
 
 m_rawAttributes = newAttributes;
+m_allowsUserScaling = !!m_rawAttributes.userScalable;
+
+if (!updateMinimumScaleToFit())
+return;
+
+ASSERT(m_minimumScaleToFit  0);
+
+// Set the initial scale if it was not specified in the viewport meta tag.
+if (m_rawAttributes.initialScale  0)
+m_rawAttributes.initialScale = m_minimumScaleToFit;
+
 WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(m_rawAttributes);
 
-m_allowsUserScaling = !!m_rawAttributes.userScalable;
-updateMinimumScaleToFit();
-
 m_client-didChangeViewportAttributes();
 }
 
@@ -262,11 +274,14 @@
 
 bool PageViewportController::updateMinimumScaleToFit()
 {
-if (m_viewportSize.isEmpty())
+if (m_viewportSize.isEmpty() || m_contentsSize.isEmpty())
 

[webkit-changes] [134587] trunk/Source/WebKit/qt

[abecsi]

Title: [134587] trunk/Source/WebKit/qt








Revision 134587
Author abe...@webkit.org
Date 2012-11-14 03:05:55 -0800 (Wed, 14 Nov 2012)


Log Message
[Qt] QStyleFacadeImp should use a QPointer to store the application style
https://bugs.webkit.org/show_bug.cgi?id=102084

Reviewed by Simon Hausmann.

QStyleFacadeImp implicitly creates a default style during the first
call to QApplication::style() in QStyleFacadeImp::style() but this
style is deleted when a custom style is set, thus the stored m_style
raw pointer in QStyleFacadeImp becomes dangling.
Use a QPointer to cache the style instead of a raw pointer.

This fixes the start-up crash in the anomaly example.
(https://bugreports.qt-project.org/browse/QTBUG-27924)

* WebCoreSupport/QStyleFacadeImp.h:
(QStyleFacadeImp):

Modified Paths

trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.h




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (134586 => 134587)

--- trunk/Source/WebKit/qt/ChangeLog	2012-11-14 11:05:20 UTC (rev 134586)
+++ trunk/Source/WebKit/qt/ChangeLog	2012-11-14 11:05:55 UTC (rev 134587)
@@ -1,3 +1,22 @@
+2012-11-14  Andras Becsi  andras.be...@digia.com
+
+[Qt] QStyleFacadeImp should use a QPointer to store the application style
+https://bugs.webkit.org/show_bug.cgi?id=102084
+
+Reviewed by Simon Hausmann.
+
+QStyleFacadeImp implicitly creates a default style during the first
+call to QApplication::style() in QStyleFacadeImp::style() but this
+style is deleted when a custom style is set, thus the stored m_style
+raw pointer in QStyleFacadeImp becomes dangling.
+Use a QPointer to cache the style instead of a raw pointer.
+
+This fixes the start-up crash in the anomaly example.
+(https://bugreports.qt-project.org/browse/QTBUG-27924)
+
+* WebCoreSupport/QStyleFacadeImp.h:
+(QStyleFacadeImp):
+
 2012-11-13  Andreas Kling  kl...@webkit.org
 
 Move inline style logic from ElementAttributeData to StyledElement.


Modified: trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.h (134586 => 134587)

--- trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.h	2012-11-14 11:05:20 UTC (rev 134586)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.h	2012-11-14 11:05:55 UTC (rev 134587)
@@ -23,6 +23,7 @@
 #ifndef QStyleFacadeImp_h
 #define QStyleFacadeImp_h
 
+#include QPointer
 #include QStyleFacade.h
 
 QT_BEGIN_NAMESPACE
@@ -87,7 +88,7 @@
 QStyle* style() const;
 
 WebCore::Page* m_page;
-mutable QStyle* m_style;
+mutable QPointerQStyle m_style;
 QStyle* m_fallbackStyle;
 bool m_ownFallbackStyle;
 mutable QScopedPointerQLineEdit m_lineEdit;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [133624] trunk/Source

[abecsi]

Title: [133624] trunk/Source








Revision 133624
Author abe...@webkit.org
Date 2012-11-06 09:34:48 -0800 (Tue, 06 Nov 2012)


Log Message
[Qt][WK2] Fit-to-width broken on pages with viewport meta tag
https://bugs.webkit.org/show_bug.cgi?id=99715

Reviewed by Jocelyn Turcotte.

Source/WebCore:

Add a bool that indicates if the content had an explicit
initial-scale in the viewport meta tag.

* dom/ViewportArguments.cpp:
(WebCore::computeViewportAttributes):
* dom/ViewportArguments.h:
(ViewportAttributes):

Source/WebKit2:

The initial scale from the viewport attributes should only
be applied if the scale was explicitly specified in the
viewport meta tag.
If the initial scale is auto it should be calculated using
the final contents size, which might be larger than the
layout size, so that the content fits horizontally into
the view.

Also add QML unit tests that cover this functionality.

* UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml:
* UIProcess/API/qt/tests/qmltests/common/test5.html: Added.
* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::PageViewportController):
(WebKit::PageViewportController::pageTransitionViewportReady):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/ViewportArguments.cpp
trunk/Source/WebCore/dom/ViewportArguments.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test4.html
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp


Added Paths

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test5.html




Diff

Modified: trunk/Source/WebCore/ChangeLog (133623 => 133624)

--- trunk/Source/WebCore/ChangeLog	2012-11-06 17:31:30 UTC (rev 133623)
+++ trunk/Source/WebCore/ChangeLog	2012-11-06 17:34:48 UTC (rev 133624)
@@ -1,3 +1,18 @@
+2012-11-06  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fit-to-width broken on pages with viewport meta tag
+https://bugs.webkit.org/show_bug.cgi?id=99715
+
+Reviewed by Jocelyn Turcotte.
+
+Add a bool that indicates if the content had an explicit
+initial-scale in the viewport meta tag.
+
+* dom/ViewportArguments.cpp:
+(WebCore::computeViewportAttributes):
+* dom/ViewportArguments.h:
+(ViewportAttributes):
+
 2012-11-06  Mike West  mk...@chromium.org
 
 CSP 1.1: Tweak the script interface to match the spec.


Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (133623 => 133624)

--- trunk/Source/WebCore/dom/ViewportArguments.cpp	2012-11-06 17:31:30 UTC (rev 133623)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp	2012-11-06 17:34:48 UTC (rev 133624)
@@ -90,6 +90,8 @@
 if (args.height != ViewportArguments::ValueAuto)
 args.height = min(float(1), max(args.height, float(1)));
 
+result.initiallyFitToViewport = args.initialScale == ViewportArguments::ValueAuto;
+
 if (args.initialScale != ViewportArguments::ValueAuto)
 args.initialScale = min(float(10), max(args.initialScale, float(0.1)));
 if (args.minimumScale != ViewportArguments::ValueAuto)


Modified: trunk/Source/WebCore/dom/ViewportArguments.h (133623 => 133624)

--- trunk/Source/WebCore/dom/ViewportArguments.h	2012-11-06 17:31:30 UTC (rev 133623)
+++ trunk/Source/WebCore/dom/ViewportArguments.h	2012-11-06 17:34:48 UTC (rev 133624)
@@ -50,6 +50,7 @@
 float maximumScale;
 
 float userScalable;
+bool initiallyFitToViewport;
 };
 
 struct ViewportArguments {


Modified: trunk/Source/WebKit2/ChangeLog (133623 => 133624)

--- trunk/Source/WebKit2/ChangeLog	2012-11-06 17:31:30 UTC (rev 133623)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-06 17:34:48 UTC (rev 133624)
@@ -1,3 +1,26 @@
+2012-11-06  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Fit-to-width broken on pages with viewport meta tag
+https://bugs.webkit.org/show_bug.cgi?id=99715
+
+Reviewed by Jocelyn Turcotte.
+
+The initial scale from the viewport attributes should only
+be applied if the scale was explicitly specified in the
+viewport meta tag.
+If the initial scale is auto it should be calculated using
+the final contents size, which might be larger than the
+layout size, so that the content fits horizontally into
+the view.
+
+Also add QML unit tests that cover this functionality.
+
+* UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml:
+* UIProcess/API/qt/tests/qmltests/common/test5.html: Added.
+* UIProcess/PageViewportController.cpp:
+(WebKit::PageViewportController::PageViewportController):
+(WebKit::PageViewportController::pageTransitionViewportReady):
+
 2012-11-06  Huang Dongsung  luxte...@company100.net
 
 Coordinated Graphics: Remove a parent member in WebLayerInfo.


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml 

[webkit-changes] [132193] trunk

[abecsi]

Title: [132193] trunk








Revision 132193
Author abe...@webkit.org
Date 2012-10-23 02:15:12 -0700 (Tue, 23 Oct 2012)


Log Message
Remove devicePixelRatio from ViewportAttributes
https://bugs.webkit.org/show_bug.cgi?id=99845

Reviewed by Adam Barth.

.:

* Source/autotools/symbols.filter: Update symbol.

Source/WebCore:

Since r121555 the devicePixelRatio is not calculated any more
and the scale factor is stored in Page::m_deviceScaleFactor,
thus it can be removed from ViewportAttributes to reduce
redundancy and unnecessary client code.
Use a new parameter in viewport calculation functions using
the visible viewport size (instead of passing the adjusted
viewport size) so that after this change clients do not end
up using the unadjusted viewport size for calculations.

No behavioural change, no new tests needed.

* WebCore.exp.in:
* dom/ViewportArguments.cpp:
(WebCore::computeViewportAttributes):
(WebCore::computeMinimumScaleFactorForContentContained):
Add the devicePixelRatio as a parameter.
(WebCore::restrictMinimumScaleFactorToViewportSize): Ditto.
* dom/ViewportArguments.h:
(ViewportAttributes):
(WebCore):
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::configurationForViewport):

Source/WebKit/efl:

* ewk/ewk_view.cpp:
(_ewk_view_viewport_attributes_compute):
Pass the device pixel ratio as a function argument.

Source/WebKit/gtk:

* webkit/webkitviewportattributes.cpp:
(webkitViewportAttributesRecompute):
Pass the device pixel ratio as a function argument.

Source/WebKit/qt:

Pass the device pixel ratio as a function argument to
match the new API.

* Api/qwebpage.cpp:
(QWebPage::viewportAttributesForSize):
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::viewportAsText):

Source/WebKit2:

Update PageViewportController and co. to pass the device pixel ratio
as an argument to functions that need to adjust the visible viewport size.

* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::PageViewportController):
(WebKit::PageViewportController::updateMinimumScaleToFit):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::didChangeViewportAttributes):

Modified Paths

trunk/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/dom/ViewportArguments.cpp
trunk/Source/WebCore/dom/ViewportArguments.h
trunk/Source/WebCore/testing/InternalSettings.cpp
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp
trunk/Source/WebKit/efl/ChangeLog
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
trunk/Source/WebKit/gtk/ChangeLog
trunk/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
trunk/Source/WebKit/qt/Api/qwebpage.cpp
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/win/WebKit2.def
trunk/Source/WebKit2/win/WebKit2CFLite.def
trunk/Source/autotools/symbols.filter




Diff

Modified: trunk/ChangeLog (132192 => 132193)

--- trunk/ChangeLog	2012-10-23 08:40:53 UTC (rev 132192)
+++ trunk/ChangeLog	2012-10-23 09:15:12 UTC (rev 132193)
@@ -1,3 +1,12 @@
+2012-10-23  Andras Becsi  andras.be...@digia.com
+
+Remove devicePixelRatio from ViewportAttributes
+https://bugs.webkit.org/show_bug.cgi?id=99845
+
+Reviewed by Adam Barth.
+
+* Source/autotools/symbols.filter: Update symbol.
+
 2012-10-22  Pavel Feldman  pfeld...@chromium.org
 
 Web Inspector: merge docked state into the dock side enum.


Modified: trunk/Source/WebCore/ChangeLog (132192 => 132193)

--- trunk/Source/WebCore/ChangeLog	2012-10-23 08:40:53 UTC (rev 132192)
+++ trunk/Source/WebCore/ChangeLog	2012-10-23 09:15:12 UTC (rev 132193)
@@ -1,3 +1,33 @@
+2012-10-23  Andras Becsi  andras.be...@digia.com
+
+Remove devicePixelRatio from ViewportAttributes
+https://bugs.webkit.org/show_bug.cgi?id=99845
+
+Reviewed by Adam Barth.
+
+Since r121555 the devicePixelRatio is not calculated any more
+and the scale factor is stored in Page::m_deviceScaleFactor,
+thus it can be removed from ViewportAttributes to reduce
+redundancy and unnecessary client code.
+Use a new parameter in viewport calculation functions using
+the visible viewport size (instead of passing the adjusted
+viewport size) so that after this change clients do not end
+up using the unadjusted viewport size for calculations.
+
+No behavioural change, no new tests needed.
+
+* WebCore.exp.in:
+* dom/ViewportArguments.cpp:
+(WebCore::computeViewportAttributes):
+(WebCore::computeMinimumScaleFactorForContentContained):
+Add the devicePixelRatio as a parameter.
+(WebCore::restrictMinimumScaleFactorToViewportSize): Ditto.
+* 

[webkit-changes] [131034] trunk/Source/WebKit2

[abecsi]

Title: [131034] trunk/Source/WebKit2








Revision 131034
Author abe...@webkit.org
Date 2012-10-11 02:43:22 -0700 (Thu, 11 Oct 2012)


Log Message
[Qt][WK2] Avoid unnecessary calls in PageViewportController
https://bugs.webkit.org/show_bug.cgi?id=98886

Reviewed by Jocelyn Turcotte.

Remove leftover and unneeded update guards and visibility update
notifications to avoid unnecessary update cycles between the
controller an the client.
Previously didRenderFrame triggered updates for no reason since
animations on the page cause a lot of DidRenderFrame messages
for which the viewport state does not change.

* UIProcess/PageViewportController.cpp:
(WebKit::ViewportUpdateDeferrer::~ViewportUpdateDeferrer):
(WebKit::PageViewportController::didRenderFrame):
* UIProcess/PageViewportController.h:
(PageViewportController):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::setContentsScale):
(WebKit::PageViewportControllerClientQt::didChangeViewportAttributes):
(WebKit::PageViewportControllerClientQt::updateViewportController):
* UIProcess/qt/PageViewportControllerClientQt.h:
(PageViewportControllerClientQt):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/PageViewportController.cpp
trunk/Source/WebKit2/UIProcess/PageViewportController.h
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (131033 => 131034)

--- trunk/Source/WebKit2/ChangeLog	2012-10-11 09:32:49 UTC (rev 131033)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-11 09:43:22 UTC (rev 131034)
@@ -1,3 +1,29 @@
+2012-10-10  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Avoid unnecessary calls in PageViewportController
+https://bugs.webkit.org/show_bug.cgi?id=98886
+
+Reviewed by Jocelyn Turcotte.
+
+Remove leftover and unneeded update guards and visibility update
+notifications to avoid unnecessary update cycles between the
+controller an the client.
+Previously didRenderFrame triggered updates for no reason since
+animations on the page cause a lot of DidRenderFrame messages
+for which the viewport state does not change.
+
+* UIProcess/PageViewportController.cpp:
+(WebKit::ViewportUpdateDeferrer::~ViewportUpdateDeferrer):
+(WebKit::PageViewportController::didRenderFrame):
+* UIProcess/PageViewportController.h:
+(PageViewportController):
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+(WebKit::PageViewportControllerClientQt::setContentsScale):
+(WebKit::PageViewportControllerClientQt::didChangeViewportAttributes):
+(WebKit::PageViewportControllerClientQt::updateViewportController):
+* UIProcess/qt/PageViewportControllerClientQt.h:
+(PageViewportControllerClientQt):
+
 2012-10-11  Mario Sanchez Prada  msanc...@igalia.com
 
 [GTK] It should be possible to disable favicons in WebKit2 GTK+ API


Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (131033 => 131034)

--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2012-10-11 09:32:49 UTC (rev 131033)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2012-10-11 09:43:22 UTC (rev 131034)
@@ -54,9 +54,6 @@
 return;
 
 m_controller-resumeContent();
-
-// Make sure that tiles all around the viewport will be requested.
-m_controller-syncVisibleContents();
 }
 
 PageViewportController::PageViewportController(WebKit::WebPageProxy* proxy, PageViewportControllerClient* client)
@@ -126,8 +123,13 @@
 
 void PageViewportController::didRenderFrame(const IntSize contentsSize, const IntRect coveredRect)
 {
-// Only update the viewport's contents dimensions along with its render.
-m_client-didChangeContentsSize(contentsSize);
+if (m_clientContentsSize != contentsSize) {
+m_clientContentsSize = contentsSize;
+// Only update the viewport's contents dimensions along with its render if the
+// size actually changed since animations on the page trigger DidRenderFrame
+// messages without causing dimension changes.
+m_client-didChangeContentsSize(contentsSize);
+}
 
 m_lastFrameCoveredRect = coveredRect;
 
@@ -137,7 +139,6 @@
 // All position and scale changes resulting from a web process event should
 // go through here to be applied on the viewport to avoid showing incomplete
 // tiles to the user during a few milliseconds.
-ViewportUpdateDeferrer guard(this);
 if (m_effectiveScaleIsLocked) {
 m_client-setContentsScale(m_effectiveScale, false);
 m_effectiveScaleIsLocked = false;


Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.h (131033 => 131034)

--- trunk/Source/WebKit2/UIProcess/PageViewportController.h	2012-10-11 09:32:49 UTC (rev 131033)
+++ 

[webkit-changes] [130045] trunk/Source/WebKit2

[abecsi]

Title: [130045] trunk/Source/WebKit2








Revision 130045
Author abe...@webkit.org
Date 2012-10-01 07:12:55 -0700 (Mon, 01 Oct 2012)


Log Message
[Qt][WK2] Device pixel ratio lost upon relaunch of the web process
https://bugs.webkit.org/show_bug.cgi?id=97908

Reviewed by Jocelyn Turcotte.

Use setIntrinsicDeviceScaleFactor instead of setCustomDeviceScaleFactor
when setting the device pixel ratio to make the setting permanent.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::didRelaunchProcess):
(QQuickWebViewExperimental::setDevicePixelRatio):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (130044 => 130045)

--- trunk/Source/WebKit2/ChangeLog	2012-10-01 14:07:57 UTC (rev 130044)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-01 14:12:55 UTC (rev 130045)
@@ -1,3 +1,17 @@
+2012-10-01  Andras Becsi  andras.be...@digia.com
+
+[Qt][WK2] Device pixel ratio lost upon relaunch of the web process
+https://bugs.webkit.org/show_bug.cgi?id=97908
+
+Reviewed by Jocelyn Turcotte.
+
+Use setIntrinsicDeviceScaleFactor instead of setCustomDeviceScaleFactor
+when setting the device pixel ratio to make the setting permanent.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::didRelaunchProcess):
+(QQuickWebViewExperimental::setDevicePixelRatio):
+
 2012-09-27  Jocelyn Turcotte  jocelyn.turco...@digia.com
 
 [Qt] Fix viewport QML auto tests after the viewport changes


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (130044 => 130045)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-10-01 14:07:57 UTC (rev 130044)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-10-01 14:12:55 UTC (rev 130045)
@@ -484,8 +484,6 @@
 {
 qWarning(WARNING: The web process has been successfully restarted.);
 
-// Reset to default so that the later update can reach the web process.
-webPageProxy-setCustomDeviceScaleFactor(0);
 webPageProxy-drawingArea()-setSize(viewSize(), IntSize());
 
 updateViewportSize();
@@ -1232,7 +1230,7 @@
 if (0 = devicePixelRatio || devicePixelRatio == this-devicePixelRatio())
 return;
 
-d-webPageProxy-setCustomDeviceScaleFactor(devicePixelRatio);
+d-webPageProxy-setIntrinsicDeviceScaleFactor(devicePixelRatio);
 emit devicePixelRatioChanged();
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128888] trunk/Tools

[abecsi]

Title: [12] trunk/Tools








Revision 12
Author abe...@webkit.org
Date 2012-09-18 07:03:48 -0700 (Tue, 18 Sep 2012)


Log Message
Update my e-mail address.

Unreviewed.

* Scripts/webkitpy/common/config/committers.py:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/committers.py




Diff

Modified: trunk/Tools/ChangeLog (128887 => 12)

--- trunk/Tools/ChangeLog	2012-09-18 13:58:20 UTC (rev 128887)
+++ trunk/Tools/ChangeLog	2012-09-18 14:03:48 UTC (rev 12)
@@ -1,5 +1,13 @@
 2012-09-18  Andras Becsi  andras.be...@digia.com
 
+Update my e-mail address.
+
+Unreviewed.
+
+* Scripts/webkitpy/common/config/committers.py:
+
+2012-09-18  Andras Becsi  andras.be...@digia.com
+
 [Qt] qt_webkit.pri should not be listed in Tools.pro
 
 Reviewed and rubber-stamped by Simon Hausmann and Tor Arne Vestbø.


Modified: trunk/Tools/Scripts/webkitpy/common/config/committers.py (128887 => 12)

--- trunk/Tools/Scripts/webkitpy/common/config/committers.py	2012-09-18 13:58:20 UTC (rev 128887)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers.py	2012-09-18 14:03:48 UTC (rev 12)
@@ -198,7 +198,7 @@
 Committer(Andrew Wellington, [and...@webkit.org, pro...@wiretapped.net], proton),
 Committer(Andrew Scherkus, scher...@chromium.org, scherkus),
 Committer(Andrey Kosyakov, ca...@chromium.org, caseq),
-Committer(Andras Becsi, [abe...@webkit.org, andras.be...@nokia.com], bbandix),
+Committer(Andras Becsi, [abe...@webkit.org, andras.be...@digia.com], bbandix),
 Committer(Andy Wingo, wi...@igalia.com, wingo),
 Committer(Anna Cavender, ann...@chromium.org, annacc),
 Committer(Anthony Ricaud, r...@webkit.org, rik),






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128457] trunk/Source/WebKit2

[abecsi]

Title: [128457] trunk/Source/WebKit2








Revision 128457
Author abe...@webkit.org
Date 2012-09-13 07:42:36 -0700 (Thu, 13 Sep 2012)


Log Message
[Qt][WK2] REGRESSION(r128245): It made zillion API tests fail
https://bugs.webkit.org/show_bug.cgi?id=96531

Reviewed by Jocelyn Turcotte.

Preferences have to be updated after the drawing area was created
for compositing mode to be set.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (128456 => 128457)

--- trunk/Source/WebKit2/ChangeLog	2012-09-13 14:29:42 UTC (rev 128456)
+++ trunk/Source/WebKit2/ChangeLog	2012-09-13 14:42:36 UTC (rev 128457)
@@ -1,3 +1,16 @@
+2012-09-13  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] REGRESSION(r128245): It made zillion API tests fail
+https://bugs.webkit.org/show_bug.cgi?id=96531
+
+Reviewed by Jocelyn Turcotte.
+
+Preferences have to be updated after the drawing area was created
+for compositing mode to be set.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::WebPage):
+
 2012-09-13  Simon Hausmann  simon.hausm...@nokia.com
 
 [Qt] Fix UIProcess build with Qt on Windows


Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (128456 => 128457)

--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-09-13 14:29:42 UTC (rev 128456)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-09-13 14:42:36 UTC (rev 128457)
@@ -307,17 +307,16 @@
 
 m_page-setCanStartMedia(false);
 
-updatePreferences(parameters.store);
-
 m_pageGroup = WebProcess::shared().webPageGroup(parameters.pageGroupData);
 m_page-setGroupName(m_pageGroup-identifier());
 m_page-setDeviceScaleFactor(parameters.deviceScaleFactor);
 
-platformInitialize();
-
 m_drawingArea = DrawingArea::create(this, parameters);
 m_drawingArea-setPaintingEnabled(false);
 
+updatePreferences(parameters.store);
+platformInitialize();
+
 m_mainFrame = WebFrame::createMainFrame(this);
 
 setUseFixedLayout(parameters.useFixedLayout);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128282] trunk/Source/WebKit/qt

[abecsi]

Title: [128282] trunk/Source/WebKit/qt








Revision 128282
Author abe...@webkit.org
Date 2012-09-12 02:38:58 -0700 (Wed, 12 Sep 2012)


Log Message
[Qt] Add module identifier directive to the qmldir files
https://bugs.webkit.org/show_bug.cgi?id=96406

Reviewed by Simon Hausmann.

Qt5 QML modules need to be identified. Type registrations are only permitted
into the namespace identified in the qmldir file's module identifier directive.
Additionally this also facilitates the protection against external registrations.
This patch suppresses a warning when importing the QtWebKit module.

* declarative/experimental/qmldir:
* declarative/qmldir:

Modified Paths

trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/declarative/experimental/qmldir
trunk/Source/WebKit/qt/declarative/qmldir




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (128281 => 128282)

--- trunk/Source/WebKit/qt/ChangeLog	2012-09-12 09:32:39 UTC (rev 128281)
+++ trunk/Source/WebKit/qt/ChangeLog	2012-09-12 09:38:58 UTC (rev 128282)
@@ -1,3 +1,18 @@
+2012-09-12  Andras Becsi  andras.be...@nokia.com
+
+[Qt] Add module identifier directive to the qmldir files
+https://bugs.webkit.org/show_bug.cgi?id=96406
+
+Reviewed by Simon Hausmann.
+
+Qt5 QML modules need to be identified. Type registrations are only permitted
+into the namespace identified in the qmldir file's module identifier directive.
+Additionally this also facilitates the protection against external registrations.
+This patch suppresses a warning when importing the QtWebKit module.
+
+* declarative/experimental/qmldir:
+* declarative/qmldir:
+
 2012-09-11  Marcelo Lira  marcelo.l...@openbossa.org
 
 Restore original value of mock scrollbars enabled in InternalSettings


Modified: trunk/Source/WebKit/qt/declarative/experimental/qmldir (128281 => 128282)

--- trunk/Source/WebKit/qt/declarative/experimental/qmldir	2012-09-12 09:32:39 UTC (rev 128281)
+++ trunk/Source/WebKit/qt/declarative/experimental/qmldir	2012-09-12 09:38:58 UTC (rev 128282)
@@ -1 +1,2 @@
+module QtWebKit.experimental
 plugin qmlwebkitexperimentalplugin


Modified: trunk/Source/WebKit/qt/declarative/qmldir (128281 => 128282)

--- trunk/Source/WebKit/qt/declarative/qmldir	2012-09-12 09:32:39 UTC (rev 128281)
+++ trunk/Source/WebKit/qt/declarative/qmldir	2012-09-12 09:38:58 UTC (rev 128282)
@@ -1 +1,2 @@
+module QtWebKit
 plugin qmlwebkitplugin






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128158] trunk

[abecsi]

Title: [128158] trunk








Revision 128158
Author abe...@webkit.org
Date 2012-09-11 02:18:27 -0700 (Tue, 11 Sep 2012)


Log Message
[Qt][WK2] Fix the build with recent Qt5
https://bugs.webkit.org/show_bug.cgi?id=96283

Reviewed by Simon Hausmann.

We should not use deprecated Qt API because doing that results
in build failure since all the deprecated API was disabled
in qtbase (https://codereview.qt-project.org/#change,24890).

Source/WebKit/qt:

* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView::widgetsRenderingThroughCache):
(tst_QGraphicsWebView::setPalette):
(tst_QGraphicsWebView::compareCanvasToImage):
* tests/qobjectbridge/tst_qobjectbridge.cpp:
(tst_QObjectBridge::ownership):
* tests/qwebframe/tst_qwebframe.cpp:
(tst_QWebFrame::popupFocus):
(tst_QWebFrame::inputFieldFocus):
(tst_QWebFrame::evaluateWillCauseRepaint):
* tests/qwebpage/tst_qwebpage.cpp:
(Navigation):
(PluginCounterPage):
* tests/qwebview/tst_qwebview.cpp:
(tst_QWebView::reusePage):
(tst_QWebView::focusInputTypes):
(tst_QWebView::setPalette):
(tst_QWebView::renderingAfterMaxAndBack):

Source/WebKit2:

* UIProcess/API/qt/qwebnavigationhistory.cpp:
(QWebNavigationListModel::roleNames):
(QWebNavigationListModel::reset):
* UIProcess/API/qt/qwebnavigationhistory_p.h:
* UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp:
(WebView::load):
* UIProcess/qt/WebPopupMenuProxyQt.cpp:
(PopupMenuItemModel):
(WebKit::PopupMenuItemModel::PopupMenuItemModel):
(WebKit::PopupMenuItemModel::roleNames):
(WebKit):

Tools:

* DumpRenderTree/qt/main.cpp:
(main):
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::notify):
* MiniBrowser/qt/raw/View.cpp:
(View::exposeEvent):
(main):

Modified Paths

trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
trunk/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp
trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
trunk/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h
trunk/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp
trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/qt/main.cpp
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
trunk/Tools/MiniBrowser/qt/raw/View.cpp




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (128157 => 128158)

--- trunk/Source/WebKit/qt/ChangeLog	2012-09-11 09:16:21 UTC (rev 128157)
+++ trunk/Source/WebKit/qt/ChangeLog	2012-09-11 09:18:27 UTC (rev 128158)
@@ -1,3 +1,33 @@
+2012-09-11  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Fix the build with recent Qt5
+https://bugs.webkit.org/show_bug.cgi?id=96283
+
+Reviewed by Simon Hausmann.
+
+We should not use deprecated Qt API because doing that results
+in build failure since all the deprecated API was disabled
+in qtbase (https://codereview.qt-project.org/#change,24890).
+
+* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+(tst_QGraphicsWebView::widgetsRenderingThroughCache):
+(tst_QGraphicsWebView::setPalette):
+(tst_QGraphicsWebView::compareCanvasToImage):
+* tests/qobjectbridge/tst_qobjectbridge.cpp:
+(tst_QObjectBridge::ownership):
+* tests/qwebframe/tst_qwebframe.cpp:
+(tst_QWebFrame::popupFocus):
+(tst_QWebFrame::inputFieldFocus):
+(tst_QWebFrame::evaluateWillCauseRepaint):
+* tests/qwebpage/tst_qwebpage.cpp:
+(Navigation):
+(PluginCounterPage):
+* tests/qwebview/tst_qwebview.cpp:
+(tst_QWebView::reusePage):
+(tst_QWebView::focusInputTypes):
+(tst_QWebView::setPalette):
+(tst_QWebView::renderingAfterMaxAndBack):
+
 2012-09-09  Emil A Eklund  e...@chromium.org
 
 Rename Node::getRect/getPixelSnappedRect and remove ContainerNode::getRect


Modified: trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp (128157 => 128158)

--- trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp	2012-09-11 09:16:21 UTC (rev 128157)
+++ trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp	2012-09-11 09:18:27 UTC (rev 128158)
@@ -184,7 +184,7 @@
 scene-addItem(webView);
 view.setGeometry(QRect(0, 0, 500, 500));
 QWidget *const widget = view;
-QTest::qWaitForWindowShown(widget);
+QTest::qWaitForWindowExposed(widget);
 
 // 1. Reference without tiling.
 webView-settings()-setAttribute(QWebSettings::TiledBackingStoreEnabled, false);
@@ -409,11 +409,11 @@
 QVERIFY(webView1.palette() == palette1);
 QVERIFY(webView1.page()-palette() == palette1);
 
-QTest::qWaitForWindowShown(view1);
+QTest::qWaitForWindowExposed(view1);
 
 if (!active) {
 

[webkit-changes] [128185] trunk/Source/WebCore

[abecsi]

Title: [128185] trunk/Source/WebCore








Revision 128185
Author abe...@webkit.org
Date 2012-09-11 07:47:21 -0700 (Tue, 11 Sep 2012)


Log Message
[Qt] Fix the build with libwebp

Rubber-stamped by Tor Arne Vestbø

The use-flag is called WEBP not LIBWEBP, so use that when appending -lwebp.

* WebCore.pri:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.pri




Diff

Modified: trunk/Source/WebCore/ChangeLog (128184 => 128185)

--- trunk/Source/WebCore/ChangeLog	2012-09-11 14:34:35 UTC (rev 128184)
+++ trunk/Source/WebCore/ChangeLog	2012-09-11 14:47:21 UTC (rev 128185)
@@ -1,3 +1,13 @@
+2012-09-11  Andras Becsi  andras.be...@nokia.com
+
+[Qt] Fix the build with libwebp
+
+Rubber-stamped by Tor Arne Vestbø
+
+The use-flag is called WEBP not LIBWEBP, so use that when appending -lwebp.
+
+* WebCore.pri:
+
 2012-09-10  Andrey Kosyakov  ca...@chromium.org
 
 Web Inspector: visualize layout root in Timeline


Modified: trunk/Source/WebCore/WebCore.pri (128184 => 128185)

--- trunk/Source/WebCore/WebCore.pri	2012-09-11 14:34:35 UTC (rev 128184)
+++ trunk/Source/WebCore/WebCore.pri	2012-09-11 14:47:21 UTC (rev 128185)
@@ -211,7 +211,7 @@
 
 use?(libjpeg): LIBS += -ljpeg
 use?(libpng): LIBS += -lpng
-use?(libwebp): LIBS += -lwebp
+use?(webp): LIBS += -lwebp
 
 mac {
 LIBS += -framework Carbon -framework AppKit






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [128035] trunk/Source/WebKit2

[abecsi]

Title: [128035] trunk/Source/WebKit2








Revision 128035
Author abe...@webkit.org
Date 2012-09-10 02:27:02 -0700 (Mon, 10 Sep 2012)


Log Message
[Qt][WK2] QWebKitTest should retrieve the viewport state from the PageViewportController
https://bugs.webkit.org/show_bug.cgi?id=96106

Reviewed by Simon Hausmann.

The functions in PageViewportControllerClientQt proxying the
viewport state values can be removed if QWebKitTest uses the
PageViewportController to retrieve these values.

* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate::viewportController):
* UIProcess/API/qt/qwebkittest.cpp:
(QWebKitTest::viewport):
(QWebKitTest::devicePixelRatio):
(QWebKitTest::contentsScale):
* UIProcess/PageViewportController.h:
(WebKit::PageViewportController::currentContentsScale):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
* UIProcess/qt/PageViewportControllerClientQt.h:
(PageViewportControllerClientQt):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
trunk/Source/WebKit2/UIProcess/PageViewportController.h
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp
trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (128034 => 128035)

--- trunk/Source/WebKit2/ChangeLog	2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/ChangeLog	2012-09-10 09:27:02 UTC (rev 128035)
@@ -1,3 +1,26 @@
+2012-09-10  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] QWebKitTest should retrieve the viewport state from the PageViewportController
+https://bugs.webkit.org/show_bug.cgi?id=96106
+
+Reviewed by Simon Hausmann.
+
+The functions in PageViewportControllerClientQt proxying the
+viewport state values can be removed if QWebKitTest uses the
+PageViewportController to retrieve these values.
+
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(QQuickWebViewPrivate::viewportController):
+* UIProcess/API/qt/qwebkittest.cpp:
+(QWebKitTest::viewport):
+(QWebKitTest::devicePixelRatio):
+(QWebKitTest::contentsScale):
+* UIProcess/PageViewportController.h:
+(WebKit::PageViewportController::currentContentsScale):
+* UIProcess/qt/PageViewportControllerClientQt.cpp:
+* UIProcess/qt/PageViewportControllerClientQt.h:
+(PageViewportControllerClientQt):
+
 2012-09-10  Simon Hausmann  simon.hausm...@nokia.com
 
 [WK2] Make WK2 C API headers compile in the Qt build on Windows


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h (128034 => 128035)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h	2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h	2012-09-10 09:27:02 UTC (rev 128035)
@@ -87,7 +87,7 @@
 int loadProgress() const { return m_loadProgress; }
 void setNeedsDisplay();
 
-WebKit::PageViewportControllerClientQt* pageViewportControllerClient() const { return m_pageViewportControllerClient.data(); }
+WebKit::PageViewportController* viewportController() const { return m_pageViewportController.data(); }
 virtual void updateViewportSize() { }
 void updateTouchViewportSize();
 


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp (128034 => 128035)

--- trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp	2012-09-10 09:16:05 UTC (rev 128034)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp	2012-09-10 09:27:02 UTC (rev 128035)
@@ -148,7 +148,7 @@
 QJsonObject QWebKitTest::viewport() const
 {
 QJsonObject viewportData;
-if (const PageViewportControllerClientQt* const viewportHandler = m_webViewPrivate-pageViewportControllerClient()) {
+if (const PageViewportController* const viewportHandler = m_webViewPrivate-viewportController()) {
 viewportData.insert(QLatin1String(layoutSize), toJsonObject(viewportHandler-contentsLayoutSize()));
 viewportData.insert(QLatin1String(isScalable), viewportHandler-allowsUserScaling());
 viewportData.insert(QLatin1String(minimumScale), viewportHandler-minimumContentsScale());
@@ -165,14 +165,14 @@
 
 QVariant QWebKitTest::devicePixelRatio() const
 {
-if (const PageViewportControllerClientQt* const viewport = m_webViewPrivate-pageViewportControllerClient())
+if (const PageViewportController* const viewport = m_webViewPrivate-viewportController())
 return viewport-devicePixelRatio();
 return 1.0;
 }
 
 QVariant QWebKitTest::contentsScale() const
 {
-if (const PageViewportControllerClientQt* const viewport = m_webViewPrivate-pageViewportControllerClient())
+if (const PageViewportController* const viewport = m_webViewPrivate-viewportController())
 return viewport-currentContentsScale();
 return 1.0;
 }


Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.h (128034 => 128035)

[webkit-changes] [127747] trunk/Source/ThirdParty/ANGLE

[abecsi]

Title: [127747] trunk/Source/ThirdParty/ANGLE








Revision 127747
Author abe...@webkit.org
Date 2012-09-06 09:25:36 -0700 (Thu, 06 Sep 2012)


Log Message
[ANGLE] Fix the build with gcc 4.7
https://bugs.webkit.org/show_bug.cgi?id=95989

Reviewed by Csaba Osztrogonác.

The build fails because of a bogus warning about the auto-generated
pplval variable. Unfortunately the warning is called -Wuninitialized
in gcc 4.6 and -Wmaybe-uninitialized in gcc 4.7 thus we also need to
ignore unknown pragmas not to break the build with compilers that do
not recognize these options.

* src/compiler/preprocessor/new/ExpressionParser.y:

Modified Paths

trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.y




Diff

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (127746 => 127747)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2012-09-06 16:00:09 UTC (rev 127746)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2012-09-06 16:25:36 UTC (rev 127747)
@@ -1,3 +1,18 @@
+2012-09-06  Andras Becsi  andras.be...@nokia.com
+
+[ANGLE] Fix the build with gcc 4.7
+https://bugs.webkit.org/show_bug.cgi?id=95989
+
+Reviewed by Csaba Osztrogonác.
+
+The build fails because of a bogus warning about the auto-generated
+pplval variable. Unfortunately the warning is called -Wuninitialized
+in gcc 4.6 and -Wmaybe-uninitialized in gcc 4.7 thus we also need to
+ignore unknown pragmas not to break the build with compilers that do
+not recognize these options.
+
+* src/compiler/preprocessor/new/ExpressionParser.y:
+
 2012-09-06  Simon Hausmann  simon.hausm...@nokia.com
 
 [Qt] Fix build with ANGLE on platforms that provide EGL/GLESv2


Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.y (127746 => 127747)

--- trunk/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.y	2012-09-06 16:00:09 UTC (rev 127746)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/ExpressionParser.y	2012-09-06 16:25:36 UTC (rev 127747)
@@ -21,8 +21,13 @@
 // This file is auto-generated by generate_parser.sh. DO NOT EDIT!
 
 #if defined(__GNUC__)
+// Toggle the warning for -Wpragmas to ensure we do not break the build
+// with earlier compiler versions because of unknown pragma options.
+#pragma GCC diagnostic ignored -Wpragmas
 // Triggered by the auto-generated pplval variable.
 #pragma GCC diagnostic ignored -Wuninitialized
+#pragma GCC diagnostic ignored -Wmaybe-uninitialized
+#pragma GCC diagnostic warning -Wpragmas
 #elif defined(_MSC_VER)
 #pragma warning(disable: 4065 4701)
 #endif






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [126861] trunk/Tools

[abecsi]

Title: [126861] trunk/Tools








Revision 126861
Author abe...@webkit.org
Date 2012-08-28 03:19:47 -0700 (Tue, 28 Aug 2012)


Log Message
[watchlist] Unreviewed, subscribe to Qt bugs.

* Scripts/webkitpy/common/config/watchlist:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist




Diff

Modified: trunk/Tools/ChangeLog (126860 => 126861)

--- trunk/Tools/ChangeLog	2012-08-28 09:51:47 UTC (rev 126860)
+++ trunk/Tools/ChangeLog	2012-08-28 10:19:47 UTC (rev 126861)
@@ -1,3 +1,9 @@
+2012-08-28  Andras Becsi  andras.be...@nokia.com
+
+[watchlist] Unreviewed, subscribe to Qt bugs.
+
+* Scripts/webkitpy/common/config/watchlist:
+
 2012-08-28  Simon Hausmann  simon.hausm...@nokia.com
 
 [Qt] New test introduced in r126611 fails: fast/css/image-set-setting.html


Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (126860 => 126861)

--- trunk/Tools/Scripts/webkitpy/common/config/watchlist	2012-08-28 09:51:47 UTC (rev 126860)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist	2012-08-28 10:19:47 UTC (rev 126861)
@@ -242,10 +242,10 @@
 NetworkInfo: [ gyuyoung@samsung.com ],
 OpenGL : [ noam.rosent...@nokia.com ],
 SkiaGraphics: [ senorbla...@chromium.org ],
-QtBuildSystem : [ ves...@webkit.org, ],
+QtBuildSystem : [ ves...@webkit.org, abe...@webkit.org ],
 QtGraphics : [ noam.rosent...@nokia.com ],
-QtWebKit2PlatformSpecific: [ ale...@webkit.org, zol...@webkit.org, cmarc...@webkit.org ],
-QtWebKit2PublicAPI: [ ale...@webkit.org, zol...@webkit.org, cmarc...@webkit.org ],
+QtWebKit2PlatformSpecific: [ ale...@webkit.org, zol...@webkit.org, cmarc...@webkit.org, abe...@webkit.org ],
+QtWebKit2PublicAPI: [ ale...@webkit.org, zol...@webkit.org, cmarc...@webkit.org, abe...@webkit.org ],
 Rendering: [ e...@webkit.org ],
 ScrollingCoordinator: [ ander...@apple.com, jam...@chromium.org, toniki...@webkit.org ],
 SecurityCritical: [ aba...@webkit.org ],






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [126575] trunk/Source/WTF

[abecsi]

Title: [126575] trunk/Source/WTF








Revision 126575
Author abe...@webkit.org
Date 2012-08-24 06:04:06 -0700 (Fri, 24 Aug 2012)


Log Message
[Qt] Be more explicit about the ICU dependency in the error message

Rubber-stamped by Simon Hausmann.

When building QtWebKit with a Qt5 which was not configured with libICU support
the error message is somewhat ambiguous about the indirect dependency.

* WTF.pri:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/WTF.pri




Diff

Modified: trunk/Source/WTF/ChangeLog (126574 => 126575)

--- trunk/Source/WTF/ChangeLog	2012-08-24 12:23:37 UTC (rev 126574)
+++ trunk/Source/WTF/ChangeLog	2012-08-24 13:04:06 UTC (rev 126575)
@@ -1,3 +1,14 @@
+2012-08-24  Andras Becsi  andras.be...@nokia.com
+
+[Qt] Be more explicit about the ICU dependency in the error message
+
+Rubber-stamped by Simon Hausmann.
+
+When building QtWebKit with a Qt5 which was not configured with libICU support
+the error message is somewhat ambiguous about the indirect dependency.
+
+* WTF.pri:
+
 2012-08-23  Julien Chaffraix  jchaffr...@webkit.org
 
 [Chromium] Enable AtomicString  CString  WTFString  StringImpl unit tests


Modified: trunk/Source/WTF/WTF.pri (126574 => 126575)

--- trunk/Source/WTF/WTF.pri	2012-08-24 12:23:37 UTC (rev 126574)
+++ trunk/Source/WTF/WTF.pri	2012-08-24 13:04:06 UTC (rev 126575)
@@ -18,7 +18,7 @@
 win32: LIBS += -licuin -licuuc -licudt
 else: LIBS += -licui18n -licuuc -licudata
 } else {
-error(To build QtWebKit with Qt 5 you need ICU)
+error(To build QtWebKit with Qt 5 you need to build Qt 5 with libICU support. Check for ICU support being mentioned in qtbase/config.summary.)
 }
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [126582] trunk/Source/WebKit2

[abecsi]

Title: [126582] trunk/Source/WebKit2








Revision 126582
Author abe...@webkit.org
Date 2012-08-24 06:50:46 -0700 (Fri, 24 Aug 2012)


Log Message
[Qt][WK2] Fix custom device pixel ratio propagation and add QML API tests
https://bugs.webkit.org/show_bug.cgi?id=88531

Reviewed by Kenneth Rohde Christiansen.

Defer setting the custom device pixel ratio until the page item has
a valid size to make sure that the scale factor reaches the web process.

QML test based on patch by Alexander Færøy.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::QQuickWebViewPrivate):
(QQuickWebViewPrivate::didRelaunchProcess):
(QQuickWebViewPrivate::didChangeContentsSize):
(QQuickWebViewFlickablePrivate::didChangeContentsSize):
(QQuickWebViewExperimental::devicePixelRatio):
(QQuickWebViewExperimental::setDevicePixelRatio):
* UIProcess/API/qt/qquickwebview_p.h:
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate):
* UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml: Added.
  Test case for the QML device pixel ratio API.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h


Added Paths

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml




Diff

Modified: trunk/Source/WebKit2/ChangeLog (126581 => 126582)

--- trunk/Source/WebKit2/ChangeLog	2012-08-24 13:46:37 UTC (rev 126581)
+++ trunk/Source/WebKit2/ChangeLog	2012-08-24 13:50:46 UTC (rev 126582)
@@ -1,3 +1,28 @@
+2012-08-24  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Fix custom device pixel ratio propagation and add QML API tests
+https://bugs.webkit.org/show_bug.cgi?id=88531
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Defer setting the custom device pixel ratio until the page item has
+a valid size to make sure that the scale factor reaches the web process.
+
+QML test based on patch by Alexander Færøy.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::QQuickWebViewPrivate):
+(QQuickWebViewPrivate::didRelaunchProcess):
+(QQuickWebViewPrivate::didChangeContentsSize):
+(QQuickWebViewFlickablePrivate::didChangeContentsSize):
+(QQuickWebViewExperimental::devicePixelRatio):
+(QQuickWebViewExperimental::setDevicePixelRatio):
+* UIProcess/API/qt/qquickwebview_p.h:
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(QQuickWebViewPrivate):
+* UIProcess/API/qt/tests/qmltests/WebView/tst_devicePixelRatio.qml: Added.
+  Test case for the QML device pixel ratio API.
+
 2012-08-24  Kangil Han  kangil@samsung.com
 
 [EFL] Fix compile warning


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (126581 => 126582)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-08-24 13:46:37 UTC (rev 126581)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-08-24 13:50:46 UTC (rev 126582)
@@ -272,6 +272,7 @@
 , m_navigatorQtObjectEnabled(false)
 , m_renderToOffscreenBuffer(false)
 , m_allowAnyHTTPSCertificateForLocalHost(false)
+, m_customDevicePixelRatio(0)
 , m_loadProgress(0)
 {
 viewport-setClip(true);
@@ -473,7 +474,10 @@
 {
 qWarning(WARNING: The web process has been successfully restarted.);
 
+// Reset to default so that the later update can reach the web process.
+webPageProxy-setCustomDeviceScaleFactor(0);
 webPageProxy-drawingArea()-setSize(viewSize(), IntSize());
+
 updateViewportSize();
 updateUserScripts();
 }
@@ -789,6 +793,20 @@
 emit q_ptr-experimental()-messageReceived(variantMap);
 }
 
+void QQuickWebViewPrivate::didChangeContentsSize(const QSize newSize)
+{
+if (newSize.isEmpty() || !m_customDevicePixelRatio || webPageProxy-deviceScaleFactor() == m_customDevicePixelRatio)
+return;
+
+// DrawingAreaProxy returns early if the page size is empty
+// and the device pixel ratio property is propagated from QML
+// before the QML page item has a valid size yet, thus the
+// information would not reach the web process.
+// Set the custom device pixel ratio requested from QML as soon
+// as the content item has a valid size.
+webPageProxy-setCustomDeviceScaleFactor(m_customDevicePixelRatio);
+}
+
 QQuickWebViewLegacyPrivate::QQuickWebViewLegacyPrivate(QQuickWebView* viewport)
 : QQuickWebViewPrivate(viewport)
 {
@@ -877,6 +895,7 @@
 Q_Q(QQuickWebView);
 
 pageView-setContentsSize(newSize); // emits contentsSizeChanged()
+QQuickWebViewPrivate::didChangeContentsSize(newSize);
 m_viewportHandler-pageContentsSizeChanged(newSize, q-boundingRect().size().toSize());
 }
 
@@ -1233,19 +1252,23 @@
 down but still provide a better looking image.
 */
 
-double QQuickWebViewExperimental::devicePixelRatio() const
+qreal 

[webkit-changes] [126428] trunk/Source/WebKit2

[abecsi]

Title: [126428] trunk/Source/WebKit2








Revision 126428
Author abe...@webkit.org
Date 2012-08-23 08:11:47 -0700 (Thu, 23 Aug 2012)


Log Message
[Qt][WK2] Helper functions used by the raw webview tests should not be guarded by HAVE_QTQUICK

Reviewed by Simon Hausmann.

This fixes the build if the QtQuick module is not present.

* UIProcess/API/qt/tests/util.cpp:
(messageHandler):
(suppressDebugOutput):
* UIProcess/API/qt/tests/util.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp
trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (126427 => 126428)

--- trunk/Source/WebKit2/ChangeLog	2012-08-23 15:09:34 UTC (rev 126427)
+++ trunk/Source/WebKit2/ChangeLog	2012-08-23 15:11:47 UTC (rev 126428)
@@ -1,3 +1,16 @@
+2012-08-23  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Helper functions used by the raw webview tests should not be guarded by HAVE_QTQUICK
+
+Reviewed by Simon Hausmann.
+
+This fixes the build if the QtQuick module is not present.
+
+* UIProcess/API/qt/tests/util.cpp:
+(messageHandler):
+(suppressDebugOutput):
+* UIProcess/API/qt/tests/util.h:
+
 2012-08-23  Carlos Garcia Campos  cgar...@igalia.com
 
 REGRESSION(r126306): it broke the plugin process


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp (126427 => 126428)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp	2012-08-23 15:09:34 UTC (rev 126427)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.cpp	2012-08-23 15:11:47 UTC (rev 126428)
@@ -57,6 +57,22 @@
 return timeoutSpy.isEmpty();
 }
 
+static void messageHandler(QtMsgType type, const char* message)
+{
+if (type == QtCriticalMsg) {
+fprintf(stderr, %s\n, message);
+return;
+}
+// Do nothing
+}
+
+void suppressDebugOutput()
+{
+qInstallMsgHandler(messageHandler); \
+if (qgetenv(QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT).isEmpty()) \
+qputenv(QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT, 1);
+}
+
 #if defined(HAVE_QTQUICK)  HAVE_QTQUICK
 class LoadSpy : public QEventLoop {
 Q_OBJECT
@@ -110,23 +126,6 @@
 return timeoutSpy.isEmpty();
 }
 
-static void messageHandler(QtMsgType type, const char* message)
-{
-if (type == QtCriticalMsg) {
-fprintf(stderr, %s\n, message);
-return;
-}
-// Do nothing
-}
-
-void suppressDebugOutput()
-{
-qInstallMsgHandler(messageHandler); \
-if (qgetenv(QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT).isEmpty()) \
-qputenv(QT_WEBKIT_SUPPRESS_WEB_PROCESS_OUTPUT, 1);
-}
-
-
 LoadStartedCatcher::LoadStartedCatcher(QQuickWebView* webView)
 : m_webView(webView)
 {


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (126427 => 126428)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h	2012-08-23 15:09:34 UTC (rev 126427)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h	2012-08-23 15:11:47 UTC (rev 126428)
@@ -30,11 +30,12 @@
 #endif
 
 void addQtWebProcessToPath();
+bool waitForSignal(QObject*, const char* signal, int timeout = 1);
+void suppressDebugOutput();
+
 #if defined(HAVE_QTQUICK)  HAVE_QTQUICK
-bool waitForSignal(QObject*, const char* signal, int timeout = 1);
 bool waitForLoadSucceeded(QQuickWebView* webView, int timeout = 1);
 bool waitForLoadFailed(QQuickWebView* webView, int timeout = 1);
-void suppressDebugOutput();
 
 class LoadStartedCatcher : public QObject {
 Q_OBJECT






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [125013] trunk/Source/WebKit2

[abecsi]

Title: [125013] trunk/Source/WebKit2








Revision 125013
Author abe...@webkit.org
Date 2012-08-08 02:50:54 -0700 (Wed, 08 Aug 2012)


Log Message
[Qt][WK2] Set the fixed layout setting before creating the page
https://bugs.webkit.org/show_bug.cgi?id=93374

Reviewed by Noam Rosenthal.

Any page setting should preferrable be set before creating the page
but fixed layout was set after the initialization of the web page.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):
(QQuickWebViewFlickablePrivate::initialize):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (125012 => 125013)

--- trunk/Source/WebKit2/ChangeLog	2012-08-08 09:45:23 UTC (rev 125012)
+++ trunk/Source/WebKit2/ChangeLog	2012-08-08 09:50:54 UTC (rev 125013)
@@ -1,3 +1,17 @@
+2012-08-08  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Set the fixed layout setting before creating the page
+https://bugs.webkit.org/show_bug.cgi?id=93374
+
+Reviewed by Noam Rosenthal.
+
+Any page setting should preferrable be set before creating the page
+but fixed layout was set after the initialization of the web page.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::initialize):
+(QQuickWebViewFlickablePrivate::initialize):
+
 2012-08-08  Mario Sanchez Prada  msanc...@igalia.com
 
 [WK2] Add new C API to generate MHTML data from the UI process


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (125012 => 125013)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-08-08 09:45:23 UTC (rev 125012)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-08-08 09:50:54 UTC (rev 125013)
@@ -295,6 +295,7 @@
 
 context = contextRef ? QtWebContext::create(toImpl(contextRef)) : QtWebContext::defaultContext();
 webPageProxy = context-createWebPage(pageClient, pageGroup.get());
+webPageProxy-setUseFixedLayout(s_flickableViewportEnabled);
 #if ENABLE(FULLSCREEN_API)
 webPageProxy-fullScreenManager()-setWebView(q_ptr);
 #endif
@@ -841,7 +842,6 @@
 void QQuickWebViewFlickablePrivate::initialize(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
 {
 QQuickWebViewPrivate::initialize(contextRef, pageGroupRef);
-webPageProxy-setUseFixedLayout(true);
 }
 
 void QQuickWebViewFlickablePrivate::onComponentComplete()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [124877] trunk/Tools

[abecsi]

Title: [124877] trunk/Tools








Revision 124877
Author abe...@webkit.org
Date 2012-08-07 04:34:46 -0700 (Tue, 07 Aug 2012)


Log Message
[Qt][WK2] MiniBrowser should only synthesize multiple touch points if Ctrl is pressed
https://bugs.webkit.org/show_bug.cgi?id=93277

Reviewed by Jocelyn Turcotte.

MiniBrowser's multi-touch mocking does not check if Ctrl is pressed
when registering multiple touch points based on pressed mouse buttons
and sends inconsistent touch events to the WebView which triggers an
assert in the pinch gesture recognizer.
MiniBrowserApplication::updateTouchPoint should only register multiple
touch points if the Ctrl button is pressed else it should ignore the
update request.

* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::updateTouchPoint):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp




Diff

Modified: trunk/Tools/ChangeLog (124876 => 124877)

--- trunk/Tools/ChangeLog	2012-08-07 11:28:24 UTC (rev 124876)
+++ trunk/Tools/ChangeLog	2012-08-07 11:34:46 UTC (rev 124877)
@@ -1,3 +1,21 @@
+2012-08-07  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] MiniBrowser should only synthesize multiple touch points if Ctrl is pressed
+https://bugs.webkit.org/show_bug.cgi?id=93277
+
+Reviewed by Jocelyn Turcotte.
+
+MiniBrowser's multi-touch mocking does not check if Ctrl is pressed
+when registering multiple touch points based on pressed mouse buttons
+and sends inconsistent touch events to the WebView which triggers an
+assert in the pinch gesture recognizer.
+MiniBrowserApplication::updateTouchPoint should only register multiple
+touch points if the Ctrl button is pressed else it should ignore the
+update request.
+
+* MiniBrowser/qt/MiniBrowserApplication.cpp:
+(MiniBrowserApplication::updateTouchPoint):
+
 2012-08-07  Csaba Osztrogonác  o...@webkit.org
 
 REGRESSION(r124800): It broke NRWT result parsing of build.webkit.org


Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (124876 => 124877)

--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2012-08-07 11:28:24 UTC (rev 124876)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2012-08-07 11:34:46 UTC (rev 124877)
@@ -216,10 +216,16 @@
 
 void MiniBrowserApplication::updateTouchPoint(const QMouseEvent* mouseEvent, QTouchEvent::TouchPoint touchPoint, Qt::MouseButton mouseButton)
 {
+// Ignore inserting additional touch points if Ctrl isn't held because it produces
+// inconsistent touch events and results in assers in the gesture recognizers.
+if (!m_holdingControl  m_touchPoints.size()  !m_touchPoints.contains(mouseButton))
+return;
+
 if (m_holdingControl  touchPoint.state() == Qt::TouchPointReleased) {
 m_heldTouchPoints.insert(mouseButton);
 return;
 }
+
 // Gesture recognition uses the screen position for the initial threshold
 // but since the canvas translates touch events we actually need to pass
 // the screen position as the scene position to deliver the appropriate






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [124758] trunk/Source/WebKit2

[abecsi]

Title: [124758] trunk/Source/WebKit2








Revision 124758
Author abe...@webkit.org
Date 2012-08-06 06:03:42 -0700 (Mon, 06 Aug 2012)


Log Message
[Qt][WK2] Remove workarounds from input event handling
https://bugs.webkit.org/show_bug.cgi?id=93125

Reviewed by Jocelyn Turcotte.

Since input event propagation in Qt5 has been fixed we can remove
the workarounds introduced to prevent the QML WebView from receiving
input events targeting a child dialog.
To do this the childMouseEventFilter function has to be changed to
force touch and mouse events through the default propagation path.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::QQuickWebViewPrivate):
(QQuickWebViewLegacyPrivate::initialize):
(QQuickWebView::childMouseEventFilter):
(QQuickWebView::touchEvent):
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate):
(QQuickWebViewLegacyPrivate):
* UIProcess/qt/QtDialogRunner.cpp:
(WebKit::QtDialogRunner::run):
* UIProcess/qt/WebColorChooserProxyQt.cpp:
(WebKit::WebColorChooserProxyQt::createItem):
(WebKit::WebColorChooserProxyQt::endChooser):
* UIProcess/qt/WebPopupMenuProxyQt.cpp:
(WebKit::WebPopupMenuProxyQt::showPopupMenu):
(WebKit::WebPopupMenuProxyQt::hidePopupMenu):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
trunk/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp
trunk/Source/WebKit2/UIProcess/qt/WebColorChooserProxyQt.cpp
trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (124757 => 124758)

--- trunk/Source/WebKit2/ChangeLog	2012-08-06 12:35:28 UTC (rev 124757)
+++ trunk/Source/WebKit2/ChangeLog	2012-08-06 13:03:42 UTC (rev 124758)
@@ -1,3 +1,33 @@
+2012-08-06  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Remove workarounds from input event handling
+https://bugs.webkit.org/show_bug.cgi?id=93125
+
+Reviewed by Jocelyn Turcotte.
+
+Since input event propagation in Qt5 has been fixed we can remove
+the workarounds introduced to prevent the QML WebView from receiving
+input events targeting a child dialog.
+To do this the childMouseEventFilter function has to be changed to
+force touch and mouse events through the default propagation path.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::QQuickWebViewPrivate):
+(QQuickWebViewLegacyPrivate::initialize):
+(QQuickWebView::childMouseEventFilter):
+(QQuickWebView::touchEvent):
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(QQuickWebViewPrivate):
+(QQuickWebViewLegacyPrivate):
+* UIProcess/qt/QtDialogRunner.cpp:
+(WebKit::QtDialogRunner::run):
+* UIProcess/qt/WebColorChooserProxyQt.cpp:
+(WebKit::WebColorChooserProxyQt::createItem):
+(WebKit::WebColorChooserProxyQt::endChooser):
+* UIProcess/qt/WebPopupMenuProxyQt.cpp:
+(WebKit::WebPopupMenuProxyQt::showPopupMenu):
+(WebKit::WebPopupMenuProxyQt::hidePopupMenu):
+
 2012-08-06  Mario Sanchez Prada  msanc...@igalia.com
 
 [WK2][GTK] Implement a new spell checker API for WebKit2GTK+


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (124757 => 124758)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-08-06 12:35:28 UTC (rev 124757)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-08-06 13:03:42 UTC (rev 124758)
@@ -270,7 +270,6 @@
 , m_useDefaultContentItemSize(true)
 , m_navigatorQtObjectEnabled(false)
 , m_renderToOffscreenBuffer(false)
-, m_dialogActive(false)
 , m_allowAnyHTTPSCertificateForLocalHost(false)
 , m_loadProgress(0)
 {
@@ -795,9 +794,12 @@
 
 void QQuickWebViewLegacyPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
 {
+Q_Q(QQuickWebView);
 QQuickWebViewPrivate::initialize(contextRef, pageGroupRef);
-enableMouseEvents();
 
+q-setAcceptedMouseButtons(Qt::MouseButtonMask);
+q-setAcceptHoverEvents(true);
+
 // Trigger setting of correct visibility flags after everything was allocated and initialized.
 _q_onVisibleChanged();
 }
@@ -816,20 +818,6 @@
 webPageProxy-drawingArea()-setVisibleContentsRect(FloatRect(FloatPoint(), viewportSize), 1, FloatPoint());
 }
 
-void QQuickWebViewLegacyPrivate::enableMouseEvents()
-{
-Q_Q(QQuickWebView);
-q-setAcceptedMouseButtons(Qt::MouseButtonMask);
-q-setAcceptHoverEvents(true);
-}
-
-void QQuickWebViewLegacyPrivate::disableMouseEvents()
-{
-Q_Q(QQuickWebView);
-q-setAcceptedMouseButtons(Qt::NoButton);
-q-setAcceptHoverEvents(false);
-}
-
 qreal QQuickWebViewLegacyPrivate::zoomFactor() const
 {
 return webPageProxy-pageZoomFactor();
@@ -1685,36 +1673,25 @@
 
 bool QQuickWebView::childMouseEventFilter(QQuickItem* item, QEvent* event)
 {
-if (!isVisible() || !isEnabled() || !s_flickableViewportEnabled)

[webkit-changes] [124455] trunk/Source/WebKit2

[abecsi]

Title: [124455] trunk/Source/WebKit2








Revision 124455
Author abe...@webkit.org
Date 2012-08-02 07:42:30 -0700 (Thu, 02 Aug 2012)


Log Message
[Qt][WK2] Click, mouse and links rely on touch mocking.
https://bugs.webkit.org/show_bug.cgi?id=83091

Reviewed by Simon Hausmann.

Send the incoming mouse events directly to the gesture recognizers to make
the WebView behave consistent with other Flickables.
This patch unifies the code paths for input events and makes it possible
to enable mouse events on the flickable web view again, thus makes the
mobile-version of QQuickWebView usable on desktop.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::handleMouseEvent):
(QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate):
(QQuickWebViewFlickablePrivate::handleMouseEvent):
(QQuickWebView::mousePressEvent):
(QQuickWebView::mouseMoveEvent):
(QQuickWebView::mouseReleaseEvent):
(QQuickWebView::mouseDoubleClickEvent):
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate):
(QQuickWebViewFlickablePrivate):
* UIProcess/qt/QtPanGestureRecognizer.cpp:
(WebKit::QtPanGestureRecognizer::update):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::QtWebPageEventHandler):
(WebKit::QtWebPageEventHandler::handleInputEvent):
(WebKit):
(WebKit::QtWebPageEventHandler::doneWithTouchEvent):
* UIProcess/qt/QtWebPageEventHandler.h:
(QtWebPageEventHandler):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (124454 => 124455)

--- trunk/Source/WebKit2/ChangeLog	2012-08-02 14:21:10 UTC (rev 124454)
+++ trunk/Source/WebKit2/ChangeLog	2012-08-02 14:42:30 UTC (rev 124455)
@@ -1,3 +1,37 @@
+2012-08-02  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Click, mouse and links rely on touch mocking.
+https://bugs.webkit.org/show_bug.cgi?id=83091
+
+Reviewed by Simon Hausmann.
+
+Send the incoming mouse events directly to the gesture recognizers to make
+the WebView behave consistent with other Flickables.
+This patch unifies the code paths for input events and makes it possible
+to enable mouse events on the flickable web view again, thus makes the
+mobile-version of QQuickWebView usable on desktop.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::handleMouseEvent):
+(QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate):
+(QQuickWebViewFlickablePrivate::handleMouseEvent):
+(QQuickWebView::mousePressEvent):
+(QQuickWebView::mouseMoveEvent):
+(QQuickWebView::mouseReleaseEvent):
+(QQuickWebView::mouseDoubleClickEvent):
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(QQuickWebViewPrivate):
+(QQuickWebViewFlickablePrivate):
+* UIProcess/qt/QtPanGestureRecognizer.cpp:
+(WebKit::QtPanGestureRecognizer::update):
+* UIProcess/qt/QtWebPageEventHandler.cpp:
+(WebKit::QtWebPageEventHandler::QtWebPageEventHandler):
+(WebKit::QtWebPageEventHandler::handleInputEvent):
+(WebKit):
+(WebKit::QtWebPageEventHandler::doneWithTouchEvent):
+* UIProcess/qt/QtWebPageEventHandler.h:
+(QtWebPageEventHandler):
+
 2012-08-01  Brady Eidson  beid...@apple.com
 
 Small part of Out-of-process plug-ins should support asynchronous initialization.


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (124454 => 124455)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-08-02 14:21:10 UTC (rev 124454)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-08-02 14:42:30 UTC (rev 124455)
@@ -408,6 +408,27 @@
 emit q-loadingChanged(loadRequest);
 }
 
+void QQuickWebViewPrivate::handleMouseEvent(QMouseEvent* event)
+{
+switch (event-type()) {
+case QEvent::MouseButtonPress:
+case QEvent::MouseButtonDblClick:
+// If a MouseButtonDblClick was received then we got a MouseButtonPress before
+// handleMousePressEvent will take care of double clicks.
+pageView-eventHandler()-handleMousePressEvent(event);
+break;
+case QEvent::MouseMove:
+pageView-eventHandler()-handleMouseMoveEvent(event);
+break;
+case QEvent::MouseButtonRelease:
+pageView-eventHandler()-handleMouseReleaseEvent(event);
+break;
+default:
+ASSERT_NOT_REACHED();
+break;
+}
+}
+
 void QQuickWebViewPrivate::setNeedsDisplay()
 {
 Q_Q(QQuickWebView);
@@ -815,12 +836,6 @@
 QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate(QQuickWebView* viewport)
 : QQuickWebViewPrivate(viewport)
 {
-// Disable mouse events on the flickable 

[webkit-changes] [124200] trunk/Source/WebKit2

[abecsi]

Title: [124200] trunk/Source/WebKit2








Revision 124200
Author abe...@webkit.org
Date 2012-07-31 07:41:37 -0700 (Tue, 31 Jul 2012)


Log Message
[WK2] Visible content rect update with null trajectory vector does not reach the backing store
https://bugs.webkit.org/show_bug.cgi?id=92750

Reviewed by Jocelyn Turcotte.

Make sure that notifications with a null trajectory vector reach the backing store
since a null vector means that all tiles around the viewport were requested.

* WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:
(WebKit::LayerTreeCoordinator::setVisibleContentsRect):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (124199 => 124200)

--- trunk/Source/WebKit2/ChangeLog	2012-07-31 14:35:24 UTC (rev 124199)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-31 14:41:37 UTC (rev 124200)
@@ -1,3 +1,16 @@
+2012-07-31  Andras Becsi  andras.be...@nokia.com
+
+[WK2] Visible content rect update with null trajectory vector does not reach the backing store
+https://bugs.webkit.org/show_bug.cgi?id=92750
+
+Reviewed by Jocelyn Turcotte.
+
+Make sure that notifications with a null trajectory vector reach the backing store
+since a null vector means that all tiles around the viewport were requested.
+
+* WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:
+(WebKit::LayerTreeCoordinator::setVisibleContentsRect):
+
 2012-07-31  Marcelo Lira  marcelo.l...@openbossa.org
 
 [Qt] Input method update should also include hints


Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp (124199 => 124200)

--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp	2012-07-31 14:35:24 UTC (rev 124199)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp	2012-07-31 14:41:37 UTC (rev 124200)
@@ -525,8 +525,8 @@
 bool contentsRectDidChange = rect != m_visibleContentsRect;
 bool contentsScaleDidChange = scale != m_contentsScale;
 
-if (trajectoryVector != FloatPoint::zero())
-toWebGraphicsLayer(m_nonCompositedContentLayer.get())-setVisibleContentRectTrajectoryVector(trajectoryVector);
+// A zero trajectoryVector indicates that tiles all around the viewport are requested.
+toWebGraphicsLayer(m_nonCompositedContentLayer.get())-setVisibleContentRectTrajectoryVector(trajectoryVector);
 
 if (contentsRectDidChange || contentsScaleDidChange) {
 m_visibleContentsRect = rect;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [122438] trunk/Source/WebKit2

[abecsi]

Title: [122438] trunk/Source/WebKit2








Revision 122438
Author abe...@webkit.org
Date 2012-07-12 03:04:42 -0700 (Thu, 12 Jul 2012)


Log Message
[Qt][WK2] ASSERT: !m_viewportItem-isMoving() in QtViewportHandler::flickMoveEnded()
https://bugs.webkit.org/show_bug.cgi?id=90875

Reviewed by Kenneth Rohde Christiansen.

Since MultiPointTouchArea and PinchArea use the childMouseEventFilter
method to filter touch events and because Flickable filters child mouse
events the canvas calls this function before propagating the touch event
to the WebView. Since Flickable does not accept touch events the canvas
tries to propagate a synthesized mouse event through the base class
childMouseEventFilter function which is accepted by Flickable and
interferes with the input events we send to Flicakble hence messes up
the internal state of the WebView.
This patch reimplements the virtual childMouseEventFilter method so that all
the mouse and touch events can be processed by WebKit before they arrive to
Flickable.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebView::childMouseEventFilter):
* UIProcess/API/qt/qquickwebview_p.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (122437 => 122438)

--- trunk/Source/WebKit2/ChangeLog	2012-07-12 10:04:31 UTC (rev 122437)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-12 10:04:42 UTC (rev 122438)
@@ -1,3 +1,26 @@
+2012-07-11  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] ASSERT: !m_viewportItem-isMoving() in QtViewportHandler::flickMoveEnded()
+https://bugs.webkit.org/show_bug.cgi?id=90875
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Since MultiPointTouchArea and PinchArea use the childMouseEventFilter
+method to filter touch events and because Flickable filters child mouse
+events the canvas calls this function before propagating the touch event
+to the WebView. Since Flickable does not accept touch events the canvas
+tries to propagate a synthesized mouse event through the base class
+childMouseEventFilter function which is accepted by Flickable and
+interferes with the input events we send to Flicakble hence messes up
+the internal state of the WebView.
+This patch reimplements the virtual childMouseEventFilter method so that all
+the mouse and touch events can be processed by WebKit before they arrive to
+Flickable.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebView::childMouseEventFilter):
+* UIProcess/API/qt/qquickwebview_p.h:
+
 2012-07-12  Carlos Garcia Campos  cgar...@igalia.com
 
 Unreviewed. Fix GTK+ debug build after r122425.


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (122437 => 122438)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-07-12 10:04:31 UTC (rev 122437)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-07-12 10:04:42 UTC (rev 122438)
@@ -1655,6 +1655,38 @@
 WTF::initializeMainThread();
 }
 
+bool QQuickWebView::childMouseEventFilter(QQuickItem* item, QEvent* event)
+{
+if (!isVisible() || !isEnabled() || !s_flickableViewportEnabled)
+return QQuickFlickable::childMouseEventFilter(item, event);
+
+// This function is used by MultiPointTouchArea and PinchArea to filter
+// touch events, thus to hinder the canvas from sending synthesized
+// mouse events to the Flickable implementation we need to reimplement
+// childMouseEventFilter and filter incoming touch events as well.
+
+switch (event-type()) {
+case QEvent::MouseButtonPress:
+mousePressEvent(static_castQMouseEvent*(event));
+return event-isAccepted();
+case QEvent::MouseMove:
+mouseMoveEvent(static_castQMouseEvent*(event));
+return event-isAccepted();
+case QEvent::MouseButtonRelease:
+mouseReleaseEvent(static_castQMouseEvent*(event));
+return event-isAccepted();
+case QEvent::TouchBegin:
+case QEvent::TouchUpdate:
+case QEvent::TouchEnd:
+touchEvent(static_castQTouchEvent*(event));
+return event-isAccepted();
+default:
+break;
+}
+
+return QQuickFlickable::childMouseEventFilter(item, event);
+}
+
 void QQuickWebView::geometryChanged(const QRectF newGeometry, const QRectF oldGeometry)
 {
 Q_D(QQuickWebView);


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (122437 => 122438)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-07-12 10:04:31 UTC (rev 122437)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-07-12 10:04:42 UTC (rev 122438)
@@ -168,6 +168,7 @@
 void navigationRequested(QWebNavigationRequest* request);
 
 protected:
+virtual bool childMouseEventFilter(QQuickItem*, 

[webkit-changes] [122318] trunk/Source/WebKit2

[abecsi]

Title: [122318] trunk/Source/WebKit2








Revision 122318
Author abe...@webkit.org
Date 2012-07-11 02:40:23 -0700 (Wed, 11 Jul 2012)


Log Message
[Qt][WK2] ASSERT: !m_viewportItem-isMoving() in QtViewportHandler::flickMoveEnded()
https://bugs.webkit.org/show_bug.cgi?id=90875

Reviewed by Kenneth Rohde Christiansen.

Since MultiPointTouchArea and PinchArea use the childMouseEventFilter
method to filter touch events too, and because Flickable filters child
mouse events the canvas calls this function before propagating the touch
event to the WebView. Since Flickable does not accept touch events the
canvas tries to propagate a synthesized mouse event through the base
class childMouseEventFilter function which is accepted by Flickable and
interferes with the input events we send to Flicakble hence messes up
the internal state of the WebView.
This patch reimplements the virtual childMouseEventFilter method so that all
the mouse and touch events can be processed by WebKit before they arrive to
Flickable.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebView::childMouseEventFilter):
* UIProcess/API/qt/qquickwebview_p.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (122317 => 122318)

--- trunk/Source/WebKit2/ChangeLog	2012-07-11 09:28:06 UTC (rev 122317)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-11 09:40:23 UTC (rev 122318)
@@ -1,3 +1,26 @@
+2012-07-11  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] ASSERT: !m_viewportItem-isMoving() in QtViewportHandler::flickMoveEnded()
+https://bugs.webkit.org/show_bug.cgi?id=90875
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Since MultiPointTouchArea and PinchArea use the childMouseEventFilter
+method to filter touch events too, and because Flickable filters child
+mouse events the canvas calls this function before propagating the touch
+event to the WebView. Since Flickable does not accept touch events the
+canvas tries to propagate a synthesized mouse event through the base
+class childMouseEventFilter function which is accepted by Flickable and
+interferes with the input events we send to Flicakble hence messes up
+the internal state of the WebView.
+This patch reimplements the virtual childMouseEventFilter method so that all
+the mouse and touch events can be processed by WebKit before they arrive to
+Flickable.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebView::childMouseEventFilter):
+* UIProcess/API/qt/qquickwebview_p.h:
+
 2012-07-10  Christophe Dumez  christophe.du...@intel.com
 
 [WK2][EFL] Add Battery Status Provider


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (122317 => 122318)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-07-11 09:28:06 UTC (rev 122317)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-07-11 09:40:23 UTC (rev 122318)
@@ -1655,6 +1655,38 @@
 WTF::initializeMainThread();
 }
 
+bool QQuickWebView::childMouseEventFilter(QQuickItem* item, QEvent* event)
+{
+// This function is used by MultiPointTouchArea and PinchArea to filter
+// touch events, thus to hinder the canvas from sending synthesized
+// mouse events to the Flickable implementation we need to reimplement
+// childMouseEventFilter and filter incoming touch events as well.
+
+if (!isVisible() || !isEnabled())
+return QQuickFlickable::childMouseEventFilter(item, event);
+
+switch (event-type()) {
+case QEvent::MouseButtonPress:
+mousePressEvent(static_castQMouseEvent*(event));
+return event-isAccepted();
+case QEvent::MouseMove:
+mouseMoveEvent(static_castQMouseEvent*(event));
+return event-isAccepted();
+case QEvent::MouseButtonRelease:
+mouseReleaseEvent(static_castQMouseEvent*(event));
+return event-isAccepted();
+case QEvent::TouchBegin:
+case QEvent::TouchUpdate:
+case QEvent::TouchEnd:
+touchEvent(static_castQTouchEvent*(event));
+return event-isAccepted();
+default:
+break;
+}
+
+return QQuickFlickable::childMouseEventFilter(item, event);
+}
+
 void QQuickWebView::geometryChanged(const QRectF newGeometry, const QRectF oldGeometry)
 {
 Q_D(QQuickWebView);


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (122317 => 122318)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-07-11 09:28:06 UTC (rev 122317)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-07-11 09:40:23 UTC (rev 122318)
@@ -168,6 +168,7 @@
 void navigationRequested(QWebNavigationRequest* request);
 
 protected:
+virtual bool childMouseEventFilter(QQuickItem*, QEvent*);
 virtual void geometryChanged(const QRectF, const QRectF);
 virtual 

[webkit-changes] [122321] trunk/Source/WebKit2

[abecsi]

Title: [122321] trunk/Source/WebKit2








Revision 122321
Author abe...@webkit.org
Date 2012-07-11 02:49:25 -0700 (Wed, 11 Jul 2012)


Log Message
[Qt][WK2] Fix wheel scrolling for simple pages
https://bugs.webkit.org/show_bug.cgi?id=90793

Reviewed by Kenneth Rohde Christiansen.

Call WebPage::setFixedLayoutSize in setResizesToContentsUsingLayoutSize
instead of setting the view size manually and scheduling a relayout.
Since setFixedLayoutSize forces a relayout it also updates the scrollbars
after the visible rect is available.
This fixes scrolling with wheel events for a QML WebView loading a simple
local page which previously ended up in a state where scrolling was disabled
because the scrollbar update happened before the correct visible rect size was
available.

Add a QML test and infrastructure to QWebKitTest to cover this case.

* UIProcess/API/qt/qwebkittest.cpp:
(QWebKitTest::wheelEvent):
* UIProcess/API/qt/qwebkittest_p.h:
* UIProcess/API/qt/tests/qmltests/WebView/tst_wheelEventHandling.qml: Added.
* UIProcess/API/qt/tests/qmltests/common/test4.html: Added.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setResizesToContentsUsingLayoutSize):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp


Added Paths

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_wheelEventHandling.qml
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/common/test4.html




Diff

Modified: trunk/Source/WebKit2/ChangeLog (122320 => 122321)

--- trunk/Source/WebKit2/ChangeLog	2012-07-11 09:44:03 UTC (rev 122320)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-11 09:49:25 UTC (rev 122321)
@@ -1,5 +1,31 @@
 2012-07-11  Andras Becsi  andras.be...@nokia.com
 
+[Qt][WK2] Fix wheel scrolling for simple pages
+https://bugs.webkit.org/show_bug.cgi?id=90793
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Call WebPage::setFixedLayoutSize in setResizesToContentsUsingLayoutSize
+instead of setting the view size manually and scheduling a relayout.
+Since setFixedLayoutSize forces a relayout it also updates the scrollbars
+after the visible rect is available.
+This fixes scrolling with wheel events for a QML WebView loading a simple
+local page which previously ended up in a state where scrolling was disabled
+because the scrollbar update happened before the correct visible rect size was
+available.
+
+Add a QML test and infrastructure to QWebKitTest to cover this case.
+
+* UIProcess/API/qt/qwebkittest.cpp:
+(QWebKitTest::wheelEvent):
+* UIProcess/API/qt/qwebkittest_p.h:
+* UIProcess/API/qt/tests/qmltests/WebView/tst_wheelEventHandling.qml: Added.
+* UIProcess/API/qt/tests/qmltests/common/test4.html: Added.
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::setResizesToContentsUsingLayoutSize):
+
+2012-07-11  Andras Becsi  andras.be...@nokia.com
+
 [Qt][WK2] ASSERT: !m_viewportItem-isMoving() in QtViewportHandler::flickMoveEnded()
 https://bugs.webkit.org/show_bug.cgi?id=90875
 


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp (122320 => 122321)

--- trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp	2012-07-11 09:44:03 UTC (rev 122320)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp	2012-07-11 09:49:25 UTC (rev 122321)
@@ -25,6 +25,7 @@
 #include qquickwebview_p_p.h
 #include QMutableListIterator
 #include QTouchEvent
+#include QWheelEvent
 #include qpa/qwindowsysteminterface.h
 
 using namespace WebKit;
@@ -113,6 +114,24 @@
 return true;
 }
 
+bool QWebKitTest::wheelEvent(QObject* item, qreal x, qreal y, int delta, Qt::Orientation orient)
+{
+QQuickWebView* window = qobject_castQQuickWebView*(item);
+
+if (!window) {
+qWarning(Wheel event not accepted by receiving item);
+return false;
+}
+
+QWheelEvent event(QPointF(x, y), delta, Qt::NoButton, Qt::NoModifier, orient);
+event.setTimestamp(QDateTime::currentMSecsSinceEpoch());
+event.setAccepted(false);
+
+window-wheelEvent(event);
+
+return event.isAccepted();
+}
+
 QSize QWebKitTest::contentsSize() const
 {
 return QSize(m_webViewPrivate-pageView-contentsSize().toSize());


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h (122320 => 122321)

--- trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h	2012-07-11 09:44:03 UTC (rev 122320)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h	2012-07-11 09:49:25 UTC (rev 122321)
@@ -56,6 +56,7 @@
 public slots:
 bool touchTap(QObject* item, qreal x, qreal y, int delay = -1);
 bool touchDoubleTap(QObject* item, qreal x, qreal y, int delay = -1);
+bool wheelEvent(QObject* item, qreal x, qreal y, int delta, Qt::Orientation orient = Qt::Vertical);
 
 public:
 

[webkit-changes] [122325] trunk/Source/WebKit2

[abecsi]

Title: [122325] trunk/Source/WebKit2








Revision 122325
Author abe...@webkit.org
Date 2012-07-11 03:40:41 -0700 (Wed, 11 Jul 2012)


Log Message
Unreviewed, rolling out r122318.
http://trac.webkit.org/changeset/122318
https://bugs.webkit.org/show_bug.cgi?id=90961

It made 11 fast/events/touch fail (Requested by bbandix on
#webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2012-07-11

* UIProcess/API/qt/qquickwebview.cpp:
* UIProcess/API/qt/qquickwebview_p.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (122324 => 122325)

--- trunk/Source/WebKit2/ChangeLog	2012-07-11 10:35:31 UTC (rev 122324)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-11 10:40:41 UTC (rev 122325)
@@ -1,3 +1,15 @@
+2012-07-11  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r122318.
+http://trac.webkit.org/changeset/122318
+https://bugs.webkit.org/show_bug.cgi?id=90961
+
+It made 11 fast/events/touch fail (Requested by bbandix on
+#webkit).
+
+* UIProcess/API/qt/qquickwebview.cpp:
+* UIProcess/API/qt/qquickwebview_p.h:
+
 2012-07-11  Keunsoon Lee  keunsoon@samsung.com
 
 [EFL][Wk2] WebErrorsEfl.cpp needs to return non-empty errors


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (122324 => 122325)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-07-11 10:35:31 UTC (rev 122324)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-07-11 10:40:41 UTC (rev 122325)
@@ -1655,38 +1655,6 @@
 WTF::initializeMainThread();
 }
 
-bool QQuickWebView::childMouseEventFilter(QQuickItem* item, QEvent* event)
-{
-// This function is used by MultiPointTouchArea and PinchArea to filter
-// touch events, thus to hinder the canvas from sending synthesized
-// mouse events to the Flickable implementation we need to reimplement
-// childMouseEventFilter and filter incoming touch events as well.
-
-if (!isVisible() || !isEnabled())
-return QQuickFlickable::childMouseEventFilter(item, event);
-
-switch (event-type()) {
-case QEvent::MouseButtonPress:
-mousePressEvent(static_castQMouseEvent*(event));
-return event-isAccepted();
-case QEvent::MouseMove:
-mouseMoveEvent(static_castQMouseEvent*(event));
-return event-isAccepted();
-case QEvent::MouseButtonRelease:
-mouseReleaseEvent(static_castQMouseEvent*(event));
-return event-isAccepted();
-case QEvent::TouchBegin:
-case QEvent::TouchUpdate:
-case QEvent::TouchEnd:
-touchEvent(static_castQTouchEvent*(event));
-return event-isAccepted();
-default:
-break;
-}
-
-return QQuickFlickable::childMouseEventFilter(item, event);
-}
-
 void QQuickWebView::geometryChanged(const QRectF newGeometry, const QRectF oldGeometry)
 {
 Q_D(QQuickWebView);


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (122324 => 122325)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-07-11 10:35:31 UTC (rev 122324)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-07-11 10:40:41 UTC (rev 122325)
@@ -168,7 +168,6 @@
 void navigationRequested(QWebNavigationRequest* request);
 
 protected:
-virtual bool childMouseEventFilter(QQuickItem*, QEvent*);
 virtual void geometryChanged(const QRectF, const QRectF);
 virtual void componentComplete();
 virtual void keyPressEvent(QKeyEvent*);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [120594] trunk/Source/WebKit/qt

[abecsi]

Title: [120594] trunk/Source/WebKit/qt








Revision 120594
Author abe...@webkit.org
Date 2012-06-18 07:27:25 -0700 (Mon, 18 Jun 2012)


Log Message
[Qt] Update QML plugins to Qt 5 style
https://bugs.webkit.org/show_bug.cgi?id=89027

Reviewed by Csaba Osztrogonác.

Since support for Qt 4 style plugins was removed from Qt 5
we need to update our plugins to the new style to be able
to build with a more recent Qt 5 hash.
Add empty plugin description json files for now.

* declarative/experimental/plugin.cpp:
* declarative/experimental/plugin.json: Added.
* declarative/plugin.cpp:
(WebKitQmlPlugin):
* declarative/plugin.json: Added.

Modified Paths

trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp
trunk/Source/WebKit/qt/declarative/plugin.cpp


Added Paths

trunk/Source/WebKit/qt/declarative/experimental/plugin.json
trunk/Source/WebKit/qt/declarative/plugin.json




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (120593 => 120594)

--- trunk/Source/WebKit/qt/ChangeLog	2012-06-18 14:10:20 UTC (rev 120593)
+++ trunk/Source/WebKit/qt/ChangeLog	2012-06-18 14:27:25 UTC (rev 120594)
@@ -1,3 +1,21 @@
+2012-06-18  Andras Becsi  andras.be...@nokia.com
+
+[Qt] Update QML plugins to Qt 5 style
+https://bugs.webkit.org/show_bug.cgi?id=89027
+
+Reviewed by Csaba Osztrogonác.
+
+Since support for Qt 4 style plugins was removed from Qt 5
+we need to update our plugins to the new style to be able
+to build with a more recent Qt 5 hash.
+Add empty plugin description json files for now.
+
+* declarative/experimental/plugin.cpp:
+* declarative/experimental/plugin.json: Added.
+* declarative/plugin.cpp:
+(WebKitQmlPlugin):
+* declarative/plugin.json: Added.
+
 2012-06-13  Simon Hausmann  simon.hausm...@nokia.com
 
 [Qt] Remove dependency to QtScript for the Qt 5 build


Modified: trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp (120593 => 120594)

--- trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp	2012-06-18 14:10:20 UTC (rev 120593)
+++ trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp	2012-06-18 14:27:25 UTC (rev 120594)
@@ -45,6 +45,7 @@
 
 class WebKitQmlExperimentalExtensionPlugin: public QQmlExtensionPlugin {
 Q_OBJECT
+Q_PLUGIN_METADATA(IID org.qt-project.Qt.QQmlExtensionInterface FILE plugin.json)
 public:
 virtual void registerTypes(const char* uri)
 {
@@ -76,5 +77,3 @@
 QT_END_NAMESPACE
 
 #include plugin.moc
-
-Q_EXPORT_PLUGIN2(qmlwebkitpluginexperimental, QT_PREPEND_NAMESPACE(WebKitQmlExperimentalExtensionPlugin));


Added: trunk/Source/WebKit/qt/declarative/experimental/plugin.json (0 => 120594)

--- trunk/Source/WebKit/qt/declarative/experimental/plugin.json	(rev 0)
+++ trunk/Source/WebKit/qt/declarative/experimental/plugin.json	2012-06-18 14:27:25 UTC (rev 120594)
@@ -0,0 +1 @@
+{}


Modified: trunk/Source/WebKit/qt/declarative/plugin.cpp (120593 => 120594)

--- trunk/Source/WebKit/qt/declarative/plugin.cpp	2012-06-18 14:10:20 UTC (rev 120593)
+++ trunk/Source/WebKit/qt/declarative/plugin.cpp	2012-06-18 14:27:25 UTC (rev 120594)
@@ -48,6 +48,7 @@
 
 #if QT_VERSION = 0x05
 class WebKitQmlPlugin : public QQmlExtensionPlugin {
+Q_PLUGIN_METADATA(IID org.qt-project.Qt.QQmlExtensionInterface FILE plugin.json)
 #else
 class WebKitQmlPlugin : public QDeclarativeExtensionPlugin {
 #endif
@@ -88,4 +89,6 @@
 
 #include plugin.moc
 
+#if QT_VERSION  0x05
 Q_EXPORT_PLUGIN2(qmlwebkitplugin, QT_PREPEND_NAMESPACE(WebKitQmlPlugin));
+#endif


Added: trunk/Source/WebKit/qt/declarative/plugin.json (0 => 120594)

--- trunk/Source/WebKit/qt/declarative/plugin.json	(rev 0)
+++ trunk/Source/WebKit/qt/declarative/plugin.json	2012-06-18 14:27:25 UTC (rev 120594)
@@ -0,0 +1 @@
+{}






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [120233] trunk/Source/WebKit2

[abecsi]

Title: [120233] trunk/Source/WebKit2








Revision 120233
Author abe...@webkit.org
Date 2012-06-13 12:09:21 -0700 (Wed, 13 Jun 2012)


Log Message
[Qt][WK2] ASSERT(m_rawAttributes.initialScale  0) in QtViewportHandler::initialRect()
https://bugs.webkit.org/show_bug.cgi?id=89026

Reviewed by Csaba Osztrogonác.

Only act on viewport attribute changes if the layout size is valid.

* UIProcess/qt/QtViewportHandler.cpp:
(WebKit::QtViewportHandler::setInitialScaleIfNeeded):
(WebKit::QtViewportHandler::viewportAttributesChanged):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (120232 => 120233)

--- trunk/Source/WebKit2/ChangeLog	2012-06-13 19:08:13 UTC (rev 120232)
+++ trunk/Source/WebKit2/ChangeLog	2012-06-13 19:09:21 UTC (rev 120233)
@@ -1,3 +1,16 @@
+2012-06-13  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] ASSERT(m_rawAttributes.initialScale  0) in QtViewportHandler::initialRect()
+https://bugs.webkit.org/show_bug.cgi?id=89026
+
+Reviewed by Csaba Osztrogonác.
+
+Only act on viewport attribute changes if the layout size is valid.
+
+* UIProcess/qt/QtViewportHandler.cpp:
+(WebKit::QtViewportHandler::setInitialScaleIfNeeded):
+(WebKit::QtViewportHandler::viewportAttributesChanged):
+
 2012-06-13  Brent Fulgham  bfulg...@webkit.org
 
 [WinCairo] Build fix after Windows export definition file change.


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp (120232 => 120233)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp	2012-06-13 19:08:13 UTC (rev 120232)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp	2012-06-13 19:09:21 UTC (rev 120233)
@@ -202,7 +202,7 @@
 
 void QtViewportHandler::setInitialScaleIfNeeded()
 {
-if (m_rawAttributes.initialScale  0)
+if (m_rawAttributes.layoutSize.isEmpty() || m_rawAttributes.initialScale  0)
 return;
 
 m_zoomOutScale = 0.0;
@@ -219,6 +219,9 @@
 
 void QtViewportHandler::viewportAttributesChanged(const WebCore::ViewportAttributes newAttributes)
 {
+if (newAttributes.layoutSize.isEmpty())
+return;
+
 m_rawAttributes = newAttributes;
 WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(m_rawAttributes);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [119697] trunk/Source/WebKit2

[abecsi]

Title: [119697] trunk/Source/WebKit2








Revision 119697
Author abe...@webkit.org
Date 2012-06-07 02:38:45 -0700 (Thu, 07 Jun 2012)


Log Message
[Qt][WK2] setPageItemRectVisible() is not guarded by ViewportUpdateDeferrer at scaleAnimationValueChanged()
https://bugs.webkit.org/show_bug.cgi?id=87954

Reviewed by Kenneth Rohde Christiansen.

Resetting the end value, the easing curve or the duration of the scale animation triggers
a recalculation of the animation interval. This might change the current value of the
animated property.
Since guarding of setPageItemRectVisible() relies on animation state change we have to
make sure we only act on animation value changes if the animation is in active state.

* UIProcess/qt/QtViewportHandler.cpp:
(WebKit::QtViewportHandler::QtViewportHandler):
(WebKit::QtViewportHandler::animatePageItemRectVisible):
(WebKit::QtViewportHandler::scaleAnimationValueChanged):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (119696 => 119697)

--- trunk/Source/WebKit2/ChangeLog	2012-06-07 09:26:37 UTC (rev 119696)
+++ trunk/Source/WebKit2/ChangeLog	2012-06-07 09:38:45 UTC (rev 119697)
@@ -1,3 +1,21 @@
+2012-06-07  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] setPageItemRectVisible() is not guarded by ViewportUpdateDeferrer at scaleAnimationValueChanged()
+https://bugs.webkit.org/show_bug.cgi?id=87954
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Resetting the end value, the easing curve or the duration of the scale animation triggers
+a recalculation of the animation interval. This might change the current value of the
+animated property.
+Since guarding of setPageItemRectVisible() relies on animation state change we have to
+make sure we only act on animation value changes if the animation is in active state.
+
+* UIProcess/qt/QtViewportHandler.cpp:
+(WebKit::QtViewportHandler::QtViewportHandler):
+(WebKit::QtViewportHandler::animatePageItemRectVisible):
+(WebKit::QtViewportHandler::scaleAnimationValueChanged):
+
 2012-06-06  Carlos Garcia Campos  cgar...@igalia.com
 
 [SOUP] WebSoupRequestManager should handle loading errors and zero-length replies


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp (119696 => 119697)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp	2012-06-07 09:26:37 UTC (rev 119696)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp	2012-06-07 09:38:45 UTC (rev 119697)
@@ -163,6 +163,9 @@
 , m_lastCommittedScale(-1)
 , m_zoomOutScale(0.0)
 {
+m_scaleAnimation-setDuration(kScaleAnimationDurationMillis);
+m_scaleAnimation-setEasingCurve(QEasingCurve::OutCubic);
+
 connect(m_viewportItem, SIGNAL(movementStarted()), SLOT(flickMoveStarted()), Qt::DirectConnection);
 connect(m_viewportItem, SIGNAL(movementEnded()), SLOT(flickMoveEnded()), Qt::DirectConnection);
 
@@ -292,9 +295,6 @@
 if (itemRect == currentPageItemRectVisible)
 return;
 
-m_scaleAnimation-setDuration(kScaleAnimationDurationMillis);
-m_scaleAnimation-setEasingCurve(QEasingCurve::OutCubic);
-
 m_scaleAnimation-setStartValue(currentPageItemRectVisible);
 m_scaleAnimation-setEndValue(itemRect);
 
@@ -366,6 +366,13 @@
 
 void QtViewportHandler::scaleAnimationValueChanged(QVariant value)
 {
+// Resetting the end value, the easing curve or the duration of the scale animation
+// triggers a recalculation of the animation interval. This might change the current
+// value of the animated property.
+// Make sure we only act on animation value changes if the animation is active.
+if (!scaleAnimationActive())
+return;
+
 setPageItemRectVisible(value.toRectF());
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [119385] trunk/Source/WebKit2

[abecsi]

Title: [119385] trunk/Source/WebKit2








Revision 119385
Author abe...@webkit.org
Date 2012-06-04 04:31:15 -0700 (Mon, 04 Jun 2012)


Log Message
[Qt][WK2] Refactor the tap gesture recognizer
https://bugs.webkit.org/show_bug.cgi?id=88096

Reviewed by Simon Hausmann.

Refactor the tap gesture recognizer so that its internal state machine is
self contained and independent of input event types.
Also change the internal API for tap highlighting to make the code easier
to understand on the caller side.

This patch makes the tap gesture recognizer more robust, consistent with
other gesture recognizers and fixes some issues related to highlighting
and link activation with respect to native touch events.

* UIProcess/qt/QtTapGestureRecognizer.cpp:
(WebKit::QtTapGestureRecognizer::QtTapGestureRecognizer):
(WebKit::QtTapGestureRecognizer::withinDistance):
(WebKit::QtTapGestureRecognizer::update):
(WebKit::QtTapGestureRecognizer::finish):
(WebKit::QtTapGestureRecognizer::cancel):
(WebKit::QtTapGestureRecognizer::highlightTimeout):
(WebKit::QtTapGestureRecognizer::singleTapTimeout):
(WebKit::QtTapGestureRecognizer::tapAndHoldTimeout):
(WebKit::QtTapGestureRecognizer::reset):
* UIProcess/qt/QtTapGestureRecognizer.h:
(QtTapGestureRecognizer):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::QtWebPageEventHandler):
(WebKit::QtWebPageEventHandler::activateTapHighlight):
(WebKit::QtWebPageEventHandler::deactivateTapHighlight):
(WebKit):
(WebKit::QtWebPageEventHandler::handleSingleTapEvent):
(WebKit::QtWebPageEventHandler::handleDoubleTapEvent):
(WebKit::QtWebPageEventHandler::doneWithTouchEvent):
* UIProcess/qt/QtWebPageEventHandler.h:
(QtWebPageEventHandler):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (119384 => 119385)

--- trunk/Source/WebKit2/ChangeLog	2012-06-04 11:26:11 UTC (rev 119384)
+++ trunk/Source/WebKit2/ChangeLog	2012-06-04 11:31:15 UTC (rev 119385)
@@ -1,3 +1,42 @@
+2012-06-04  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Refactor the tap gesture recognizer
+https://bugs.webkit.org/show_bug.cgi?id=88096
+
+Reviewed by Simon Hausmann.
+
+Refactor the tap gesture recognizer so that its internal state machine is
+self contained and independent of input event types.
+Also change the internal API for tap highlighting to make the code easier
+to understand on the caller side.
+
+This patch makes the tap gesture recognizer more robust, consistent with
+other gesture recognizers and fixes some issues related to highlighting
+and link activation with respect to native touch events.
+
+* UIProcess/qt/QtTapGestureRecognizer.cpp:
+(WebKit::QtTapGestureRecognizer::QtTapGestureRecognizer):
+(WebKit::QtTapGestureRecognizer::withinDistance):
+(WebKit::QtTapGestureRecognizer::update):
+(WebKit::QtTapGestureRecognizer::finish):
+(WebKit::QtTapGestureRecognizer::cancel):
+(WebKit::QtTapGestureRecognizer::highlightTimeout):
+(WebKit::QtTapGestureRecognizer::singleTapTimeout):
+(WebKit::QtTapGestureRecognizer::tapAndHoldTimeout):
+(WebKit::QtTapGestureRecognizer::reset):
+* UIProcess/qt/QtTapGestureRecognizer.h:
+(QtTapGestureRecognizer):
+* UIProcess/qt/QtWebPageEventHandler.cpp:
+(WebKit::QtWebPageEventHandler::QtWebPageEventHandler):
+(WebKit::QtWebPageEventHandler::activateTapHighlight):
+(WebKit::QtWebPageEventHandler::deactivateTapHighlight):
+(WebKit):
+(WebKit::QtWebPageEventHandler::handleSingleTapEvent):
+(WebKit::QtWebPageEventHandler::handleDoubleTapEvent):
+(WebKit::QtWebPageEventHandler::doneWithTouchEvent):
+* UIProcess/qt/QtWebPageEventHandler.h:
+(QtWebPageEventHandler):
+
 2012-06-02  Geoffrey Garen  gga...@apple.com
 
 Try to fix the Windows build.


Modified: trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp (119384 => 119385)

--- trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp	2012-06-04 11:26:11 UTC (rev 119384)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp	2012-06-04 11:31:15 UTC (rev 119385)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2011, 2012 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,73 +27,92 @@
 
 #include QtWebPageEventHandler.h
 #include QLineF
-#include QTouchEvent
 
 namespace WebKit {
 
+// FIXME: These constants should possibly depend on DPI.
+static 

[webkit-changes] [119081] trunk/LayoutTests

[abecsi]

Title: [119081] trunk/LayoutTests








Revision 119081
Author abe...@webkit.org
Date 2012-05-31 03:10:38 -0700 (Thu, 31 May 2012)


Log Message
Test expectation pngs missing checksums
https://bugs.webkit.org/show_bug.cgi?id=87947

Reviewed by Ojan Vafai.

Add proper platform independent png expectation with checksum and revert chromium
expectations since layoutTestController.keepWebHistory() seems to have no effect
on chromium, and the test is still failing (See bug 87839).

* http/tests/misc/acid3-expected.png: Add png with embedded checksum.
* platform/chromium-mac-leopard/http/tests/misc/acid3-expected.png: Revert to prior r118566.
* platform/chromium-mac-snowleopard/http/tests/misc/acid3-expected.png: Revert to prior r118566.
* platform/chromium-mac/http/tests/misc/acid3-expected.png: Revert to prior r118566.
* platform/chromium-mac/http/tests/misc/acid3-expected.txt: Revert to prior r118566.
* platform/chromium/test_expectations.txt: Revert to prior r118566.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/misc/acid3-expected.png
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/LayoutTests/platform/chromium-mac/http/tests/misc/acid3-expected.png
trunk/LayoutTests/platform/chromium-mac/http/tests/misc/acid3-expected.txt
trunk/LayoutTests/platform/chromium-mac-leopard/http/tests/misc/acid3-expected.png
trunk/LayoutTests/platform/chromium-mac-snowleopard/http/tests/misc/acid3-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (119080 => 119081)

--- trunk/LayoutTests/ChangeLog	2012-05-31 10:02:14 UTC (rev 119080)
+++ trunk/LayoutTests/ChangeLog	2012-05-31 10:10:38 UTC (rev 119081)
@@ -1,3 +1,21 @@
+2012-05-31  Andras Becsi  andras.be...@nokia.com
+
+Test expectation pngs missing checksums
+https://bugs.webkit.org/show_bug.cgi?id=87947
+
+Reviewed by Ojan Vafai.
+
+Add proper platform independent png expectation with checksum and revert chromium
+expectations since layoutTestController.keepWebHistory() seems to have no effect
+on chromium, and the test is still failing (See bug 87839).
+
+* http/tests/misc/acid3-expected.png: Add png with embedded checksum.
+* platform/chromium-mac-leopard/http/tests/misc/acid3-expected.png: Revert to prior r118566.
+* platform/chromium-mac-snowleopard/http/tests/misc/acid3-expected.png: Revert to prior r118566.
+* platform/chromium-mac/http/tests/misc/acid3-expected.png: Revert to prior r118566.
+* platform/chromium-mac/http/tests/misc/acid3-expected.txt: Revert to prior r118566.
+* platform/chromium/test_expectations.txt: Revert to prior r118566.
+
 2012-05-31  Mikhail Pozdnyakov  mikhail.pozdnya...@intel.com
 
 [EFL] Gardening after r118957


Modified: trunk/LayoutTests/http/tests/misc/acid3-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (119080 => 119081)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-05-31 10:02:14 UTC (rev 119080)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-05-31 10:10:38 UTC (rev 119081)
@@ -1411,9 +1411,9 @@
 
 BUGWK80227 : editing/selection/select-line-break-with-opposite-directionality.html = PASS TEXT
 
-// This test isn't hanging, it just takes 12-13 seconds to run. MISSING for acid3 is part of BUGWK87552, probably due to missing checksum.
-BUGCR30536 SLOW LINUX WIN : http/tests/misc/acid3.html = FAIL MISSING // See SVG Tests section too
-BUGCR30536 SLOW MAC : http/tests/misc/acid3.html = IMAGE+TEXT PASS MISSING
+// This test isn't hanging, it just takes 12-13 seconds to run. See BUGWK87839.
+BUGCR30536 SLOW LINUX WIN : http/tests/misc/acid3.html = FAIL // See SVG Tests section too
+BUGCR30536 SLOW MAC : http/tests/misc/acid3.html = IMAGE+TEXT PASS
 BUGCR30536 : http/tests/misc/favicon-as-image.html = FAIL
 
 // Has failed for Chromium since it was first checked in.  (Lighttpd related?)


Modified: trunk/LayoutTests/platform/chromium-mac/http/tests/misc/acid3-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium-mac/http/tests/misc/acid3-expected.txt (119080 => 119081)

--- trunk/LayoutTests/platform/chromium-mac/http/tests/misc/acid3-expected.txt	2012-05-31 10:02:14 UTC (rev 119080)
+++ trunk/LayoutTests/platform/chromium-mac/http/tests/misc/acid3-expected.txt	2012-05-31 10:10:38 UTC (rev 119081)
@@ -229,7 +229,7 @@
 RenderBody {BODY} at (8,16) size 284x0
   RenderBlock {P} at (0,0) size 284x0
 layer at (17,18) size 80x36
-  RenderBlock (positioned) {A} at (17,18) size 80x36 [color=#FF]
+  RenderBlock (positioned) {A} at (17,18) size 80x36 [color=#FF]
 RenderText {#text} at (0,0) size 71x36
   text run at (0,0) width 67: YOU SHOULD
   text run at (0,12) width 71: NOT SEE THIS


Modified: trunk/LayoutTests/platform/chromium-mac-leopard/http/tests/misc/acid3-expected.png

(Binary files differ)


Modified: 

[webkit-changes] [118341] trunk/Source/WebKit2

[abecsi]

Title: [118341] trunk/Source/WebKit2








Revision 118341
Author abe...@webkit.org
Date 2012-05-24 03:15:36 -0700 (Thu, 24 May 2012)


Log Message
[Qt][WK2] Fix bounce-back animation on pinch-pan
https://bugs.webkit.org/show_bug.cgi?id=87266

Reviewed by Kenneth Rohde Christiansen.

If ending an out-of-bounds pinch gesture with releasing one finger
(transition to a pan gesture) the bounce back animation blinks in
the end position immediately first, then animates the content back
into bounds.

QtViewportInteractionEngine::cancelScrollAnimation should return
early if there is no active kinetic animation.

* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::cancelScrollAnimation):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (118340 => 118341)

--- trunk/Source/WebKit2/ChangeLog	2012-05-24 10:01:13 UTC (rev 118340)
+++ trunk/Source/WebKit2/ChangeLog	2012-05-24 10:15:36 UTC (rev 118341)
@@ -1,3 +1,21 @@
+2012-05-24  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Fix bounce-back animation on pinch-pan
+https://bugs.webkit.org/show_bug.cgi?id=87266
+
+Reviewed by Kenneth Rohde Christiansen.
+
+If ending an out-of-bounds pinch gesture with releasing one finger
+(transition to a pan gesture) the bounce back animation blinks in
+the end position immediately first, then animates the content back
+into bounds.
+
+QtViewportInteractionEngine::cancelScrollAnimation should return
+early if there is no active kinetic animation.
+
+* UIProcess/qt/QtViewportInteractionEngine.cpp:
+(WebKit::QtViewportInteractionEngine::cancelScrollAnimation):
+
 2012-05-23  Ojan Vafai  o...@chromium.org
 
 add back the ability to disable flexbox


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (118340 => 118341)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-05-24 10:01:13 UTC (rev 118340)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-05-24 10:15:36 UTC (rev 118341)
@@ -533,6 +533,9 @@
 
 void QtViewportInteractionEngine::cancelScrollAnimation()
 {
+if (!scrollAnimationActive())
+return;
+
 // If the pan gesture recognizer receives a touch begin event
 // during an ongoing kinetic scroll animation of a previous
 // pan gesture, the animation is stopped and the content is






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [117248] trunk

[abecsi]

Title: [117248] trunk








Revision 117248
Author abe...@webkit.org
Date 2012-05-16 02:58:59 -0700 (Wed, 16 May 2012)


Log Message
[WTR] Visited link tracking is not disabled properly
https://bugs.webkit.org/show_bug.cgi?id=76699

Reviewed by Jocelyn Turcotte.

Source/WebKit2:

If PLATFORM_STRATEGIES is enabled visited link tracking is done through
VisitedLinkProvider and not through PageGroup.
InjectedBundle sets the shouldTrackVisitedLinks flag on the PageGroup,
thus the shared VisitedLinkTable does get populated with visited links
regardless of the flag.

The WebProcess should only track visited links if tracking is specifically
enabled for a test through WTR's LayoutTestController.

This patch fixes several flacky and failing layout tests on Qt-WK2.

* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::setShouldTrackVisitedLinks): Let the WebProcess
know about visited link tracking.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::setShouldTrackVisitedLinks):
(WebKit::WebProcess::addVisitedLink):
* WebProcess/WebProcess.h:
(WebProcess):

LayoutTests:

* platform/qt-5.0-wk2/Skipped: Unskip passing tests.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/qt-5.0-wk2/Skipped
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
trunk/Source/WebKit2/WebProcess/WebProcess.h




Diff

Modified: trunk/LayoutTests/ChangeLog (117247 => 117248)

--- trunk/LayoutTests/ChangeLog	2012-05-16 09:54:21 UTC (rev 117247)
+++ trunk/LayoutTests/ChangeLog	2012-05-16 09:58:59 UTC (rev 117248)
@@ -1,3 +1,12 @@
+2012-05-16  Andras Becsi  andras.be...@nokia.com
+
+[WTR] Visited link tracking is not disabled properly
+https://bugs.webkit.org/show_bug.cgi?id=76699
+
+Reviewed by Jocelyn Turcotte.
+
+* platform/qt-5.0-wk2/Skipped: Unskip passing tests.
+
 2012-05-16  Kenichi Ishibashi  ba...@chromium.org
 
 [Chromium] Unreviewed test expectations update


Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (117247 => 117248)

--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped	2012-05-16 09:54:21 UTC (rev 117247)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped	2012-05-16 09:58:59 UTC (rev 117248)
@@ -396,17 +396,6 @@
 fast/dynamic/012.html
 platform/qt/plugins/qt-qwidget-plugin.html
 
-# [Qt][WK2]REGRESSION(r105461): It made 8 tests fail
-# https://bugs.webkit.org/show_bug.cgi?id=76699
-fast/block/margin-collapse/056.html
-tables/mozilla/marvin/backgr_simple-table-column.html
-tables/mozilla/marvin/backgr_simple-table-row-group.html
-tables/mozilla/marvin/backgr_simple-table-row.html
-tables/mozilla_expected_failures/marvin/backgr_border-table-column.html
-tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html
-tables/mozilla_expected_failures/marvin/backgr_layers-show.html
-tables/mozilla_expected_failures/marvin/backgr_position-table-column.html
-
 # [Qt][WK2] scrollbars/scroll-rtl-or-bt-layer.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=76986
 scrollbars/scroll-rtl-or-bt-layer.html
@@ -541,10 +530,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=80209
 http/tests/security/xss-DENIED-xsl-document-securityOrigin.xml
 
-# [Qt][WK2]REGRESSION(r105461): It made 8 tests fail and 30 tests flakey
-# https://bugs.webkit.org/show_bug.cgi?id=76699
-tables/mozilla/marvin/backgr_simple-table-cell.html
-
 # [Qt][WK2] Failing http/tests/plugins tests after reenabled plugins
 # https://bugs.webkit.org/show_bug.cgi?id=82895
 http/tests/plugins/create-v8-script-objects.html


Modified: trunk/Source/WebKit2/ChangeLog (117247 => 117248)

--- trunk/Source/WebKit2/ChangeLog	2012-05-16 09:54:21 UTC (rev 117247)
+++ trunk/Source/WebKit2/ChangeLog	2012-05-16 09:58:59 UTC (rev 117248)
@@ -1,3 +1,31 @@
+2012-05-16  Andras Becsi  andras.be...@nokia.com
+
+[WTR] Visited link tracking is not disabled properly
+https://bugs.webkit.org/show_bug.cgi?id=76699
+
+Reviewed by Jocelyn Turcotte.
+
+If PLATFORM_STRATEGIES is enabled visited link tracking is done through
+VisitedLinkProvider and not through PageGroup.
+InjectedBundle sets the shouldTrackVisitedLinks flag on the PageGroup,
+thus the shared VisitedLinkTable does get populated with visited links
+regardless of the flag.
+
+The WebProcess should only track visited links if tracking is specifically
+enabled for a test through WTR's LayoutTestController.
+
+This patch fixes several flacky and failing layout tests on Qt-WK2.
+
+* WebProcess/InjectedBundle/InjectedBundle.cpp:
+(WebKit::InjectedBundle::setShouldTrackVisitedLinks): Let the WebProcess
+know about visited link tracking.
+* WebProcess/WebProcess.cpp:
+(WebKit::WebProcess::WebProcess):
+(WebKit::WebProcess::setShouldTrackVisitedLinks):
+

[webkit-changes] [115311] trunk/Source/WebKit2

[abecsi]

Title: [115311] trunk/Source/WebKit2








Revision 115311
Author abe...@webkit.org
Date 2012-04-26 07:11:44 -0700 (Thu, 26 Apr 2012)


Log Message
[Qt][WK2] Tap highlight should have a delay not to interfere with panning
https://bugs.webkit.org/show_bug.cgi?id=84948

Reviewed by Kenneth Rohde Christiansen.

Start the tap highlight animation after a slight delay so that pan
gestures do not result in flashing highlight rects which slow down
flicking, especially during continuous pan gestures.

* UIProcess/qt/QtTapGestureRecognizer.cpp:
(WebKit::QtTapGestureRecognizer::update):
(WebKit::QtTapGestureRecognizer::highlightTimeout):
(WebKit):
(WebKit::QtTapGestureRecognizer::reset):
(WebKit::QtTapGestureRecognizer::timerEvent):
* UIProcess/qt/QtTapGestureRecognizer.h:
(QtTapGestureRecognizer):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::doneWithTouchEvent):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (115310 => 115311)

--- trunk/Source/WebKit2/ChangeLog	2012-04-26 14:06:39 UTC (rev 115310)
+++ trunk/Source/WebKit2/ChangeLog	2012-04-26 14:11:44 UTC (rev 115311)
@@ -1,3 +1,25 @@
+2012-04-26  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Tap highlight should have a delay not to interfere with panning
+https://bugs.webkit.org/show_bug.cgi?id=84948
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Start the tap highlight animation after a slight delay so that pan
+gestures do not result in flashing highlight rects which slow down
+flicking, especially during continuous pan gestures.
+
+* UIProcess/qt/QtTapGestureRecognizer.cpp:
+(WebKit::QtTapGestureRecognizer::update):
+(WebKit::QtTapGestureRecognizer::highlightTimeout):
+(WebKit):
+(WebKit::QtTapGestureRecognizer::reset):
+(WebKit::QtTapGestureRecognizer::timerEvent):
+* UIProcess/qt/QtTapGestureRecognizer.h:
+(QtTapGestureRecognizer):
+* UIProcess/qt/QtWebPageEventHandler.cpp:
+(WebKit::QtWebPageEventHandler::doneWithTouchEvent):
+
 2012-04-26  Lars Knudsen  lars.knud...@nokia.com
 
 Make it possible to use accelerated compositing for page overlay fading


Modified: trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp (115310 => 115311)

--- trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp	2012-04-26 14:06:39 UTC (rev 115310)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp	2012-04-26 14:11:44 UTC (rev 115311)
@@ -58,7 +58,7 @@
 else {
 m_candidate = SingleTapCandidate;
 // The below in facts resets any previous single tap event.
-m_eventHandler-handlePotentialSingleTapEvent(touchPoint);
+m_highlightTimer.start(highlightDelay, this);
 m_lastTouchPoint = touchPoint;
 m_doubleTapTimer.start(maxDoubleTapInterval, this);
 }
@@ -99,6 +99,15 @@
 reset();
 }
 
+void QtTapGestureRecognizer::highlightTimeout()
+{
+if (m_candidate != SingleTapCandidate)
+return;
+
+ASSERT(m_lastTouchPoint.id() != -1);
+m_eventHandler-handlePotentialSingleTapEvent(m_lastTouchPoint);
+}
+
 void QtTapGestureRecognizer::singleTapTimeout()
 {
 // Finger is still pressed, ignore.
@@ -130,9 +139,10 @@
 m_eventHandler-handlePotentialSingleTapEvent(QTouchEvent::TouchPoint());
 
 m_candidate = Invalid;
+m_lastTouchPoint.setId(-1);
+m_highlightTimer.stop();
+m_doubleTapTimer.stop();
 m_tapAndHoldTimer.stop();
-m_doubleTapTimer.stop();
-m_lastTouchPoint.setId(-1);
 
 QtGestureRecognizer::reset();
 }
@@ -140,7 +150,9 @@
 void QtTapGestureRecognizer::timerEvent(QTimerEvent* ev)
 {
 int timerId = ev-timerId();
-if (timerId == m_doubleTapTimer.timerId())
+if (timerId == m_highlightTimer.timerId())
+highlightTimeout();
+else if (timerId == m_doubleTapTimer.timerId())
 singleTapTimeout();
 else if (timerId == m_tapAndHoldTimer.timerId())
 tapAndHoldTimeout();


Modified: trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h (115310 => 115311)

--- trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h	2012-04-26 14:06:39 UTC (rev 115310)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h	2012-04-26 14:11:44 UTC (rev 115311)
@@ -32,10 +32,11 @@
 #include QtCore/QObject
 
 // FIXME: These constants should possibly depend on DPI.
-const int maxPanDistance = 5;
+const int maxPanDistance = 10;
 const int maxDoubleTapDistance = 120;
 const int tapAndHoldTime = 800;
 const int maxDoubleTapInterval = 400;
+const int highlightDelay = 80;
 
 namespace WebKit {
 
@@ -49,6 +50,7 @@
 
 protected:
 void timerEvent(QTimerEvent*);
+void highlightTimeout();
 void 

[webkit-changes] [115082] trunk/Source/WebKit2

[abecsi]

Title: [115082] trunk/Source/WebKit2








Revision 115082
Author abe...@webkit.org
Date 2012-04-24 10:48:01 -0700 (Tue, 24 Apr 2012)


Log Message
[Qt][WK2] Implement axis locking on the WebView for pan gestures
https://bugs.webkit.org/show_bug.cgi?id=84350

Reviewed by Kenneth Rohde Christiansen.

If a pan gesture has sufficient velocity along one axis the WebView
should automatically lock the page movement to that axis.
This locking should be maintained until the ongoing pan gesture ends.

This patch implements a simple axis locker which adjusts the positions
sent to the Flickable to the initial reference position according to the
direction an velocity information it gathered from incoming touch events.

The FlickableAxisLocker makes use of the velocity information of the touch point
if available, else an approximate velocity of the incoming event is
calculated.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::FlickableAxisLocker::FlickableAxisLocker):
(QQuickWebViewPrivate::FlickableAxisLocker::touchVelocity):
(QQuickWebViewPrivate::FlickableAxisLocker::update):
(QQuickWebViewPrivate::FlickableAxisLocker::setReferencePosition):
(QQuickWebViewPrivate::FlickableAxisLocker::reset):
(QQuickWebViewPrivate::FlickableAxisLocker::adjust):
(QQuickWebViewPrivate::QQuickWebViewPrivate):
(QQuickWebView::touchEvent):
(QQuickWebView::handleFlickableMousePress):
(QQuickWebView::handleFlickableMouseMove):
(QQuickWebView::handleFlickableMouseRelease):
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (115081 => 115082)

--- trunk/Source/WebKit2/ChangeLog	2012-04-24 17:46:16 UTC (rev 115081)
+++ trunk/Source/WebKit2/ChangeLog	2012-04-24 17:48:01 UTC (rev 115082)
@@ -1,3 +1,37 @@
+2012-04-24  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Implement axis locking on the WebView for pan gestures
+https://bugs.webkit.org/show_bug.cgi?id=84350
+
+Reviewed by Kenneth Rohde Christiansen.
+
+If a pan gesture has sufficient velocity along one axis the WebView
+should automatically lock the page movement to that axis.
+This locking should be maintained until the ongoing pan gesture ends.
+
+This patch implements a simple axis locker which adjusts the positions
+sent to the Flickable to the initial reference position according to the
+direction an velocity information it gathered from incoming touch events.
+
+The FlickableAxisLocker makes use of the velocity information of the touch point
+if available, else an approximate velocity of the incoming event is
+calculated.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::FlickableAxisLocker::FlickableAxisLocker):
+(QQuickWebViewPrivate::FlickableAxisLocker::touchVelocity):
+(QQuickWebViewPrivate::FlickableAxisLocker::update):
+(QQuickWebViewPrivate::FlickableAxisLocker::setReferencePosition):
+(QQuickWebViewPrivate::FlickableAxisLocker::reset):
+(QQuickWebViewPrivate::FlickableAxisLocker::adjust):
+(QQuickWebViewPrivate::QQuickWebViewPrivate):
+(QQuickWebView::touchEvent):
+(QQuickWebView::handleFlickableMousePress):
+(QQuickWebView::handleFlickableMouseMove):
+(QQuickWebView::handleFlickableMouseRelease):
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(QQuickWebViewPrivate):
+
 2012-04-24  Allan Sandfeld Jensen  allan.jen...@nokia.com
 
 [Qt] Tap-to zoom should navigate when appropiate


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (115081 => 115082)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-04-24 17:46:16 UTC (rev 115081)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-04-24 17:48:01 UTC (rev 115082)
@@ -49,8 +49,7 @@
 #include qwebviewportinfo_p.h
 
 #include _javascript_Core/InitializeThreading.h
-#include QtQml/QQmlEngine
-#include QtQuick/QQuickCanvas
+#include QDateTime
 #include WebCore/IntPoint.h
 #include WebCore/IntRect.h
 #include WKOpenPanelResultListener.h
@@ -62,6 +61,9 @@
 using namespace WebKit;
 
 static bool s_flickableViewportEnabled = true;
+static const int kAxisLockSampleCount = 5;
+static const qreal kAxisLockVelocityThreshold = 300;
+static const qreal kAxisLockVelocityDirectionThreshold = 50;
 
 static QQuickWebViewPrivate* createPrivateObject(QQuickWebView* publicObject)
 {
@@ -70,6 +72,78 @@
 return new QQuickWebViewLegacyPrivate(publicObject);
 }
 
+QQuickWebViewPrivate::FlickableAxisLocker::FlickableAxisLocker()
+: m_allowedDirection(QQuickFlickable::AutoFlickDirection)
+, m_sampleCount(0)
+{
+}
+
+QVector2D QQuickWebViewPrivate::FlickableAxisLocker::touchVelocity(const QTouchEvent* event)
+{
+static bool 

[webkit-changes] [114389] trunk/Source/WebKit2

[abecsi]

Title: [114389] trunk/Source/WebKit2








Revision 114389
Author abe...@webkit.org
Date 2012-04-17 09:41:29 -0700 (Tue, 17 Apr 2012)


Log Message
[Qt][WK2] Refactor the gesture recognizers
https://bugs.webkit.org/show_bug.cgi?id=83044

Reviewed by Kenneth Rohde Christiansen and Simon Hausmann.

This patch implements a simple decision tree in the web page event handler
on the basis of how many active touch points the current touch event has.

Active touch points are pressed, moved or stationary and the number of these
fully determine which gesture recognizer should be updated, cancelled or
finished.

This new structure makes the internal states of the pinch and pan gesture
recognizers independent from the event type, thus makes it possible to handle
the transitions between these gestures in one centralized place which reduces
code duplication and complexity and fixes some issues regarding incorrectly
handled transitions.

* UIProcess/qt/QtPanGestureRecognizer.cpp:
(WebKit::QtPanGestureRecognizer::update):
(WebKit::QtPanGestureRecognizer::finish):
(WebKit):
(WebKit::QtPanGestureRecognizer::cancel):
* UIProcess/qt/QtPanGestureRecognizer.h:
(QtPanGestureRecognizer):
* UIProcess/qt/QtPinchGestureRecognizer.cpp:
(WebKit):
(WebKit::QtPinchGestureRecognizer::update):
(WebKit::QtPinchGestureRecognizer::finish):
* UIProcess/qt/QtPinchGestureRecognizer.h:
(QtPinchGestureRecognizer):
* UIProcess/qt/QtTapGestureRecognizer.cpp:
(WebKit::QtTapGestureRecognizer::withinDistance):
(WebKit::QtTapGestureRecognizer::update):
(WebKit::QtTapGestureRecognizer::cancel):
(WebKit):
(WebKit::QtTapGestureRecognizer::singleTapTimeout):
(WebKit::QtTapGestureRecognizer::tapAndHoldTimeout):
(WebKit::QtTapGestureRecognizer::reset):
* UIProcess/qt/QtTapGestureRecognizer.h:
(QtTapGestureRecognizer):
* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit):
* UIProcess/qt/QtViewportInteractionEngine.h:
(QtViewportInteractionEngine):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(QtWebPageEventHandler::resetGestureRecognizers):
(QtWebPageEventHandler::doneWithTouchEvent):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.h
trunk/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp
trunk/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.h
trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp
trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (114388 => 114389)

--- trunk/Source/WebKit2/ChangeLog	2012-04-17 16:31:01 UTC (rev 114388)
+++ trunk/Source/WebKit2/ChangeLog	2012-04-17 16:41:29 UTC (rev 114389)
@@ -1,3 +1,54 @@
+2012-04-17  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Refactor the gesture recognizers
+https://bugs.webkit.org/show_bug.cgi?id=83044
+
+Reviewed by Kenneth Rohde Christiansen and Simon Hausmann.
+
+This patch implements a simple decision tree in the web page event handler
+on the basis of how many active touch points the current touch event has.
+
+Active touch points are pressed, moved or stationary and the number of these
+fully determine which gesture recognizer should be updated, cancelled or
+finished.
+
+This new structure makes the internal states of the pinch and pan gesture
+recognizers independent from the event type, thus makes it possible to handle
+the transitions between these gestures in one centralized place which reduces
+code duplication and complexity and fixes some issues regarding incorrectly
+handled transitions.
+
+* UIProcess/qt/QtPanGestureRecognizer.cpp:
+(WebKit::QtPanGestureRecognizer::update):
+(WebKit::QtPanGestureRecognizer::finish):
+(WebKit):
+(WebKit::QtPanGestureRecognizer::cancel):
+* UIProcess/qt/QtPanGestureRecognizer.h:
+(QtPanGestureRecognizer):
+* UIProcess/qt/QtPinchGestureRecognizer.cpp:
+(WebKit):
+(WebKit::QtPinchGestureRecognizer::update):
+(WebKit::QtPinchGestureRecognizer::finish):
+* UIProcess/qt/QtPinchGestureRecognizer.h:
+(QtPinchGestureRecognizer):
+* UIProcess/qt/QtTapGestureRecognizer.cpp:
+(WebKit::QtTapGestureRecognizer::withinDistance):
+(WebKit::QtTapGestureRecognizer::update):
+(WebKit::QtTapGestureRecognizer::cancel):
+(WebKit):
+(WebKit::QtTapGestureRecognizer::singleTapTimeout):
+(WebKit::QtTapGestureRecognizer::tapAndHoldTimeout):
+(WebKit::QtTapGestureRecognizer::reset):
+* UIProcess/qt/QtTapGestureRecognizer.h:
+(QtTapGestureRecognizer):
+* UIProcess/qt/QtViewportInteractionEngine.cpp:
+  

[webkit-changes] [113848] trunk

[abecsi]

Title: [113848] trunk








Revision 113848
Author abe...@webkit.org
Date 2012-04-11 04:23:19 -0700 (Wed, 11 Apr 2012)


Log Message
Fix the build with gcc 4.7.0
https://bugs.webkit.org/show_bug.cgi?id=83584

Reviewed by Alexey Proskuryakov.

Source/WebCore:

No new tests needed.

* Target.pri: Disable Werror on the ANGLE code since it has several recurring issues
because older versions of flex (2.5.35) and bison (2.5) generate code which
triggers warnings. This generated code is committed on each version update of ANGLE,
and it is very likely that the code is generated with older versions of the mentioned
tools.
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::createForJSConstructor): Fails because of -Werror=extra
* platform/graphics/TiledBackingStoreClient.h: Fails because -Werror=delete-non-virtual-dtor,
gcc requires classes which have virtual methods to have a virtual destructor, if their instances
or the instances of their subclasses are deleted.
(WebCore::TiledBackingStoreClient::~TiledBackingStoreClient):
* platform/graphics/texmap/TextureMapperPlatformLayer.h: Ditto.
(WebCore::TextureMapperPlatformLayer::~TextureMapperPlatformLayer):

Tools:

* qmake/mkspecs/features/unix/default_post.prf:
The -fuse-ld=gold option is not supported with upstream gcc.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri
trunk/Source/WebCore/html/HTMLImageElement.cpp
trunk/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/unix/default_post.prf




Diff

Modified: trunk/Source/WebCore/ChangeLog (113847 => 113848)

--- trunk/Source/WebCore/ChangeLog	2012-04-11 10:50:48 UTC (rev 113847)
+++ trunk/Source/WebCore/ChangeLog	2012-04-11 11:23:19 UTC (rev 113848)
@@ -1,3 +1,26 @@
+2012-04-11  Andras Becsi  andras.be...@nokia.com
+
+Fix the build with gcc 4.7.0
+https://bugs.webkit.org/show_bug.cgi?id=83584
+
+Reviewed by Alexey Proskuryakov.
+
+No new tests needed.
+
+* Target.pri: Disable Werror on the ANGLE code since it has several recurring issues
+because older versions of flex (2.5.35) and bison (2.5) generate code which
+triggers warnings. This generated code is committed on each version update of ANGLE,
+and it is very likely that the code is generated with older versions of the mentioned
+tools.
+* html/HTMLImageElement.cpp:
+(WebCore::HTMLImageElement::createForJSConstructor): Fails because of -Werror=extra
+* platform/graphics/TiledBackingStoreClient.h: Fails because -Werror=delete-non-virtual-dtor,
+gcc requires classes which have virtual methods to have a virtual destructor, if their instances
+or the instances of their subclasses are deleted.
+(WebCore::TiledBackingStoreClient::~TiledBackingStoreClient):
+* platform/graphics/texmap/TextureMapperPlatformLayer.h: Ditto.
+(WebCore::TextureMapperPlatformLayer::~TextureMapperPlatformLayer):
+
 2012-04-11  Kent Tamura  tk...@chromium.org
 
 [V8] Calendar Picker: Add a helper function to expose PagePopupClient::setValueAndClosePopup() to _javascript_


Modified: trunk/Source/WebCore/Target.pri (113847 => 113848)

--- trunk/Source/WebCore/Target.pri	2012-04-11 10:50:48 UTC (rev 113847)
+++ trunk/Source/WebCore/Target.pri	2012-04-11 11:23:19 UTC (rev 113848)
@@ -3958,6 +3958,7 @@
 ANGLE_CFLAGS += -Wno-missing-noreturn
 ANGLE_CFLAGS += -Wno-unused-function
 ANGLE_CFLAGS += -Wno-reorder
+ANGLE_CFLAGS += -Wno-error
 
 angle_cxx.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$ANGLE_CFLAGS $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
 angle_cxx.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$$QMAKE_EXT_OBJ


Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (113847 => 113848)

--- trunk/Source/WebCore/html/HTMLImageElement.cpp	2012-04-11 10:50:48 UTC (rev 113847)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp	2012-04-11 11:23:19 UTC (rev 113848)
@@ -73,7 +73,7 @@
 RefPtrHTMLImageElement image = adoptRef(new HTMLImageElement(imgTag, document));
 if (optionalWidth)
 image-setWidth(*optionalWidth);
-if (optionalHeight  0)
+if (optionalHeight)
 image-setHeight(*optionalHeight);
 return image.release();
 }


Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStoreClient.h (113847 => 113848)

--- trunk/Source/WebCore/platform/graphics/TiledBackingStoreClient.h	2012-04-11 10:50:48 UTC (rev 113847)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStoreClient.h	2012-04-11 11:23:19 UTC (rev 113848)
@@ -29,6 +29,7 @@
 
 class TiledBackingStoreClient {
 public:
+virtual ~TiledBackingStoreClient() { }
 virtual void tiledBackingStorePaintBegin() = 0;
 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect) = 0;
 

[webkit-changes] [113866] trunk/Source/WebCore

[abecsi]

Title: [113866] trunk/Source/WebCore








Revision 113866
Author abe...@webkit.org
Date 2012-04-11 08:53:24 -0700 (Wed, 11 Apr 2012)


Log Message
[Qt] Fix the build on OpenGL ES2 platforms

Unreviewed build fix.

No new tests needed.

* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::BitmapTextureGL::updateContents):
Fix typo in TEXMAP_OPENGL_ES_2 define.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (113865 => 113866)

--- trunk/Source/WebCore/ChangeLog	2012-04-11 15:49:08 UTC (rev 113865)
+++ trunk/Source/WebCore/ChangeLog	2012-04-11 15:53:24 UTC (rev 113866)
@@ -1,3 +1,15 @@
+2012-04-11  Andras Becsi  andras.be...@nokia.com
+
+[Qt] Fix the build on OpenGL ES2 platforms
+
+Unreviewed build fix.
+
+No new tests needed.
+
+* platform/graphics/texmap/TextureMapperGL.cpp:
+(WebCore::BitmapTextureGL::updateContents):
+Fix typo in TEXMAP_OPENGL_ES_2 define.
+
 2012-04-11  Ami Fischman  fisch...@chromium.org
 
 Remove unused WebVideoFrame::Format values


Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (113865 => 113866)

--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp	2012-04-11 15:49:08 UTC (rev 113865)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp	2012-04-11 15:53:24 UTC (rev 113866)
@@ -470,7 +470,7 @@
 return;
 }
 
-#if !defined(TEXTMAP_OPENGL_ES_2)
+#if !defined(TEXMAP_OPENGL_ES_2)
 // Use the OpenGL sub-image extension, now that we know it's available.
 GL_CMD(glPixelStorei(GL_UNPACK_ROW_LENGTH, bytesPerLine / 4));
 GL_CMD(glPixelStorei(GL_UNPACK_SKIP_ROWS, sourceOffset.y()));






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [112089] trunk/Source/WebKit2

[abecsi]

Title: [112089] trunk/Source/WebKit2








Revision 112089
Author abe...@webkit.org
Date 2012-03-26 07:20:05 -0700 (Mon, 26 Mar 2012)


Log Message
Be more careful with git gui usage

Unreviewed typo fix.

* UIProcess/qt/QtViewportInteractionEngine.cpp: Remove additional line committed by accident.
(WebKit::QtViewportInteractionEngine::pinchGestureEnded):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (112088 => 112089)

--- trunk/Source/WebKit2/ChangeLog	2012-03-26 14:16:12 UTC (rev 112088)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-26 14:20:05 UTC (rev 112089)
@@ -1,3 +1,12 @@
+2012-03-26  Andras Becsi  andras.be...@nokia.com
+
+Be more careful with git gui usage
+
+Unreviewed typo fix.
+
+* UIProcess/qt/QtViewportInteractionEngine.cpp: Remove additional line committed by accident.
+(WebKit::QtViewportInteractionEngine::pinchGestureEnded):
+
 2012-03-26  Allan Sandfeld Jensen  allan.jen...@nokia.com
 
 [Qt] Taps are sometimes not highlighted.


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (112088 => 112089)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-03-26 14:16:12 UTC (rev 112088)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-03-26 14:20:05 UTC (rev 112089)
@@ -580,7 +580,6 @@
 m_pinchStartScale = -1;
 // Clear the update deferrer now if we're in our final position and there won't be any animation to clear it later.
 if (ensureContentWithinViewportBoundary()) {
-if (ensureContentWithinViewportBoundary())
 m_scaleUpdateDeferrer.clear();
 m_flickProvider-cancelFlick();
 m_flickProvider-contentItem()-parentItem()-setProperty(interactive, true);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [111850] trunk/Source/WebKit2

[abecsi]

Title: [111850] trunk/Source/WebKit2








Revision 111850
Author abe...@webkit.org
Date 2012-03-23 05:17:39 -0700 (Fri, 23 Mar 2012)


Log Message
[Qt][WK2] Disable the flickable when pinching.

Reviewed by Kenneth Rohde Christiansen.

Set the interactivity of the internal flickable to false
when pinching so that it does not react to mouse events
which might break pinch zoom.
This is a temporal workaround and needed until the event
propagation in QtQuick is fixed.

* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::scaleAnimationStateChanged):
(WebKit::QtViewportInteractionEngine::pinchGestureStarted):
(WebKit::QtViewportInteractionEngine::pinchGestureEnded):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (111849 => 111850)

--- trunk/Source/WebKit2/ChangeLog	2012-03-23 12:07:06 UTC (rev 111849)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-23 12:17:39 UTC (rev 111850)
@@ -1,3 +1,20 @@
+2012-03-23  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Disable the flickable when pinching.
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Set the interactivity of the internal flickable to false
+when pinching so that it does not react to mouse events
+which might break pinch zoom.
+This is a temporal workaround and needed until the event
+propagation in QtQuick is fixed.
+
+* UIProcess/qt/QtViewportInteractionEngine.cpp:
+(WebKit::QtViewportInteractionEngine::scaleAnimationStateChanged):
+(WebKit::QtViewportInteractionEngine::pinchGestureStarted):
+(WebKit::QtViewportInteractionEngine::pinchGestureEnded):
+
 2012-03-23  Ryosuke Niwa  rn...@webkit.org
 
 REGRESSION(r111754): plugins/reloadplugins-and-pages.html fails on all platforms


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (111849 => 111850)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-03-23 12:07:06 UTC (rev 111849)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-03-23 12:17:39 UTC (rev 111850)
@@ -231,11 +231,13 @@
 {
 switch (newState) {
 case QAbstractAnimation::Running:
+m_flickProvider-cancelFlick();
 if (!m_scaleUpdateDeferrer)
 m_scaleUpdateDeferrer = adoptPtr(new ViewportUpdateDeferrer(this, ViewportUpdateDeferrer::DeferUpdateAndSuspendContent));
 break;
 case QAbstractAnimation::Stopped:
 m_scaleUpdateDeferrer.clear();
+m_flickProvider-contentItem()-parentItem()-setProperty(interactive, true);
 break;
 default:
 break;
@@ -534,6 +536,9 @@
 
 m_hadUserInteraction = true;
 
+m_flickProvider-cancelFlick();
+m_flickProvider-contentItem()-parentItem()-setProperty(interactive, false);
+
 m_scaleUpdateDeferrer = adoptPtr(new ViewportUpdateDeferrer(this, ViewportUpdateDeferrer::DeferUpdateAndSuspendContent));
 
 m_lastPinchCenterInViewportCoordinates = pinchCenterInViewportCoordinates;
@@ -574,8 +579,12 @@
 
 m_pinchStartScale = -1;
 // Clear the update deferrer now if we're in our final position and there won't be any animation to clear it later.
+if (ensureContentWithinViewportBoundary()) {
 if (ensureContentWithinViewportBoundary())
 m_scaleUpdateDeferrer.clear();
+m_flickProvider-cancelFlick();
+m_flickProvider-contentItem()-parentItem()-setProperty(interactive, true);
+}
 }
 
 void QtViewportInteractionEngine::itemSizeChanged()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [111015] trunk/Source/WebKit2

[abecsi]

Title: [111015] trunk/Source/WebKit2








Revision 111015
Author abe...@webkit.org
Date 2012-03-16 09:43:31 -0700 (Fri, 16 Mar 2012)


Log Message
[Qt][WK2] Fix bounce-back behaviour for panning
https://bugs.webkit.org/show_bug.cgi?id=81144

Reviewed by Kenneth Rohde Christiansen.

If the pan gesture recognizer receives a touch begin event
during an ongoing kinetic scroll animation of a previous
pan gesture, the animation is stopped and the content is
immediately positioned back to valid boundaries.

* UIProcess/qt/QtPanGestureRecognizer.cpp:
(WebKit::QtPanGestureRecognizer::recognize):
* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::QtViewportInteractionEngine::cancelScrollAnimation):
(WebKit):
* UIProcess/qt/QtViewportInteractionEngine.h:
(QtViewportInteractionEngine):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (111014 => 111015)

--- trunk/Source/WebKit2/ChangeLog	2012-03-16 16:40:54 UTC (rev 111014)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-16 16:43:31 UTC (rev 111015)
@@ -1,3 +1,23 @@
+2012-03-16  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Fix bounce-back behaviour for panning
+https://bugs.webkit.org/show_bug.cgi?id=81144
+
+Reviewed by Kenneth Rohde Christiansen.
+
+If the pan gesture recognizer receives a touch begin event
+during an ongoing kinetic scroll animation of a previous
+pan gesture, the animation is stopped and the content is
+immediately positioned back to valid boundaries.
+
+* UIProcess/qt/QtPanGestureRecognizer.cpp:
+(WebKit::QtPanGestureRecognizer::recognize):
+* UIProcess/qt/QtViewportInteractionEngine.cpp:
+(WebKit::QtViewportInteractionEngine::cancelScrollAnimation):
+(WebKit):
+* UIProcess/qt/QtViewportInteractionEngine.h:
+(QtViewportInteractionEngine):
+
 2012-03-16  Dinu Jacob  dinu.ja...@nokia.com
 
 [Qt][Wk2] Assertion Failure and crash on file upload


Modified: trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp (111014 => 111015)

--- trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp	2012-03-16 16:40:54 UTC (rev 111014)
+++ trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp	2012-03-16 16:43:31 UTC (rev 111015)
@@ -63,10 +63,7 @@
 m_state = GestureRecognitionStarted;
 m_firstPosition = touchPoint.screenPos();
 m_touchBegin.reset(new QTouchEvent(*event));
-
-// Touch begin while bouncing back from panning should move the content to the end position immediately.
-interactionEngine()-panGestureCancelled();
-interactionEngine()-ensureContentWithinViewportBoundary(/*immediate*/ true);
+interactionEngine()-cancelScrollAnimation();
 return false;
 case QEvent::TouchUpdate: {
 ASSERT(m_state != NoGesture);


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (111014 => 111015)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-03-16 16:40:54 UTC (rev 111014)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-03-16 16:43:31 UTC (rev 111015)
@@ -489,6 +489,19 @@
 return m_scaleAnimation-state() == QAbstractAnimation::Running;
 }
 
+void QtViewportInteractionEngine::cancelScrollAnimation()
+{
+ViewportUpdateDeferrer guard(this);
+
+// If the pan gesture recognizer receives a touch begin event
+// during an ongoing kinetic scroll animation of a previous
+// pan gesture, the animation is stopped and the content is
+// immediately positioned back to valid boundaries.
+
+m_flickProvider-cancelFlick();
+ensureContentWithinViewportBoundary(/*immediate*/ true);
+}
+
 void QtViewportInteractionEngine::interruptScaleAnimation()
 {
 // This interrupts the scale animation exactly where it is, even if it is out of bounds.


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h (111014 => 111015)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h	2012-03-16 16:40:54 UTC (rev 111014)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h	2012-03-16 16:43:31 UTC (rev 111015)
@@ -78,6 +78,7 @@
 void pagePositionRequest(const QPoint pos);
 
 bool scrollAnimationActive() const;
+void cancelScrollAnimation();
 
 bool panGestureActive() const;
 void panGestureStarted(const QTouchEvent*);
@@ -93,7 +94,6 @@
 void pinchGestureRequestUpdate(const QPointF pinchCenterInViewportCoordinates, qreal totalScaleFactor);
 void pinchGestureEnded();
 
-bool ensureContentWithinViewportBoundary(bool immediate = false);
 void zoomToAreaGestureEnded(const QPointF touchPoint, const QRectF targetArea);
 void focusEditableArea(const QRectF 

[webkit-changes] [110850] trunk/Source/WebKit2

[abecsi]

Title: [110850] trunk/Source/WebKit2








Revision 110850
Author abe...@webkit.org
Date 2012-03-15 08:58:45 -0700 (Thu, 15 Mar 2012)


Log Message
[Qt][WK2] Fix bounce-back behaviour for panning
https://bugs.webkit.org/show_bug.cgi?id=81144

Reviewed by Kenneth Rohde Christiansen.

Move the content back to boundaries immediately
in response to a tap gesture during the bounce-back
animation after panning.

* UIProcess/qt/QtPanGestureRecognizer.cpp:
(WebKit::QtPanGestureRecognizer::recognize):
* UIProcess/qt/QtViewportInteractionEngine.h:
Make the ensureContentWithinViewportBoundary function public.
(QtViewportInteractionEngine):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (110849 => 110850)

--- trunk/Source/WebKit2/ChangeLog	2012-03-15 15:36:06 UTC (rev 110849)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-15 15:58:45 UTC (rev 110850)
@@ -1,3 +1,20 @@
+2012-03-15  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Fix bounce-back behaviour for panning
+https://bugs.webkit.org/show_bug.cgi?id=81144
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Move the content back to boundaries immediately
+in response to a tap gesture during the bounce-back
+animation after panning.
+
+* UIProcess/qt/QtPanGestureRecognizer.cpp:
+(WebKit::QtPanGestureRecognizer::recognize):
+* UIProcess/qt/QtViewportInteractionEngine.h:
+Make the ensureContentWithinViewportBoundary function public.
+(QtViewportInteractionEngine):
+
 2012-03-15  Carlos Garcia Campos  cgar...@igalia.com
 
 [WK2] WebPageProxy::activeURL should return unreachableURL() when it's not empty


Modified: trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp (110849 => 110850)

--- trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp	2012-03-15 15:36:06 UTC (rev 110849)
+++ trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp	2012-03-15 15:58:45 UTC (rev 110850)
@@ -63,7 +63,10 @@
 m_state = GestureRecognitionStarted;
 m_firstPosition = touchPoint.screenPos();
 m_touchBegin.reset(new QTouchEvent(*event));
+
+// Touch begin while bouncing back from panning should move the content to the end position immediately.
 interactionEngine()-panGestureCancelled();
+interactionEngine()-ensureContentWithinViewportBoundary(/*immediate*/ true);
 return false;
 case QEvent::TouchUpdate: {
 ASSERT(m_state != NoGesture);


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h (110849 => 110850)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h	2012-03-15 15:36:06 UTC (rev 110849)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h	2012-03-15 15:58:45 UTC (rev 110850)
@@ -93,6 +93,7 @@
 void pinchGestureRequestUpdate(const QPointF pinchCenterInViewportCoordinates, qreal totalScaleFactor);
 void pinchGestureEnded();
 
+bool ensureContentWithinViewportBoundary(bool immediate = false);
 void zoomToAreaGestureEnded(const QPointF touchPoint, const QRectF targetArea);
 void focusEditableArea(const QRectF caretArea, const QRectF targetArea);
 
@@ -133,7 +134,6 @@
 qreal outerBoundedCSSScale(qreal);
 
 QRectF computePosRangeForItemAtScale(qreal itemScale) const;
-bool ensureContentWithinViewportBoundary(bool immediate = false);
 
 void scaleContent(const QPointF centerInCSSCoordinates, qreal cssScale);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [110881] trunk/Source/JavaScriptCore

[abecsi]

Title: [110881] trunk/Source/_javascript_Core








Revision 110881
Author abe...@webkit.org
Date 2012-03-15 13:39:51 -0700 (Thu, 15 Mar 2012)


Log Message
Fix ARM build after r110792.

Unreviewed build fix.

* jit/ExecutableAllocator.h:
(JSC::ExecutableAllocator::cacheFlush):
Remove superfluous curly brackets.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/jit/ExecutableAllocator.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (110880 => 110881)

--- trunk/Source/_javascript_Core/ChangeLog	2012-03-15 20:23:05 UTC (rev 110880)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-03-15 20:39:51 UTC (rev 110881)
@@ -1,3 +1,13 @@
+2012-03-15  Andras Becsi  andras.be...@nokia.com
+
+Fix ARM build after r110792.
+
+Unreviewed build fix.
+
+* jit/ExecutableAllocator.h:
+(JSC::ExecutableAllocator::cacheFlush):
+Remove superfluous curly brackets.
+
 2012-03-15  Gavin Barraclough  barraclo...@apple.com
 
 ARMv7: prefer vmov(gpr,gpr-double) over vmov(gpr-single)


Modified: trunk/Source/_javascript_Core/jit/ExecutableAllocator.h (110880 => 110881)

--- trunk/Source/_javascript_Core/jit/ExecutableAllocator.h	2012-03-15 20:23:05 UTC (rev 110880)
+++ trunk/Source/_javascript_Core/jit/ExecutableAllocator.h	2012-03-15 20:39:51 UTC (rev 110881)
@@ -212,7 +212,6 @@
 : r0, r1, r2);
 currentPage += pageSize();
 } while (lastPage = currentPage);
- }
 }
 #elif OS(WINCE)
 static void cacheFlush(void* code, size_t size)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [110699] trunk/Source/WebCore

[abecsi]

Title: [110699] trunk/Source/WebCore








Revision 110699
Author abe...@webkit.org
Date 2012-03-14 08:02:14 -0700 (Wed, 14 Mar 2012)


Log Message
[Qt] RunLoopQt is missing reentrancy guards
https://bugs.webkit.org/show_bug.cgi?id=80982

Patch by Simon Hausmann simon.hausm...@nokia.com on 2012-03-14
Reviewed by Tor Arne Vestbø.

Avoid recursive calls to RunLoop::performWork() with a simple
counting mechanism, to avoid out-of-order message dispatching.

* platform/qt/RunLoopQt.cpp:
(WebCore::RunLoop::TimerObject::TimerObject):
(WebCore::RunLoop::TimerObject::performWork):
(RunLoop::TimerObject):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/qt/RunLoopQt.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (110698 => 110699)

--- trunk/Source/WebCore/ChangeLog	2012-03-14 14:41:26 UTC (rev 110698)
+++ trunk/Source/WebCore/ChangeLog	2012-03-14 15:02:14 UTC (rev 110699)
@@ -1,3 +1,18 @@
+2012-03-14  Simon Hausmann  simon.hausm...@nokia.com
+
+[Qt] RunLoopQt is missing reentrancy guards
+https://bugs.webkit.org/show_bug.cgi?id=80982
+
+Reviewed by Tor Arne Vestbø.
+
+Avoid recursive calls to RunLoop::performWork() with a simple
+counting mechanism, to avoid out-of-order message dispatching.
+
+* platform/qt/RunLoopQt.cpp:
+(WebCore::RunLoop::TimerObject::TimerObject):
+(WebCore::RunLoop::TimerObject::performWork):
+(RunLoop::TimerObject):
+
 2012-03-14  Ilya Tikhonovsky  loi...@chromium.org
 
 Web Inspector: small improvement for HeapSnapshot performance ~12%.


Modified: trunk/Source/WebCore/platform/qt/RunLoopQt.cpp (110698 => 110699)

--- trunk/Source/WebCore/platform/qt/RunLoopQt.cpp	2012-03-14 14:41:26 UTC (rev 110698)
+++ trunk/Source/WebCore/platform/qt/RunLoopQt.cpp	2012-03-14 15:02:14 UTC (rev 110699)
@@ -39,13 +39,30 @@
 class RunLoop::TimerObject : public QObject {
 Q_OBJECT
 public:
-TimerObject(RunLoop* runLoop) : m_runLoop(runLoop)
+TimerObject(RunLoop* runLoop)
+: m_runLoop(runLoop)
+, m_pendingPerformWorkInvocations(0)
 {
 int methodIndex = metaObject()-indexOfMethod(performWork());
 m_method = metaObject()-method(methodIndex);
 }
 
-Q_SLOT void performWork() { m_runLoop-performWork(); }
+Q_SLOT void performWork() {
+// It may happen that a secondary thread adds more method invocations via
+// RunLoop::dispatch(), which will schedule a call to this function. If during
+// performWork() event loop messages get processed, it may happen that this
+// function is called again. In this case we should protected ourselves against
+// recursive - and thus out-of-order - message dispatching and instead perform
+// the work serially.
+m_pendingPerformWorkInvocations++;
+if (m_pendingPerformWorkInvocations  1)
+return;
+
+while (m_pendingPerformWorkInvocations) {
+m_runLoop-performWork();
+m_pendingPerformWorkInvocations--;
+}
+}
 inline void wakeUp() { m_method.invoke(this, Qt::QueuedConnection); }
 
 protected:
@@ -57,6 +74,7 @@
 private:
 RunLoop* m_runLoop;
 QMetaMethod m_method;
+int m_pendingPerformWorkInvocations;
 };
 
 static QEventLoop* currentEventLoop;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [110447] trunk

[abecsi]

Title: [110447] trunk








Revision 110447
Author abe...@webkit.org
Date 2012-03-12 11:02:58 -0700 (Mon, 12 Mar 2012)


Log Message
[Qt][WK2] Add support for rudimentary scroll indicators in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=80832

Reviewed by Tor Arne Vestbø.

Source/WebKit2:

Since the ScrollDecorator QML component requires a Flickable in its API
we need to expose the Flickable in QML for now and we also need to add
a notifier because we instantiate the internal Flickable only when the
WebView component completes construction.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::onComponentComplete):
(QQuickWebViewExperimental::flickable):
* UIProcess/API/qt/qquickwebview_p.h:

Tools:

Add a basic scroll indicator component to MiniBrowser so that it
behaves similar to the ScrollDecorator QML component.

* MiniBrowser/qt/MiniBrowser.qrc:
* MiniBrowser/qt/qml/BrowserWindow.qml:
* MiniBrowser/qt/qml/ScrollIndicator.qml: Added.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/MiniBrowser.qrc
trunk/Tools/MiniBrowser/qt/qml/BrowserWindow.qml


Added Paths

trunk/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml




Diff

Modified: trunk/Source/WebKit2/ChangeLog (110446 => 110447)

--- trunk/Source/WebKit2/ChangeLog	2012-03-12 17:50:50 UTC (rev 110446)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-12 18:02:58 UTC (rev 110447)
@@ -1,3 +1,20 @@
+2012-03-12  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Add support for rudimentary scroll indicators in MiniBrowser
+https://bugs.webkit.org/show_bug.cgi?id=80832
+
+Reviewed by Tor Arne Vestbø.
+
+Since the ScrollDecorator QML component requires a Flickable in its API
+we need to expose the Flickable in QML for now and we also need to add
+a notifier because we instantiate the internal Flickable only when the
+WebView component completes construction.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewFlickablePrivate::onComponentComplete):
+(QQuickWebViewExperimental::flickable):
+* UIProcess/API/qt/qquickwebview_p.h:
+
 2012-03-11  Timothy Hatcher  timo...@apple.com
 
 Update how the Web Inspector resources are loaded.


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (110446 => 110447)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-03-12 17:50:50 UTC (rev 110446)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-03-12 18:02:58 UTC (rev 110447)
@@ -44,6 +44,7 @@
 #include qwebpreferences_p_p.h
 #include qwebviewportinfo_p.h
 
+#include private/qquickflickable_p.h
 #include _javascript_Core/InitializeThreading.h
 #include QDeclarativeEngine
 #include QFileDialog
@@ -561,7 +562,7 @@
 flickProvider = new QtFlickProvider(q, pageView.data());
 
 // Propagate flickable signals.
-const QQuickWebViewExperimental* experimental = q-experimental();
+QQuickWebViewExperimental* experimental = q-experimental();
 QObject::connect(flickProvider, SIGNAL(contentWidthChanged()), experimental, SIGNAL(contentWidthChanged()));
 QObject::connect(flickProvider, SIGNAL(contentHeightChanged()), experimental, SIGNAL(contentHeightChanged()));
 QObject::connect(flickProvider, SIGNAL(contentXChanged()), experimental, SIGNAL(contentXChanged()));
@@ -586,6 +587,8 @@
 _q_onVisibleChanged();
 
 QQuickWebViewPrivate::onComponentComplete();
+
+emit experimental-flickableChanged();
 }
 
 void QQuickWebViewFlickablePrivate::loadDidSucceed()
@@ -1059,6 +1062,19 @@
 return d-flickProvider-flickableData();
 }
 
+QQuickFlickable* QQuickWebViewExperimental::flickable()
+{
+Q_D(QQuickWebView);
+if (!d-flickProvider)
+return 0;
+
+QQuickFlickable* flickableItem = qobject_castQQuickFlickable*(contentItem()-parentItem());
+
+ASSERT(flickableItem);
+
+return flickableItem;
+}
+
 QQuickItem* QQuickWebViewExperimental::contentItem()
 {
 Q_D(QQuickWebView);


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (110446 => 110447)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-03-12 17:50:50 UTC (rev 110446)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2012-03-12 18:02:58 UTC (rev 110447)
@@ -59,6 +59,7 @@
 QT_BEGIN_NAMESPACE
 class QPainter;
 class QUrl;
+class QQuickFlickable;
 QT_END_NAMESPACE
 
 
@@ -236,6 +237,7 @@
 Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged)
 Q_PROPERTY(qreal contentX READ contentX WRITE setContentX NOTIFY contentXChanged)
 Q_PROPERTY(qreal contentY READ contentY WRITE setContentY NOTIFY contentYChanged)
+Q_PROPERTY(QQuickFlickable* flickable READ flickable NOTIFY flickableChanged)
 Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT)
 

[webkit-changes] [110046] trunk/Source/WebKit2

[abecsi]

Title: [110046] trunk/Source/WebKit2








Revision 110046
Author abe...@webkit.org
Date 2012-03-07 04:04:01 -0800 (Wed, 07 Mar 2012)


Log Message
[WK2] Make it possible to build without geolocation support
https://bugs.webkit.org/show_bug.cgi?id=80426

Reviewed by Simon Hausmann.

Add missing guards.

* UIProcess/GeolocationPermissionRequestManagerProxy.cpp:
(WebKit::GeolocationPermissionRequestManagerProxy::didReceiveGeolocationPermissionDecision):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::processDidCrash):
* WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit):
* WebProcess/WebPage/WebPage.h:
(WebPage):
* WebProcess/WebPage/WebPage.messages.in:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in




Diff

Modified: trunk/Source/WebKit2/ChangeLog (110045 => 110046)

--- trunk/Source/WebKit2/ChangeLog	2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-07 12:04:01 UTC (rev 110046)
@@ -1,3 +1,25 @@
+2012-03-07  Andras Becsi  andras.be...@nokia.com
+
+[WK2] Make it possible to build without geolocation support
+https://bugs.webkit.org/show_bug.cgi?id=80426
+
+Reviewed by Simon Hausmann.
+
+Add missing guards.
+
+* UIProcess/GeolocationPermissionRequestManagerProxy.cpp:
+(WebKit::GeolocationPermissionRequestManagerProxy::didReceiveGeolocationPermissionDecision):
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::close):
+(WebKit::WebPageProxy::processDidCrash):
+* WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp:
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::WebPage):
+(WebKit):
+* WebProcess/WebPage/WebPage.h:
+(WebPage):
+* WebProcess/WebPage/WebPage.messages.in:
+
 2012-03-06  Raphael Kubo da Costa  k...@profusion.mobi
 
 [CMake] Make the removal of transitive library dependencies work with CMake  2.8.7.


Modified: trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp (110045 => 110046)

--- trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp	2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.cpp	2012-03-07 12:04:01 UTC (rev 110046)
@@ -63,7 +63,10 @@
 if (it == m_pendingRequests.end())
 return;
 
+#if ENABLE(GEOLOCATION)
 m_page-process()-send(Messages::WebPage::DidReceiveGeolocationPermissionDecision(geolocationID, allowed), m_page-pageID());
+#endif
+
 m_pendingRequests.remove(it);
 }
 


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (110045 => 110046)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-03-07 12:04:01 UTC (rev 110046)
@@ -374,7 +374,10 @@
 m_openPanelResultListener = 0;
 }
 
+#if ENABLE(GEOLOCATION)
 m_geolocationPermissionRequestManager.invalidateRequests();
+#endif
+
 m_notificationPermissionRequestManager.invalidateRequests();
 
 m_toolTip = String();
@@ -3248,7 +3251,10 @@
 m_openPanelResultListener = nullptr;
 }
 
+#if ENABLE(GEOLOCATION)
 m_geolocationPermissionRequestManager.invalidateRequests();
+#endif
+
 m_notificationPermissionRequestManager.invalidateRequests();
 
 m_toolTip = String();


Modified: trunk/Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp (110045 => 110046)

--- trunk/Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp	2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp	2012-03-07 12:04:01 UTC (rev 110046)
@@ -26,6 +26,8 @@
 #include config.h
 #include GeolocationPermissionRequestManager.h
 
+#if ENABLE(GEOLOCATION)
+
 #include WebCoreArgumentCoders.h
 #include WebFrame.h
 #include WebPage.h
@@ -89,3 +91,5 @@
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(GEOLOCATION)


Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (110045 => 110046)

--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-03-07 11:54:19 UTC (rev 110045)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-03-07 12:04:01 UTC (rev 110046)
@@ -199,7 +199,9 @@
 #if PLATFORM(QT)
 , m_tapHighlightController(this)
 #endif
+#if ENABLE(GEOLOCATION)
 , m_geolocationPermissionRequestManager(this)
+#endif
 , m_pageID(pageID)
 , 

[webkit-changes] [109930] trunk/Source/WebKit2

[abecsi]

Title: [109930] trunk/Source/WebKit2








Revision 109930
Author abe...@webkit.org
Date 2012-03-06 09:54:43 -0800 (Tue, 06 Mar 2012)


Log Message
[Qt] Interaction Engine suspends content during pageload.
https://bugs.webkit.org/show_bug.cgi?id=80294

Only suspend content when viewport updates are deferred
for a non-instantanious interaction.

Patch by Allan Sandfeld Jensen allan.jen...@nokia.com on 2012-03-06
Reviewed by Kenneth Rohde Christiansen.

* UIProcess/qt/QtViewportInteractionEngine.cpp:
(WebKit::ViewportUpdateDeferrer::ViewportUpdateDeferrer):
(WebKit::ViewportUpdateDeferrer::~ViewportUpdateDeferrer):
(WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
(WebKit::QtViewportInteractionEngine::flickableMoveStarted):
(WebKit::QtViewportInteractionEngine::scaleAnimationStateChanged):
* UIProcess/qt/QtViewportInteractionEngine.h:
(QtViewportInteractionEngine):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (109929 => 109930)

--- trunk/Source/WebKit2/ChangeLog	2012-03-06 17:51:31 UTC (rev 109929)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-06 17:54:43 UTC (rev 109930)
@@ -1,3 +1,22 @@
+2012-03-06  Allan Sandfeld Jensen  allan.jen...@nokia.com
+
+[Qt] Interaction Engine suspends content during pageload.
+https://bugs.webkit.org/show_bug.cgi?id=80294
+
+Only suspend content when viewport updates are deferred
+for a non-instantanious interaction.
+
+Reviewed by Kenneth Rohde Christiansen.
+
+* UIProcess/qt/QtViewportInteractionEngine.cpp:
+(WebKit::ViewportUpdateDeferrer::ViewportUpdateDeferrer):
+(WebKit::ViewportUpdateDeferrer::~ViewportUpdateDeferrer):
+(WebKit::QtViewportInteractionEngine::QtViewportInteractionEngine):
+(WebKit::QtViewportInteractionEngine::flickableMoveStarted):
+(WebKit::QtViewportInteractionEngine::scaleAnimationStateChanged):
+* UIProcess/qt/QtViewportInteractionEngine.h:
+(QtViewportInteractionEngine):
+
 2012-03-06  Simon Hausmann  simon.hausm...@nokia.com
 
 [Qt] Make QQuickWebView's url property work with a flickable webview


Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (109929 => 109930)

--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-03-06 17:51:31 UTC (rev 109929)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp	2012-03-06 17:54:43 UTC (rev 109930)
@@ -61,13 +61,18 @@
 
 class ViewportUpdateDeferrer {
 public:
-ViewportUpdateDeferrer(QtViewportInteractionEngine* engine)
+enum SuspendContentFlag { DeferUpdate, DeferUpdateAndSuspendContent };
+ViewportUpdateDeferrer(QtViewportInteractionEngine* engine, SuspendContentFlag suspendContentFlag = DeferUpdate)
 : engine(engine)
 {
-if (engine-m_suspendCount++)
-return;
+engine-m_suspendCount++;
 
-emit engine-contentSuspendRequested();
+// There is no need to suspend content for immediate updates
+// only during animations or longer gestures.
+if (suspendContentFlag == DeferUpdateAndSuspendContent  !engine-m_hasSuspendedContent) {
+engine-m_hasSuspendedContent = true;
+emit engine-contentSuspendRequested();
+}
 }
 
 ~ViewportUpdateDeferrer()
@@ -75,7 +80,10 @@
 if (--(engine-m_suspendCount))
 return;
 
-emit engine-contentResumeRequested();
+if (engine-m_hasSuspendedContent) {
+engine-m_hasSuspendedContent = false;
+emit engine-contentResumeRequested();
+}
 
 // Make sure that tiles all around the viewport will be requested.
 emit engine-contentWasMoved(QPointF());
@@ -117,6 +125,7 @@
 , m_content(content)
 , m_flickProvider(flickProvider)
 , m_suspendCount(0)
+, m_hasSuspendedContent(false)
 , m_hadUserInteraction(false)
 , m_scaleAnimation(new ScaleAnimation(this))
 , m_pinchStartScale(-1)
@@ -191,7 +200,7 @@
 void QtViewportInteractionEngine::flickableMoveStarted()
 {
 Q_ASSERT(m_flickProvider-isMoving());
-m_scrollUpdateDeferrer = adoptPtr(new ViewportUpdateDeferrer(this));
+m_scrollUpdateDeferrer = adoptPtr(new ViewportUpdateDeferrer(this, ViewportUpdateDeferrer::DeferUpdateAndSuspendContent));
 
 m_lastScrollPosition = m_flickProvider-contentPos();
 connect(m_flickProvider, SIGNAL(contentXChanged()), SLOT(flickableMovingPositionUpdate()));
@@ -223,7 +232,7 @@
 switch (newState) {
 case QAbstractAnimation::Running:
 if (!m_scaleUpdateDeferrer)
-m_scaleUpdateDeferrer = adoptPtr(new ViewportUpdateDeferrer(this));
+m_scaleUpdateDeferrer = adoptPtr(new ViewportUpdateDeferrer(this, ViewportUpdateDeferrer::DeferUpdateAndSuspendContent));
 break;
   

[webkit-changes] [109575] trunk/Tools

[abecsi]

Title: [109575] trunk/Tools








Revision 109575
Author abe...@webkit.org
Date 2012-03-02 07:27:33 -0800 (Fri, 02 Mar 2012)


Log Message
[Qt][WK2] Infinite loop on history navigation, when panning
https://bugs.webkit.org/show_bug.cgi?id=79119

Reviewed by Simon Hausmann.

Make the touch mocking more robust by creating touch events
directly and sending them synchronously to the browser window.
If the sent touch event was not accepted we propagate the
original mouse event to its target.
This way we make sure we only send either a touch or a mouse
event and do not end up in an infinite loop between our mocking
code and the Qt5 automatic mouse event synthesizing.

* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::updateVisualMockTouchPoints):
* MiniBrowser/qt/BrowserWindow.h:
(BrowserWindow):
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(touchRectForPosition):
(MiniBrowserApplication::notify):
(MiniBrowserApplication::sendTouchEvent):
* MiniBrowser/qt/MiniBrowserApplication.h:
(MiniBrowserApplication):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp
trunk/Tools/MiniBrowser/qt/BrowserWindow.h
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h




Diff

Modified: trunk/Tools/ChangeLog (109574 => 109575)

--- trunk/Tools/ChangeLog	2012-03-02 15:14:47 UTC (rev 109574)
+++ trunk/Tools/ChangeLog	2012-03-02 15:27:33 UTC (rev 109575)
@@ -1,3 +1,29 @@
+2012-03-02  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Infinite loop on history navigation, when panning
+https://bugs.webkit.org/show_bug.cgi?id=79119
+
+Reviewed by Simon Hausmann.
+
+Make the touch mocking more robust by creating touch events
+directly and sending them synchronously to the browser window.
+If the sent touch event was not accepted we propagate the
+original mouse event to its target.
+This way we make sure we only send either a touch or a mouse
+event and do not end up in an infinite loop between our mocking
+code and the Qt5 automatic mouse event synthesizing.
+
+* MiniBrowser/qt/BrowserWindow.cpp:
+(BrowserWindow::updateVisualMockTouchPoints):
+* MiniBrowser/qt/BrowserWindow.h:
+(BrowserWindow):
+* MiniBrowser/qt/MiniBrowserApplication.cpp:
+(touchRectForPosition):
+(MiniBrowserApplication::notify):
+(MiniBrowserApplication::sendTouchEvent):
+* MiniBrowser/qt/MiniBrowserApplication.h:
+(MiniBrowserApplication):
+
 2012-03-02  Tor Arne Vestbø  tor.arne.ves...@nokia.com
 
 [Qt] Use 'all' as default target when debug_and_release is in effect


Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (109574 => 109575)

--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp	2012-03-02 15:14:47 UTC (rev 109574)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp	2012-03-02 15:27:33 UTC (rev 109575)
@@ -93,30 +93,27 @@
 return window;
 }
 
-void BrowserWindow::updateVisualMockTouchPoints(const QListQWindowSystemInterface::TouchPoint touchPoints)
+void BrowserWindow::updateVisualMockTouchPoints(const QListQTouchEvent::TouchPoint touchPoints)
 {
-foreach (const QWindowSystemInterface::TouchPoint touchPoint, touchPoints) {
-QString mockTouchPointIdentifier = QString(mockTouchPoint%1).arg(touchPoint.id);
+foreach (const QTouchEvent::TouchPoint touchPoint, touchPoints) {
+QString mockTouchPointIdentifier = QString(mockTouchPoint%1).arg(touchPoint.id());
 QQuickItem* mockTouchPointItem = rootObject()-findChildQQuickItem*(mockTouchPointIdentifier, Qt::FindDirectChildrenOnly);
 
 if (!mockTouchPointItem) {
 QDeclarativeComponent touchMockPointComponent(engine(), QUrl(qrc:/qml/MockTouchPoint.qml));
 mockTouchPointItem = qobject_castQQuickItem*(touchMockPointComponent.create());
 mockTouchPointItem-setObjectName(mockTouchPointIdentifier);
-mockTouchPointItem-setProperty(pointId, QVariant(touchPoint.id));
+mockTouchPointItem-setProperty(pointId, QVariant(touchPoint.id()));
 mockTouchPointItem-setParent(rootObject());
 mockTouchPointItem-setParentItem(rootObject());
 }
 
-QPointF position = touchPoint.area.center();
-position.rx() -= geometry().x();
-position.ry() -= geometry().y();
-
-mockTouchPointItem-setX(position.x());
-mockTouchPointItem-setY(position.y());
-mockTouchPointItem-setWidth(touchPoint.area.width());
-mockTouchPointItem-setHeight(touchPoint.area.height());
-mockTouchPointItem-setProperty(pressed, QVariant(touchPoint.state != Qt::TouchPointReleased));
+QRectF touchRect = touchPoint.rect();
+mockTouchPointItem-setX(touchRect.center().x());
+mockTouchPointItem-setY(touchRect.center().y());
+mockTouchPointItem-setWidth(touchRect.width());
+

[webkit-changes] [109576] trunk/Tools

[abecsi]

Title: [109576] trunk/Tools








Revision 109576
Author abe...@webkit.org
Date 2012-03-02 07:36:23 -0800 (Fri, 02 Mar 2012)


Log Message
[Qt][WK2] Fix typo in patch committed in r109575

Unreviewed typo fix.

* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::notify): Cache the position
in floating point coordinates.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp




Diff

Modified: trunk/Tools/ChangeLog (109575 => 109576)

--- trunk/Tools/ChangeLog	2012-03-02 15:27:33 UTC (rev 109575)
+++ trunk/Tools/ChangeLog	2012-03-02 15:36:23 UTC (rev 109576)
@@ -1,5 +1,15 @@
 2012-03-02  Andras Becsi  andras.be...@nokia.com
 
+[Qt][WK2] Fix typo in patch committed in r109575
+
+Unreviewed typo fix.
+
+* MiniBrowser/qt/MiniBrowserApplication.cpp:
+(MiniBrowserApplication::notify): Cache the position
+in floating point coordinates.
+
+2012-03-02  Andras Becsi  andras.be...@nokia.com
+
 [Qt][WK2] Infinite loop on history navigation, when panning
 https://bugs.webkit.org/show_bug.cgi?id=79119
 


Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (109575 => 109576)

--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2012-03-02 15:27:33 UTC (rev 109575)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2012-03-02 15:36:23 UTC (rev 109576)
@@ -136,7 +136,7 @@
 
 touchPoint.setRect(touchRectForPosition(mouseEvent-localPos()));
 touchPoint.setLastPos(m_lastPos);
-m_lastPos = mouseEvent-pos();
+m_lastPos = mouseEvent-localPos();
 
 // Gesture recognition uses the screen position for the initial threshold
 // but since the canvas translates touch events we actually need to pass






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [109415] trunk/Source/WebKit2

[abecsi]

Title: [109415] trunk/Source/WebKit2








Revision 109415
Author abe...@webkit.org
Date 2012-03-01 13:51:26 -0800 (Thu, 01 Mar 2012)


Log Message
[Qt][WK2] Make the interaction with the Flickable work on the N9
https://bugs.webkit.org/show_bug.cgi?id=80029

Reviewed by Simon Hausmann.

Because the WebView item accepts all touch events it receives and sends
them to the web process before propagating them to the gesture recognizers,
which is correct behaviour, we can not rely on the touch-mouse conversion
of Qt5 when controlling Flickable. Hence we need to convert the received
touch events to mouse events in the QtFlickProvider.

* UIProcess/qt/QtFlickProvider.cpp:
(QtFlickProvider::handleTouchFlickEvent):
Do the touch to mouse event conversion for the Flickable.
* UIProcess/qt/QtPanGestureRecognizer.cpp:
(WebKit::QtPanGestureRecognizer::recognize):
A touch begin event should cancel the previous pan gesture
and stop the ongoing flick animation.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/qt/QtFlickProvider.cpp
trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (109414 => 109415)

--- trunk/Source/WebKit2/ChangeLog	2012-03-01 21:50:18 UTC (rev 109414)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-01 21:51:26 UTC (rev 109415)
@@ -1,3 +1,24 @@
+2012-03-01  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Make the interaction with the Flickable work on the N9
+https://bugs.webkit.org/show_bug.cgi?id=80029
+
+Reviewed by Simon Hausmann.
+
+Because the WebView item accepts all touch events it receives and sends
+them to the web process before propagating them to the gesture recognizers,
+which is correct behaviour, we can not rely on the touch-mouse conversion
+of Qt5 when controlling Flickable. Hence we need to convert the received
+touch events to mouse events in the QtFlickProvider.
+
+* UIProcess/qt/QtFlickProvider.cpp:
+(QtFlickProvider::handleTouchFlickEvent):
+Do the touch to mouse event conversion for the Flickable.
+* UIProcess/qt/QtPanGestureRecognizer.cpp:
+(WebKit::QtPanGestureRecognizer::recognize):
+A touch begin event should cancel the previous pan gesture
+and stop the ongoing flick animation.
+
 2012-03-01  Anders Carlsson  ander...@apple.com
 
 Assertion failure in pageContainsAnyHorizontalScrollbars() (scrollableArea-isOnActivePage()) when leaving pages with embedded PDFs


Modified: trunk/Source/WebKit2/UIProcess/qt/QtFlickProvider.cpp (109414 => 109415)

--- trunk/Source/WebKit2/UIProcess/qt/QtFlickProvider.cpp	2012-03-01 21:50:18 UTC (rev 109414)
+++ trunk/Source/WebKit2/UIProcess/qt/QtFlickProvider.cpp	2012-03-01 21:51:26 UTC (rev 109415)
@@ -26,7 +26,9 @@
 
 #include QCoreApplication
 #include QDeclarativeEngine
+#include QMouseEvent
 #include QPointF
+#include QQuickCanvas
 #include QQuickItem
 #include QTouchEvent
 #include wtf/Assertions.h
@@ -116,9 +118,42 @@
 connect(m_flickable, SIGNAL(contentYChanged()), SIGNAL(contentYChanged()), Qt::DirectConnection);
 }
 
-void QtFlickProvider::handleTouchFlickEvent(QTouchEvent* event)
+void QtFlickProvider::handleTouchFlickEvent(QTouchEvent* touchEvent)
 {
-QCoreApplication::sendEvent(m_flickable, event);
+// Since the Flickable does not handle touch events directly the sent
+// touch event would end up in the WebView again and would thus trigger
+// an infinite loop.
+// Hence do the touch to mouse event conversion for the Flickable here.
+QEvent::Type mouseEventType = QEvent::None;
+Qt::MouseButton mouseButton = Qt::NoButton;
+
+switch (touchEvent-type()) {
+case QEvent::TouchBegin:
+mouseEventType = QEvent::MouseButtonPress;
+
+// We need to set the mouse button so that the Flickable
+// item receives the initial mouse press event.
+mouseButton = Qt::LeftButton;
+break;
+case QEvent::TouchUpdate:
+mouseEventType = QEvent::MouseMove;
+break;
+case QEvent::TouchEnd:
+mouseEventType = QEvent::MouseButtonRelease;
+break;
+default:
+ASSERT_NOT_REACHED();
+break;
+}
+
+QPointF touchPosition = touchEvent-touchPoints().last().pos();
+QMouseEvent mouseEvent(mouseEventType, touchPosition, mouseButton, mouseButton, Qt::NoModifier);
+
+// Send the event to the canvas and let the canvas propagate it
+// to the Flickable. This makes sure that the Flickable grabs
+// the mouse so that it also receives the events of gestures
+// which started inside the viewport but ended outside of it.
+QCoreApplication::sendEvent(m_flickable-canvas(), mouseEvent);
 }
 
 QQuickItem* QtFlickProvider::contentItem()


Modified: trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp (109414 => 109415)

--- trunk/Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp	2012-03-01 

[webkit-changes] [108483] trunk/Source/WebCore

[abecsi]

Title: [108483] trunk/Source/WebCore








Revision 108483
Author abe...@webkit.org
Date 2012-02-22 04:56:57 -0800 (Wed, 22 Feb 2012)


Log Message
[Qt][WK2] Fix the N9 build
https://bugs.webkit.org/show_bug.cgi?id=79101

Reviewed by Simon Hausmann.

Fixed the include order of the rolled out r108359 not to break
the build with CONFIG+=force_static_libs_as_shared.

* platform/graphics/OpenGLShims.h: Add missing include.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/OpenGLShims.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (108482 => 108483)

--- trunk/Source/WebCore/ChangeLog	2012-02-22 12:51:01 UTC (rev 108482)
+++ trunk/Source/WebCore/ChangeLog	2012-02-22 12:56:57 UTC (rev 108483)
@@ -1,3 +1,15 @@
+2012-02-22  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Fix the N9 build
+https://bugs.webkit.org/show_bug.cgi?id=79101
+
+Reviewed by Simon Hausmann.
+
+Fixed the include order of the rolled out r108359 not to break
+the build with CONFIG+=force_static_libs_as_shared.
+
+* platform/graphics/OpenGLShims.h: Add missing include.
+
 2012-02-22  Shinya Kawanaka  shin...@chromium.org
 
 firstRendererOf() should also return a fallback element renderer in NodeRenderingContext.


Modified: trunk/Source/WebCore/platform/graphics/OpenGLShims.h (108482 => 108483)

--- trunk/Source/WebCore/platform/graphics/OpenGLShims.h	2012-02-22 12:51:01 UTC (rev 108482)
+++ trunk/Source/WebCore/platform/graphics/OpenGLShims.h	2012-02-22 12:56:57 UTC (rev 108483)
@@ -23,6 +23,7 @@
 #if PLATFORM(QT)
 #include qglobal.h
 #if QT_VERSION = QT_VERSION_CHECK(5, 0, 0)
+#include qopenglfunctions.h
 #include QOpenGLContext
 #include QSurface
 #else






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [108328] trunk

[abecsi]

Title: [108328] trunk








Revision 108328
Author abe...@webkit.org
Date 2012-02-21 02:57:13 -0800 (Tue, 21 Feb 2012)


Log Message
[Qt][WK2] Get rid of the dependency to QtWidgets
https://bugs.webkit.org/show_bug.cgi?id=76276

Reviewed by Simon Hausmann.

Source/WebKit2:

* Target.pri:
* UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp:
(main):
* UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
* UIProcess/API/qt/tests/tests.pri:
* UIProcess/API/qt/tests/util.h:

Tools:

* MiniBrowser/qt/MiniBrowser.pro:
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::MiniBrowserApplication):
(MiniBrowserApplication::notify):
(MiniBrowserApplication::sendTouchEvent):
* MiniBrowser/qt/MiniBrowserApplication.h:
(MiniBrowserApplication):
* QtTestBrowser/locationedit.h:
* WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
(WTR::activateFonts):
* WebKitTestRunner/qt/PlatformWebViewQt.cpp:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Target.pri
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp
trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri
trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/MiniBrowser.pro
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h
trunk/Tools/QtTestBrowser/locationedit.h
trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (108327 => 108328)

--- trunk/Source/WebKit2/ChangeLog	2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/ChangeLog	2012-02-21 10:57:13 UTC (rev 108328)
@@ -1,3 +1,17 @@
+2012-02-21  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Get rid of the dependency to QtWidgets
+https://bugs.webkit.org/show_bug.cgi?id=76276
+
+Reviewed by Simon Hausmann.
+
+* Target.pri:
+* UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp:
+(main):
+* UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
+* UIProcess/API/qt/tests/tests.pri:
+* UIProcess/API/qt/tests/util.h:
+
 2012-02-20  Martin Robinson  mrobin...@igalia.com
 
 [UNIX] Plugin information fields are not interpreted as UTF-8


Modified: trunk/Source/WebKit2/Target.pri (108327 => 108328)

--- trunk/Source/WebKit2/Target.pri	2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/Target.pri	2012-02-21 10:57:13 UTC (rev 108328)
@@ -12,7 +12,7 @@
 include(WebKit2.pri)
 
 WEBKIT += wtf _javascript_core webcore
-QT += declarative quick widgets
+QT += declarative quick
 
 CONFIG += staticlib
 


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp (108327 => 108328)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp	2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/tst_qmltests.cpp	2012-02-21 10:57:13 UTC (rev 108328)
@@ -21,9 +21,9 @@
 #include ../util.h
 
 #include qquickwebview_p.h
+#include QGuiApplication
 #include QVarLengthArray
 #include QtQuickTest/quicktest.h
-#include QtWidgets/QApplication
 
 int main(int argc, char** argv)
 {
@@ -42,7 +42,7 @@
 
 // Instantiate QApplication to prevent quick_test_main to instantiate a QGuiApplication.
 // This can be removed as soon as we do not use QtWidgets any more.
-QApplication app(argc, argv);
+QGuiApplication app(argc, argv);
 qmlRegisterTypeByteArrayTestData(Test, 1, 0, ByteArrayTestData);
 
 #ifdef DISABLE_FLICKABLE_VIEWPORT


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp (108327 => 108328)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp	2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp	2012-02-21 10:57:13 UTC (rev 108328)
@@ -356,7 +356,7 @@
 QVERIFY(webView()-experimental()-contentY() == y);
 }
 
-QTWEBKIT_API_TEST_MAIN(tst_QQuickWebView)
+QTEST_MAIN(tst_QQuickWebView)
 
 #include tst_qquickwebview.moc
 


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri (108327 => 108328)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri	2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri	2012-02-21 10:57:13 UTC (rev 108328)
@@ -9,7 +9,7 @@
../bytearraytestdata.cpp
 INCLUDEPATH += $$PWD
 
-QT += testlib declarative widgets quick
+QT += testlib declarative quick
 
 CONFIG += qtwebkit
 


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (108327 => 108328)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h	2012-02-21 10:33:53 UTC (rev 108327)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h	2012-02-21 10:57:13 UTC (rev 108328)
@@ -29,13 +29,3 @@
 void 

[webkit-changes] [108329] trunk/Source/WebCore

[abecsi]

Title: [108329] trunk/Source/WebCore








Revision 108329
Author abe...@webkit.org
Date 2012-02-21 03:26:27 -0800 (Tue, 21 Feb 2012)


Log Message
[Qt] Clean-up project file after r108310

Reviewed by Csaba Osztrogonác.

No new tests needed.

* Target.pri: Fix path for TextTrack headers.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri




Diff

Modified: trunk/Source/WebCore/ChangeLog (108328 => 108329)

--- trunk/Source/WebCore/ChangeLog	2012-02-21 10:57:13 UTC (rev 108328)
+++ trunk/Source/WebCore/ChangeLog	2012-02-21 11:26:27 UTC (rev 108329)
@@ -1,3 +1,13 @@
+2012-02-21  Andras Becsi  andras.be...@nokia.com
+
+[Qt] Clean-up project file after r108310
+
+Reviewed by Csaba Osztrogonác.
+
+No new tests needed.
+
+* Target.pri: Fix path for TextTrack headers.
+
 2012-02-17  Philippe Normand  pnorm...@igalia.com
 
 [GStreamer] media/W3C failures


Modified: trunk/Source/WebCore/Target.pri (108328 => 108329)

--- trunk/Source/WebCore/Target.pri	2012-02-21 10:57:13 UTC (rev 108328)
+++ trunk/Source/WebCore/Target.pri	2012-02-21 11:26:27 UTC (rev 108329)
@@ -1881,7 +1881,6 @@
 html/ImageDocument.h \
 html/LabelsNodeList.h \
 html/LinkRelAttribute.h \
-html/LoadableTextTrack.h \
 html/MediaController.h \
 html/MediaDocument.h \
 html/MediaFragmentURIParser.h \
@@ -1890,9 +1889,6 @@
 html/PublicURLManager.h \
 html/StepRange.h \
 html/TextDocument.h \
-html/TextTrack.h \
-html/TextTrackCue.h \
-html/TextTrackCueList.h \
 html/TimeRanges.h \
 html/ValidityState.h \
 html/parser/CSSPreloadScanner.h \
@@ -1918,6 +1914,10 @@
 html/shadow/HTMLShadowElement.h \
 html/shadow/MediaControlElements.h \
 html/shadow/DetailsMarkerControl.h \
+html/track/LoadableTextTrack.h \
+html/track/TextTrack.h \
+html/track/TextTrackCue.h \
+html/track/TextTrackCueList.h \
 html/track/TextTrackList.h \
 html/track/TrackBase.h \
 html/track/TrackEvent.h \






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [108359] trunk/Source/WebCore

[abecsi]

Title: [108359] trunk/Source/WebCore








Revision 108359
Author abe...@webkit.org
Date 2012-02-21 08:26:57 -0800 (Tue, 21 Feb 2012)


Log Message
[Qt][WK2] Fix the N9 build
https://bugs.webkit.org/show_bug.cgi?id=79101

Reviewed by Noam Rosenthal.

No new tests needed.

* platform/graphics/opengl/TextureMapperGL.cpp: Add missing include.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (108358 => 108359)

--- trunk/Source/WebCore/ChangeLog	2012-02-21 16:26:12 UTC (rev 108358)
+++ trunk/Source/WebCore/ChangeLog	2012-02-21 16:26:57 UTC (rev 108359)
@@ -1,3 +1,14 @@
+2012-02-21  Andras Becsi  andras.be...@nokia.com
+
+[Qt][WK2] Fix the N9 build
+https://bugs.webkit.org/show_bug.cgi?id=79101
+
+Reviewed by Noam Rosenthal.
+
+No new tests needed.
+
+* platform/graphics/opengl/TextureMapperGL.cpp: Add missing include.
+
 2012-02-21  Adam Roben  aro...@apple.com
 
 Roll out r108309, r108323, and r108326


Modified: trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp (108358 => 108359)

--- trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp	2012-02-21 16:26:12 UTC (rev 108358)
+++ trunk/Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp	2012-02-21 16:26:57 UTC (rev 108359)
@@ -32,6 +32,7 @@
 #if PLATFORM(QT)
 #if QT_VERSION = QT_VERSION_CHECK(5, 0, 0)
 #include QPlatformPixmap
+#include qopenglfunctions.h
 #endif
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [106939] trunk/Source/WebKit2

[abecsi]

Title: [106939] trunk/Source/WebKit2








Revision 106939
Author abe...@webkit.org
Date 2012-02-07 07:33:58 -0800 (Tue, 07 Feb 2012)


Log Message
[Qt] [WK2] Fix the debug build after r106920

* WebProcess/qt/WebProcessQt.cpp:
(WebKit::WebProcess::platformSetCacheModel):
Remove unnecessary assert.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (106938 => 106939)

--- trunk/Source/WebKit2/ChangeLog	2012-02-07 15:29:34 UTC (rev 106938)
+++ trunk/Source/WebKit2/ChangeLog	2012-02-07 15:33:58 UTC (rev 106939)
@@ -1,3 +1,11 @@
+2012-02-07  Andras Becsi  andras.be...@nokia.com
+
+[Qt] [WK2] Fix the debug build after r106920
+
+* WebProcess/qt/WebProcessQt.cpp:
+(WebKit::WebProcess::platformSetCacheModel):
+Remove unnecessary assert.
+
 2012-02-03  Andras Becsi  andras.be...@nokia.com
 
 [Qt][WK2] Add the componentComplete method to WebView


Modified: trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp (106938 => 106939)

--- trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp	2012-02-07 15:29:34 UTC (rev 106938)
+++ trunk/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp	2012-02-07 15:33:58 UTC (rev 106939)
@@ -96,7 +96,6 @@
 QNetworkDiskCache* diskCache = qobject_castQNetworkDiskCache*(m_networkAccessManager-cache());
 ASSERT(diskCache);
 
-ASSERT(WebCore::platformInfo());
 uint64_t physicalMemorySizeInMegabytes = physicalMemorySizeInBytes() / 1024 / 1024;
 
 // The Mac port of WebKit2 uses a fudge factor of 1000 here to account for misalignment, however,






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes