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

[michael . bruning]

Title: [155951] trunk/Source/WebCore








Revision 155951
Author michael.brun...@digia.com
Date 2013-09-17 06:24:28 -0700 (Tue, 17 Sep 2013)


Log Message
Correct range used for Emoji checks.
https://bugs.webkit.org/show_bug.cgi?id=121486

Reviewed by Allan Sandfeld Jensen.

Found and reported by David Binderman via Qt bug tracker.

The check if a character was in the Emoji range always evaluated to
false due to the upper range limit being lower than the lower limit.

Changed the upper limit to the highest assigned character from the
"Transport and Map Symbols" (0x1F6C5) as that seems to have been the
intended upper range limit of this check.

* platform/graphics/Font.cpp:
(WebCore::Font::isCJKIdeographOrSymbol):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/Font.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (155950 => 155951)

--- trunk/Source/WebCore/ChangeLog	2013-09-17 12:40:37 UTC (rev 155950)
+++ trunk/Source/WebCore/ChangeLog	2013-09-17 13:24:28 UTC (rev 155951)
@@ -1,3 +1,22 @@
+2013-09-17  Michael Brüning  
+
+Correct range used for Emoji checks.
+https://bugs.webkit.org/show_bug.cgi?id=121486
+
+Reviewed by Allan Sandfeld Jensen.
+
+Found and reported by David Binderman via Qt bug tracker.
+
+The check if a character was in the Emoji range always evaluated to
+false due to the upper range limit being lower than the lower limit.
+
+Changed the upper limit to the highest assigned character from the
+"Transport and Map Symbols" (0x1F6C5) as that seems to have been the
+intended upper range limit of this check.
+
+* platform/graphics/Font.cpp:
+(WebCore::Font::isCJKIdeographOrSymbol):
+
 2013-09-17  Antti Koivisto  
 
 Move text caret rect computation to root inline box


Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (155950 => 155951)

--- trunk/Source/WebCore/platform/graphics/Font.cpp	2013-09-17 12:40:37 UTC (rev 155950)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp	2013-09-17 13:24:28 UTC (rev 155951)
@@ -795,7 +795,7 @@
 if (c >= 0x1F170 && c <= 0x1F189)
 return true;
 
-if (c >= 0x1F200 && c <= 0x1F6F)
+if (c >= 0x1F200 && c <= 0x1F6C5)
 return true;
 
 return isCJKIdeograph(c);






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

[webkit-changes] [155034] trunk

[michael . bruning]

Title: [155034] trunk








Revision 155034
Author michael.brun...@digia.com
Date 2013-09-04 03:50:09 -0700 (Wed, 04 Sep 2013)


Log Message
[Qt] Use correct library paths for prefix builds on Mac.
https://bugs.webkit.org/show_bug.cgi?id=120635

Reviewed by Tor Arne Vestbø.

Due to a change of scope of the qmake force_independent configuration
flag, the library paths in QtWebKit builds on the Mac are set to the
QtWebKit build directory even for production builds.

This patch sets the correct library paths for prefixed production builds
while keeping the scope of the force_independent flag for non-production
builds.

* Source/api.pri:
* Source/widgetsapi.pri:

Modified Paths

trunk/ChangeLog
trunk/Source/api.pri
trunk/Source/widgetsapi.pri




Diff

Modified: trunk/ChangeLog (155033 => 155034)

--- trunk/ChangeLog	2013-09-04 10:33:57 UTC (rev 155033)
+++ trunk/ChangeLog	2013-09-04 10:50:09 UTC (rev 155034)
@@ -1,3 +1,21 @@
+2013-09-04  Michael Brüning  
+
+[Qt] Use correct library paths for prefix builds on Mac.
+https://bugs.webkit.org/show_bug.cgi?id=120635
+
+Reviewed by Tor Arne Vestbø.
+
+Due to a change of scope of the qmake force_independent configuration
+flag, the library paths in QtWebKit builds on the Mac are set to the
+QtWebKit build directory even for production builds.
+
+This patch sets the correct library paths for prefixed production builds
+while keeping the scope of the force_independent flag for non-production
+builds.
+
+* Source/api.pri:
+* Source/widgetsapi.pri:
+
 2013-09-04  Zan Dobersek  
 
 [GTK] Add support for the Wayland build target


Modified: trunk/Source/api.pri (155033 => 155034)

--- trunk/Source/api.pri	2013-09-04 10:33:57 UTC (rev 155033)
+++ trunk/Source/api.pri	2013-09-04 10:50:09 UTC (rev 155034)
@@ -75,7 +75,7 @@
 load(qt_module)
 
 # Make sure the install_name of the QtWebKit library point to webkit
-force_independent:macx {
+!production_build:force_independent:macx {
 # We do our own absolute path so that we can trick qmake into
 # using the webkit build path instead of the Qt install path.
 CONFIG -= absolute_library_soname


Modified: trunk/Source/widgetsapi.pri (155033 => 155034)

--- trunk/Source/widgetsapi.pri	2013-09-04 10:33:57 UTC (rev 155033)
+++ trunk/Source/widgetsapi.pri	2013-09-04 10:50:09 UTC (rev 155034)
@@ -74,7 +74,7 @@
 load(qt_module)
 
 # Make sure the install_name of the QtWebKit library point to webkit
-force_independent:macx {
+!production_build:force_independent:macx {
 # We do our own absolute path so that we can trick qmake into
 # using the webkit build path instead of the Qt install path.
 CONFIG -= absolute_library_soname






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

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

[michael . bruning]

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








Revision 153517
Author michael.brun...@digia.com
Date 2013-07-31 05:12:10 -0700 (Wed, 31 Jul 2013)


Log Message
[Qt][WK1] navigator.plugins shows too few entries.
https://bugs.webkit.org/show_bug.cgi?id=119332

Reviewed by Jocelyn Turcotte.

Based on input by Choon Sik Cho.

PlatformStrategiesQt::getPluginInfo was using the
WTF::Vector::resize method wrongly.

This patch removes the call to Vector::resize as
Vector::append will take care of increasing capacity
if needed.

* WebCoreSupport/PlatformStrategiesQt.cpp:
(PlatformStrategiesQt::getPluginInfo):

Modified Paths

trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (153516 => 153517)

--- trunk/Source/WebKit/qt/ChangeLog	2013-07-31 11:56:06 UTC (rev 153516)
+++ trunk/Source/WebKit/qt/ChangeLog	2013-07-31 12:12:10 UTC (rev 153517)
@@ -1,3 +1,22 @@
+2013-07-31  Michael Brüning  
+
+[Qt][WK1] navigator.plugins shows too few entries.
+https://bugs.webkit.org/show_bug.cgi?id=119332
+
+Reviewed by Jocelyn Turcotte.
+
+Based on input by Choon Sik Cho.
+
+PlatformStrategiesQt::getPluginInfo was using the
+WTF::Vector::resize method wrongly.
+
+This patch removes the call to Vector::resize as
+Vector::append will take care of increasing capacity
+if needed.
+
+* WebCoreSupport/PlatformStrategiesQt.cpp:
+(PlatformStrategiesQt::getPluginInfo):
+
 2013-07-31  Deepjyoti Saha  
 
 [Qt] Add interface API for origin whitelisting


Modified: trunk/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp (153516 => 153517)

--- trunk/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp	2013-07-31 11:56:06 UTC (rev 153516)
+++ trunk/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp	2013-07-31 12:12:10 UTC (rev 153517)
@@ -169,8 +169,6 @@
 PluginDatabase* db = PluginDatabase::installedPlugins();
 const Vector &plugins = db->plugins();
 
-outPlugins.resize(plugins.size());
-
 for (int i = 0; i < plugins.size(); ++i) {
 PluginInfo info;
 PluginPackage* package = plugins[i];






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

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

[michael . bruning]

Title: [153336] trunk/Source/WTF








Revision 153336
Author michael.brun...@digia.com
Date 2013-07-25 11:11:13 -0700 (Thu, 25 Jul 2013)


Log Message
Fix Windows build after r153134.
https://bugs.webkit.org/show_bug.cgi?id=119090

Reviewed by Oliver Hunt.

Add USE(PTHREADS) guards around pthread specific code
for now. This will cause isCompilationThread to always
return false on non pthread platforms such as Windows.

We might be able to use the Windows one-time initialization
for this, but this is only available from Windows Vista on.

* wtf/CompilationThread.cpp:
(WTF::initializeCompilationThreads):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/CompilationThread.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (153335 => 153336)

--- trunk/Source/WTF/ChangeLog	2013-07-25 17:55:49 UTC (rev 153335)
+++ trunk/Source/WTF/ChangeLog	2013-07-25 18:11:13 UTC (rev 153336)
@@ -1,3 +1,20 @@
+2013-07-25  Michael Brüning  
+
+Fix Windows build after r153134.
+https://bugs.webkit.org/show_bug.cgi?id=119090
+
+Reviewed by Oliver Hunt.
+
+Add USE(PTHREADS) guards around pthread specific code
+for now. This will cause isCompilationThread to always
+return false on non pthread platforms such as Windows.
+
+We might be able to use the Windows one-time initialization
+for this, but this is only available from Windows Vista on.
+
+* wtf/CompilationThread.cpp:
+(WTF::initializeCompilationThreads):
+
 2013-07-25  Allan Sandfeld Jensen  
 
 Fix windows build after FTL upstream


Modified: trunk/Source/WTF/wtf/CompilationThread.cpp (153335 => 153336)

--- trunk/Source/WTF/wtf/CompilationThread.cpp	2013-07-25 17:55:49 UTC (rev 153335)
+++ trunk/Source/WTF/wtf/CompilationThread.cpp	2013-07-25 18:11:13 UTC (rev 153336)
@@ -33,7 +33,9 @@
 namespace WTF {
 
 static ThreadSpecific* s_isCompilationThread;
+#if USE(PTHREADS)
 static pthread_once_t initializeCompilationThreadsKeyOnce = PTHREAD_ONCE_INIT;
+#endif
 
 static void initializeCompilationThreadsOnce()
 {
@@ -42,7 +44,9 @@
 
 static void initializeCompilationThreads()
 {
+#if USE(PTHREADS)
 pthread_once(&initializeCompilationThreadsKeyOnce, initializeCompilationThreadsOnce);
+#endif
 }
 
 bool isCompilationThread()






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

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

[michael . bruning]

Title: [152720] trunk/Source/WebKit2








Revision 152720
Author michael.brun...@digia.com
Date 2013-07-16 06:51:32 -0700 (Tue, 16 Jul 2013)


Log Message
[Qt] Replace Nokia with Qt Project in service name.
https://bugs.webkit.org/show_bug.cgi?id=118729

Reviewed by Simon Hausmann.

* 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 (152719 => 152720)

--- trunk/Source/WebKit2/ChangeLog	2013-07-16 13:05:24 UTC (rev 152719)
+++ trunk/Source/WebKit2/ChangeLog	2013-07-16 13:51:32 UTC (rev 152720)
@@ -1,3 +1,13 @@
+2013-07-16  Michael Brüning  
+
+[Qt] Replace Nokia with Qt Project in service name.
+https://bugs.webkit.org/show_bug.cgi?id=118729
+
+Reviewed by Simon Hausmann.
+
+* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+(WebKit::ProcessLauncher::launchProcess):
+
 2013-07-16  Dong-Gwan Kim  
 
 EWK2BackForwardListTest should be defined by inheriting from EWK2UnitTestBase.


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

--- trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp	2013-07-16 13:05:24 UTC (rev 152719)
+++ trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp	2013-07-16 13:51:32 UTC (rev 152720)
@@ -136,7 +136,7 @@
 mach_port_insert_right(mach_task_self(), connector, connector, MACH_MSG_TYPE_MAKE_SEND);
 
 // Register port with a service name to the system.
-QString serviceName = QStringLiteral("com.nokia.Qt.WebKit.QtWebProcess-%1-%2");
+QString serviceName = QStringLiteral("org.qt-project.Qt.WebKit.QtWebProcess-%1-%2");
 serviceName = serviceName.arg(QString().setNum(getpid()), QString().setNum((size_t)this));
 kern_return_t kr = bootstrap_register2(bootstrap_port, const_cast(serviceName.toUtf8().data()), connector, 0);
 ASSERT_UNUSED(kr, kr == KERN_SUCCESS);






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

[webkit-changes] [152715] trunk

[michael . bruning]

Title: [152715] trunk








Revision 152715
Author michael.brun...@digia.com
Date 2013-07-16 05:22:20 -0700 (Tue, 16 Jul 2013)


Log Message
[Qt] Replace Nokia references.
https://bugs.webkit.org/show_bug.cgi?id=118728

Reviewed by Simon Hausmann.

Source/WebKit/qt:

* Api/qwebkitplatformplugin.h:
* examples/platformplugin/qwebkitplatformplugin.h:

Tools:

* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::MiniBrowserApplication):
* QtTestBrowser/qttestbrowser.cpp:
(LauncherApplication::LauncherApplication):

Modified Paths

trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h
trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
trunk/Tools/QtTestBrowser/qttestbrowser.cpp




Diff

Modified: trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h (152714 => 152715)

--- trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -180,7 +181,7 @@
 };
 
 QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.9");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "org.qt-project.Qt.WebKit.PlatformPlugin/1.9");
 QT_END_NAMESPACE
 
 #endif // QWEBKITPLATFORMPLUGIN_H


Modified: trunk/Source/WebKit/qt/ChangeLog (152714 => 152715)

--- trunk/Source/WebKit/qt/ChangeLog	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Source/WebKit/qt/ChangeLog	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,3 +1,13 @@
+2013-07-16  Michael Brüning  
+
+[Qt] Replace Nokia references.
+https://bugs.webkit.org/show_bug.cgi?id=118728
+
+Reviewed by Simon Hausmann.
+
+* Api/qwebkitplatformplugin.h:
+* examples/platformplugin/qwebkitplatformplugin.h:
+
 2013-07-14  Kangil Han  
 
 Introduce toHTMLVideoElement


Modified: trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h (152714 => 152715)

--- trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -180,7 +181,7 @@
 };
 
 QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.9");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "org.qt-project.Qt.WebKit.PlatformPlugin/1.9");
 QT_END_NAMESPACE
 
 #endif // QWEBKITPLATFORMPLUGIN_H


Modified: trunk/Tools/ChangeLog (152714 => 152715)

--- trunk/Tools/ChangeLog	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Tools/ChangeLog	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,3 +1,15 @@
+2013-07-16  Michael Brüning  
+
+[Qt] Replace Nokia references.
+https://bugs.webkit.org/show_bug.cgi?id=118728
+
+Reviewed by Simon Hausmann.
+
+* MiniBrowser/qt/MiniBrowserApplication.cpp:
+(MiniBrowserApplication::MiniBrowserApplication):
+* QtTestBrowser/qttestbrowser.cpp:
+(LauncherApplication::LauncherApplication):
+
 2013-07-15  Tim Horton  
 
 Update blocked/missing plug-in UI


Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (152714 => 152715)

--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2010 University of Szeged
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  *
  * All rights reserved.
  *
@@ -83,7 +84,7 @@
 , m_windowOptions(this)
 , m_holdingControl(false)
 {
-setOrganizationName("Nokia");
+setOrganizationName("QtProject");
 setApplicationName("QtMiniBrowser");
 setApplicationVersion("0.1");
 


Modified: trunk/Tools/QtTestBrowser/qttestbrowser.cpp (152714 => 152715)

--- trunk/Tools/QtTestBrowser/qttestbrowser.cpp	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Tools/QtTestBrowser/qttestbrowser.cpp	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Girish Ramakrishnan 
  * Copyright (C) 2006 George Staikos 
@@ -

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

[michael . bruning]

Title: [152529] trunk/Source/WTF








Revision 152529
Author michael.brun...@digia.com
Date 2013-07-10 01:36:13 -0700 (Wed, 10 Jul 2013)


Log Message
Workaround for x86 optimizer bug in MSVC 2012.
https://bugs.webkit.org/show_bug.cgi?id=118478

Reviewed by Benjamin Poulain.

This is a workaround for a bug in the x86 MSVC 2012 optimizer.

The problem is that the range comparison gets optimized out when
the templated inline function toASCIIUpper. Copying the methods
content fixes the problem.

This is unfortunately not the nicest fix, but the alternative would
be to turn off optimization for StringImpl::upper on the x86 MSVC 2012
build, which might impact overall performance negatively.

* wtf/text/StringImpl.cpp:
(WTF::StringImpl::upper):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/text/StringImpl.cpp




Diff

Modified: trunk/Source/WTF/ChangeLog (152528 => 152529)

--- trunk/Source/WTF/ChangeLog	2013-07-10 08:13:15 UTC (rev 152528)
+++ trunk/Source/WTF/ChangeLog	2013-07-10 08:36:13 UTC (rev 152529)
@@ -1,3 +1,23 @@
+2013-07-10  Michael Brüning  
+
+Workaround for x86 optimizer bug in MSVC 2012.
+https://bugs.webkit.org/show_bug.cgi?id=118478
+
+Reviewed by Benjamin Poulain.
+
+This is a workaround for a bug in the x86 MSVC 2012 optimizer.
+
+The problem is that the range comparison gets optimized out when
+the templated inline function toASCIIUpper. Copying the methods 
+content fixes the problem. 
+
+This is unfortunately not the nicest fix, but the alternative would
+be to turn off optimization for StringImpl::upper on the x86 MSVC 2012
+build, which might impact overall performance negatively.
+
+* wtf/text/StringImpl.cpp:
+(WTF::StringImpl::upper):
+
 2013-07-08  Carlos Garcia Campos  
 
 Unreviewed. Fix make distcheck.


Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (152528 => 152529)

--- trunk/Source/WTF/wtf/text/StringImpl.cpp	2013-07-10 08:13:15 UTC (rev 152528)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp	2013-07-10 08:36:13 UTC (rev 152529)
@@ -485,7 +485,14 @@
 for (int i = 0; i < length; ++i) {
 LChar c = m_data8[i];
 ored |= c;
+#if CPU(X86) && defined(_MSC_VER) && _MSC_VER >=1700
+// Workaround for an MSVC 2012 x86 optimizer bug. Remove once the bug is fixed.
+// See https://connect.microsoft.com/VisualStudio/feedback/details/780362/optimization-bug-of-range-comparison
+// for more details.
+data8[i] = c >= 'a' && c <= 'z' ? c & ~0x20 : c;
+#else
 data8[i] = toASCIIUpper(c);
+#endif
 }
 if (!(ored & ~0x7F))
 return newImpl.release();






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

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

[michael . bruning]

Title: [151643] trunk/Source/WebCore








Revision 151643
Author michael.brun...@digia.com
Date 2013-06-17 08:26:24 -0700 (Mon, 17 Jun 2013)


Log Message
[Mac] Remove unmaintained GStreamer specific video code.
https://bugs.webkit.org/show_bug.cgi?id=117694

Reviewed by Philippe Normand.

No new tests, no behaviour change.

* platform/mac/WebVideoFullscreenController.mm:
(-[WebVideoFullscreenController setupVideoOverlay:]):
(-[WebVideoFullscreenController windowDidLoad]):
(-[WebVideoFullscreenController setMediaElement:]):
(-[WebVideoFullscreenController windowDidExitFullscreen]):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (151642 => 151643)

--- trunk/Source/WebCore/ChangeLog	2013-06-17 14:35:05 UTC (rev 151642)
+++ trunk/Source/WebCore/ChangeLog	2013-06-17 15:26:24 UTC (rev 151643)
@@ -1,5 +1,20 @@
 2013-06-17  Michael Brüning  
 
+[Mac] Remove unmaintained GStreamer specific video code.
+https://bugs.webkit.org/show_bug.cgi?id=117694
+
+Reviewed by Philippe Normand.
+
+No new tests, no behaviour change.
+
+* platform/mac/WebVideoFullscreenController.mm:
+(-[WebVideoFullscreenController setupVideoOverlay:]):
+(-[WebVideoFullscreenController windowDidLoad]):
+(-[WebVideoFullscreenController setMediaElement:]):
+(-[WebVideoFullscreenController windowDidExitFullscreen]):
+
+2013-06-17  Michael Brüning  
+
 [Qt] Remove Qt specific QTKIT flagged code.
 https://bugs.webkit.org/show_bug.cgi?id=117635
 


Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (151642 => 151643)

--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm	2013-06-17 14:35:05 UTC (rev 151642)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm	2013-06-17 15:26:24 UTC (rev 151643)
@@ -39,10 +39,6 @@
 #import 
 #import 
 
-#if USE(GSTREAMER)
-#import 
-#endif
-
 using namespace WebCore;
 
 SOFT_LINK_FRAMEWORK(QTKit)
@@ -102,16 +98,8 @@
 - (void)setupVideoOverlay:(CALayer *)layer
 {
 WebVideoFullscreenWindow *window = [self fullscreenWindow];
-#if USE(GSTREAMER)
-if (_mediaElement && _mediaElement->platformMedia().type == PlatformMedia::GStreamerGWorldType) {
-GStreamerGWorld* gstGworld = _mediaElement->platformMedia().media.gstreamerGWorld;
-if (gstGworld->enterFullscreen())
-[window setContentView:gstGworld->platformVideoWindow()->window()];
-}
-#else
 [[window contentView] setLayer:layer];
 [[window contentView] setWantsLayer:YES];
-#endif
 }
 
 - (void)windowDidLoad
@@ -122,10 +110,8 @@
 [[window contentView] setLayer:[CALayer layer]];
 [[window contentView] setWantsLayer:YES];
 
-#if !USE(GSTREAMER)
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidResignActive:) name:NSApplicationDidResignActiveNotification object:NSApp];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidChangeScreenParameters:) name:NSApplicationDidChangeScreenParametersNotification object:NSApp];
-#endif
 }
 
 - (HTMLMediaElement*)mediaElement
@@ -147,12 +133,10 @@
 [layer setMovie:movie];
 [self setupVideoOverlay:layer];
 
-#if !USE(GSTREAMER)
 [[NSNotificationCenter defaultCenter] addObserver:self
  selector:@selector(rateChanged:)
  name:QTMovieRateDidChangeNotification
object:movie];
-#endif
 
 } else if (_mediaElement->platformMedia().type == PlatformMedia::AVFoundationMediaPlayerType) {
 AVPlayer *player = _mediaElement->platformMedia().media.avfMediaPlayer;
@@ -187,10 +171,6 @@
 
 - (void)windowDidExitFullscreen
 {
-#if USE(GSTREAMER)
-if (_mediaElement && _mediaElement->platformMedia().type == PlatformMedia::GStreamerGWorldType)
-_mediaElement->platformMedia().media.gstreamerGWorld->exitFullscreen();
-#endif
 CALayer *layer = [[[self window] contentView] layer];
 if ([layer isKindOfClass:getAVPlayerLayerClass()])
 [[(AVPlayerLayer*)layer player] removeObserver:self forKeyPath:@"rate"];






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

[webkit-changes] [151546] trunk

[michael . bruning]

Title: [151546] trunk








Revision 151546
Author michael.brun...@digia.com
Date 2013-06-13 07:42:29 -0700 (Thu, 13 Jun 2013)


Log Message
[Qt][Mac] Disable QTKit video on OS X.
https://bugs.webkit.org/show_bug.cgi?id=117591

Reviewed by Tor Arne Vestbø.

Source/WebCore:

Deployment of the same Qt binaries to different
Mac OS X version makes it impossible to link against
the correct WebKitSystemInterface version at build time.

No new tests, no behavioural change.

* WebCore.pri:

Tools:

Deployment of Qt binaries to different Mac OS X
platform version makes it impossible to link against
the correct version of the WebKitSystemInterface library,
so we need to disable QTKit for media elements.

* qmake/mkspecs/features/features.prf:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/features.prf




Diff

Modified: trunk/Source/WebCore/ChangeLog (151545 => 151546)

--- trunk/Source/WebCore/ChangeLog	2013-06-13 14:11:02 UTC (rev 151545)
+++ trunk/Source/WebCore/ChangeLog	2013-06-13 14:42:29 UTC (rev 151546)
@@ -1,3 +1,18 @@
+2013-06-13  Michael Brüning  
+
+[Qt][Mac] Disable QTKit video on OS X.
+https://bugs.webkit.org/show_bug.cgi?id=117591
+
+Reviewed by Tor Arne Vestbø.
+
+Deployment of the same Qt binaries to different
+Mac OS X version makes it impossible to link against
+the correct WebKitSystemInterface version at build time.
+
+No new tests, no behavioural change.
+
+* WebCore.pri:
+
 2013-06-13  Morten Stenshorne  
 
 Column balancing support in the region based multicol implementation


Modified: trunk/Source/WebCore/WebCore.pri (151545 => 151546)

--- trunk/Source/WebCore/WebCore.pri	2013-06-13 14:11:02 UTC (rev 151545)
+++ trunk/Source/WebCore/WebCore.pri	2013-06-13 14:42:29 UTC (rev 151546)
@@ -180,41 +180,7 @@
 }
 
 enable?(VIDEO) {
-use?(QTKIT) {
-INCLUDEPATH += $$SOURCE_DIR/platform/graphics/mac
-
-LIBS += -framework AppKit -framework AudioUnit \
--framework AudioToolbox -framework CoreAudio \
--framework QuartzCore -framework QTKit \
--framework Security -framework IOKit
-
-DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
-DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
-
-haveQt(5,1) {
-equals(QMAKE_MAC_SDK_VERSION, 10.7): \
-SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
-else:equals(QMAKE_MAC_SDK_VERSION, 10.8): \
-SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
-} else {
-# We first check if a specific SDK is set to be used for the build.
-contains(QMAKE_MAC_SDK, ".*MacOSX10.7.sdk.*") {
-SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
-} else:contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk.*") {
-SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
-}
-
-# If the previous check did not yield a result, we resort to the Darwin version.
-isEmpty(SYSTEM_LIBRARY_PATH) {
-equals(DARWIN_MAJOR_VERSION, "11") {
-SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
-} else:equals(DARWIN_MAJOR_VERSION, "12") {
-SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
-}
-}
-}
-LIBS += $$SYSTEM_LIBRARY_PATH
-} else:use?(GSTREAMER) {
+use?(GSTREAMER) {
 INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer
 } else:use?(QT_MULTIMEDIA) {
 QT *= multimedia


Modified: trunk/Tools/ChangeLog (151545 => 151546)

--- trunk/Tools/ChangeLog	2013-06-13 14:11:02 UTC (rev 151545)
+++ trunk/Tools/ChangeLog	2013-06-13 14:42:29 UTC (rev 151546)
@@ -1,3 +1,17 @@
+2013-06-13  Michael Brüning  
+
+[Qt][Mac] Disable QTKit video on OS X.
+https://bugs.webkit.org/show_bug.cgi?id=117591
+
+Reviewed by Tor Arne Vestbø.
+
+Deployment of Qt binaries to different Mac OS X
+platform version makes it impossible to link against
+the correct version of the WebKitSystemInterface library,
+so we need to disable QTKit for media elements.
+
+* qmake/mkspecs/features/features.prf:
+
 2013-06-13  Michał Pakuła vel Rutka  
 
 [EFL][WK2] Wrong context menu and popup menu positions when scroll is applied


Modified: trunk/Tools/qmake/mkspecs/features/features.prf (151545 => 151546)

--- trunk/Tools/qmake/mkspecs/features/features.prf	2013-06-13 14:11:02 UTC (rev 151545)
+++ trunk/Tools/qmake/mkspecs/features/features.prf	2013-06-13 14:42:29 UTC (rev 151546)
@@ -105,25 

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

[michael . bruning]

Title: [150432] trunk/Source/WebKit2








Revision 150432
Author michael.brun...@digia.com
Date 2013-05-21 02:04:46 -0700 (Tue, 21 May 2013)


Log Message
[Qt][WK2] Fix Mountain Lion builds after r150277.
https://bugs.webkit.org/show_bug.cgi?id=116467

Reviewed by Jocelyn Turcotte.

* Shared/API/c/WKBase.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/API/c/WKBase.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (150431 => 150432)

--- trunk/Source/WebKit2/ChangeLog	2013-05-21 08:43:57 UTC (rev 150431)
+++ trunk/Source/WebKit2/ChangeLog	2013-05-21 09:04:46 UTC (rev 150432)
@@ -1,3 +1,12 @@
+2013-05-21  Michael Brüning  
+
+[Qt][WK2] Fix Mountain Lion builds after r150277.
+https://bugs.webkit.org/show_bug.cgi?id=116467
+
+Reviewed by Jocelyn Turcotte.
+
+* Shared/API/c/WKBase.h:
+
 2013-05-20  Lucas Forschler  
 
 Rollout r150398.


Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (150431 => 150432)

--- trunk/Source/WebKit2/Shared/API/c/WKBase.h	2013-05-21 08:43:57 UTC (rev 150431)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h	2013-05-21 09:04:46 UTC (rev 150432)
@@ -41,7 +41,7 @@
 #include 
 #endif
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) && !defined(BUILDING_QT__)
 #include 
 #endif
 






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

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

[michael . bruning]

Title: [150063] trunk/Source/WebKit2








Revision 150063
Author michael.brun...@digia.com
Date 2013-05-14 04:32:01 -0700 (Tue, 14 May 2013)


Log Message
[WK2] Make WebPageProxy use deviceScaleFactor() in creationParameters().
https://bugs.webkit.org/show_bug.cgi?id=110218

Reviewed by Darin Adler.

Make the WebPageProxy::creationParameters use the accessor
deviceScaleFactor() instead of using m_intrinsicDeviceScaleFactor
directly. This will restore the custom device scale factor when
reattaching to the WebProcess after a crash.

Moreover, it will enable the Qt and ELF ports to use the
existing C API for overriding the device scale factor instead
of using the WebPageProxy directly or adding new C API to set
the intrinsic device scale factor.

* UIProcess/API/efl/EwkView.cpp:
(EwkView::setDeviceScaleFactor):
* UIProcess/API/qt/qquickwebpage.cpp:
(QQuickWebPage::updatePaintNode):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (150062 => 150063)

--- trunk/Source/WebKit2/ChangeLog	2013-05-14 10:12:35 UTC (rev 150062)
+++ trunk/Source/WebKit2/ChangeLog	2013-05-14 11:32:01 UTC (rev 150063)
@@ -1,3 +1,27 @@
+2013-05-14  Michael Brüning  
+
+[WK2] Make WebPageProxy use deviceScaleFactor() in creationParameters().
+https://bugs.webkit.org/show_bug.cgi?id=110218
+
+Reviewed by Darin Adler.
+
+Make the WebPageProxy::creationParameters use the accessor
+deviceScaleFactor() instead of using m_intrinsicDeviceScaleFactor
+directly. This will restore the custom device scale factor when
+reattaching to the WebProcess after a crash.
+
+Moreover, it will enable the Qt and ELF ports to use the
+existing C API for overriding the device scale factor instead
+of using the WebPageProxy directly or adding new C API to set
+the intrinsic device scale factor.
+
+* UIProcess/API/efl/EwkView.cpp:
+(EwkView::setDeviceScaleFactor):
+* UIProcess/API/qt/qquickwebpage.cpp:
+(QQuickWebPage::updatePaintNode):
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::creationParameters):
+
 2013-05-13  Alex Christensen  
 
 Added testRunner.setPrinting.


Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (150062 => 150063)

--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp	2013-05-14 10:12:35 UTC (rev 150062)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp	2013-05-14 11:32:01 UTC (rev 150063)
@@ -480,7 +480,7 @@
 void EwkView::setDeviceScaleFactor(float scale)
 {
 const WKSize& deviceSize = WKViewGetSize(wkView());
-page()->setIntrinsicDeviceScaleFactor(scale);
+WKPageSetCustomBackingScaleFactor(wkPage(), scale);
 
 // Update internal viewport size after device-scale change.
 WKViewSetSize(wkView(), deviceSize);


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp (150062 => 150063)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp	2013-05-14 10:12:35 UTC (rev 150062)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp	2013-05-14 11:32:01 UTC (rev 150063)
@@ -29,6 +29,7 @@
 #include "qquickwebview_p_p.h"
 #include "qwebkittest_p.h"
 #include 
+#include 
 #include 
 
 using namespace WebKit;
@@ -78,8 +79,9 @@
 const QWindow* window = this->window();
 ASSERT(window);
 
-if (window && webViewPrivate->deviceScaleFactor() != window->devicePixelRatio()) {
-webViewPrivate->setIntrinsicDeviceScaleFactor(window->devicePixelRatio());
+WKPageRef pageRef = webViewPrivate->webPage.get();
+if (window && WKPageGetBackingScaleFactor(pageRef) != window->devicePixelRatio()) {
+WKPageSetCustomBackingScaleFactor(pageRef, window->devicePixelRatio());
 // This signal is queued since if we are running a threaded renderer. This might cause failures
 // if tests are reading the new value between the property change and the signal emission.
 emit d->viewportItem->experimental()->test()->devicePixelRatioChanged();


Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (150062 => 150063)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2013-05-14 10:12:35 UTC (rev 150062)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2013-05-14 11:32:01 UTC (rev 150063)
@@ -3939,7 +3939,7 @@
 parameters.highestUsedBackForwardItemID = WebBackForwardListItem::highedUsedItemID();
 parameters.canRunBeforeUnloadConfirmPanel = m_uiClient.canRunBeforeUnloadConfirmPanel();
 parameters.canRunModal = m_canRunModal;
-parameters.deviceScaleFactor = m_intrinsicDeviceScaleFactor;
+parameters.deviceScaleFactor = deviceScaleFactor();
 parameters.mediaVolume = m_mediaVolume;
 parameters.mayStartMediaWhenInWi

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

[michael . bruning]

Title: [148021] trunk/Source/WebKit2








Revision 148021
Author michael.brun...@digia.com
Date 2013-04-09 07:14:58 -0700 (Tue, 09 Apr 2013)


Log Message
[Qt][WK2] Remove obsolete QtWebPageFindClient forward declaration from qquickwebview_p.h.
https://bugs.webkit.org/show_bug.cgi?id=114284

Reviewed by Andreas Kling.

The class QtWebPageFindClient was removed in r142073 when the functionality
was folded into QQuickWebViewPrivate.

* UIProcess/API/qt/qquickwebview_p.h:
(WebKit):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit2/ChangeLog (148020 => 148021)

--- trunk/Source/WebKit2/ChangeLog	2013-04-09 14:13:30 UTC (rev 148020)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-09 14:14:58 UTC (rev 148021)
@@ -1,5 +1,18 @@
 2013-04-09  Michael Brüning  
 
+[Qt][WK2] Remove obsolete QtWebPageFindClient forward declaration from qquickwebview_p.h.
+https://bugs.webkit.org/show_bug.cgi?id=114284
+
+Reviewed by Andreas Kling.
+
+The class QtWebPageFindClient was removed in r142073 when the functionality
+was folded into QQuickWebViewPrivate.
+
+* UIProcess/API/qt/qquickwebview_p.h:
+(WebKit):
+
+2013-04-09  Michael Brüning  
+
 Fix GTK WebKit2 build after r148005.
 https://bugs.webkit.org/show_bug.cgi?id=114270
 


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

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2013-04-09 14:13:30 UTC (rev 148020)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h	2013-04-09 14:14:58 UTC (rev 148021)
@@ -55,7 +55,6 @@
 namespace WebKit {
 struct QtRefCountedNetworkRequestData;
 class PageViewportControllerClientQt;
-class QtWebPageFindClient;
 class QtWebPagePolicyClient;
 class QtWebPageUIClient;
 }
@@ -224,7 +223,6 @@
 
 friend class QWebKitTest;
 friend class WebKit::PageViewportControllerClientQt;
-friend class WebKit::QtWebPageFindClient;
 friend class WebKit::QtWebPagePolicyClient;
 friend class WebKit::QtWebPageUIClient;
 friend class WTR::PlatformWebView;






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

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

[michael . bruning]

Title: [148014] trunk/Source/WebKit2








Revision 148014
Author michael.brun...@digia.com
Date 2013-04-09 05:13:01 -0700 (Tue, 09 Apr 2013)


Log Message
Fix GTK WebKit2 build after r148005.
https://bugs.webkit.org/show_bug.cgi?id=114270

Reviewed by Andreas Kling.

Fix GTK build break that went through the buildbot undetected.

* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
(webkit_file_chooser_request_get_selected_files):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (148013 => 148014)

--- trunk/Source/WebKit2/ChangeLog	2013-04-09 12:11:56 UTC (rev 148013)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-09 12:13:01 UTC (rev 148014)
@@ -1,5 +1,17 @@
 2013-04-09  Michael Brüning  
 
+Fix GTK WebKit2 build after r148005.
+https://bugs.webkit.org/show_bug.cgi?id=114270
+
+Reviewed by Andreas Kling.
+
+Fix GTK build break that went through the buildbot undetected.
+
+* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+(webkit_file_chooser_request_get_selected_files):
+
+2013-04-09  Michael Brüning  
+
 [Qt][WK2] Remove direct references to WebPageProxy from QQuickWebPage.
 https://bugs.webkit.org/show_bug.cgi?id=112850
 


Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (148013 => 148014)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp	2013-04-09 12:11:56 UTC (rev 148013)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp	2013-04-09 12:13:01 UTC (rev 148014)
@@ -355,7 +355,7 @@
 WebString* webFileName = static_cast(selectedFileNames->at(i));
 if (webFileName->isEmpty())
 continue;
-CString filename = fileSystemRepresentation(selectedFileNames[i]);
+CString filename = fileSystemRepresentation(webFileName->string());
 g_ptr_array_add(request->priv->selectedFiles.get(), g_strdup(filename.data()));
 }
 g_ptr_array_add(request->priv->selectedFiles.get(), 0);






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

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

[michael . bruning]

Title: [148011] trunk/Source/WebKit2








Revision 148011
Author michael.brun...@digia.com
Date 2013-04-09 04:53:26 -0700 (Tue, 09 Apr 2013)


Log Message
[Qt][WK2] Remove direct references to WebPageProxy from QQuickWebPage.
https://bugs.webkit.org/show_bug.cgi?id=112850

Reviewed by Andreas Kling.

Removes direct references to WebPageProxy from QQuickWebPage and prepares the
class for the move to QRawWebView. The access to the device scale factor and
CoordinatedGraphicsScene is provided through QQuickWebViewPrivate, and therefore
accessors to these properties are temporarily added. Eventually, this access will
be provided through QRawWebView when the move is complete.

This also moves the pointer to QtWebPageEventHandler from QQuickWebPagePrivate
to QQuickWebViewPrivate as it is mainly used from there.

* UIProcess/API/qt/qquickwebpage.cpp:
(QQuickWebPagePrivate::QQuickWebPagePrivate):
(QQuickWebPagePrivate::paint):
(QQuickWebPage::updatePaintNode):
* UIProcess/API/qt/qquickwebpage_p.h:
* UIProcess/API/qt/qquickwebpage_p_p.h:
(QQuickWebPagePrivate):
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):
(QQuickWebViewPrivate::handleMouseEvent):
(QQuickWebViewPrivate::processDidCrash):
(QQuickWebViewPrivate::coordinatedGraphicsScene):
(QQuickWebViewPrivate::deviceScaleFactor):
(QQuickWebViewPrivate::setIntrinsicDeviceScaleFactor):
(QQuickWebViewFlickablePrivate::onComponentComplete):
(QQuickWebView::keyPressEvent):
(QQuickWebView::keyReleaseEvent):
(QQuickWebView::inputMethodEvent):
(QQuickWebView::focusInEvent):
(QQuickWebView::itemChange):
(QQuickWebView::touchEvent):
(QQuickWebView::wheelEvent):
(QQuickWebView::hoverEnterEvent):
(QQuickWebView::hoverMoveEvent):
(QQuickWebView::hoverLeaveEvent):
(QQuickWebView::dragMoveEvent):
(QQuickWebView::dragEnterEvent):
(QQuickWebView::dragLeaveEvent):
(QQuickWebView::dropEvent):
* UIProcess/API/qt/qquickwebview_p_p.h:
(WebCore):
(WebKit):
(QQuickWebViewPrivate):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (148010 => 148011)

--- trunk/Source/WebKit2/ChangeLog	2013-04-09 11:51:13 UTC (rev 148010)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-09 11:53:26 UTC (rev 148011)
@@ -1,5 +1,55 @@
 2013-04-09  Michael Brüning  
 
+[Qt][WK2] Remove direct references to WebPageProxy from QQuickWebPage.
+https://bugs.webkit.org/show_bug.cgi?id=112850
+
+Reviewed by Andreas Kling.
+
+Removes direct references to WebPageProxy from QQuickWebPage and prepares the
+class for the move to QRawWebView. The access to the device scale factor and
+CoordinatedGraphicsScene is provided through QQuickWebViewPrivate, and therefore
+accessors to these properties are temporarily added. Eventually, this access will
+be provided through QRawWebView when the move is complete.
+
+This also moves the pointer to QtWebPageEventHandler from QQuickWebPagePrivate
+to QQuickWebViewPrivate as it is mainly used from there.
+
+* UIProcess/API/qt/qquickwebpage.cpp:
+(QQuickWebPagePrivate::QQuickWebPagePrivate):
+(QQuickWebPagePrivate::paint):
+(QQuickWebPage::updatePaintNode):
+* UIProcess/API/qt/qquickwebpage_p.h:
+* UIProcess/API/qt/qquickwebpage_p_p.h:
+(QQuickWebPagePrivate):
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::initialize):
+(QQuickWebViewPrivate::handleMouseEvent):
+(QQuickWebViewPrivate::processDidCrash):
+(QQuickWebViewPrivate::coordinatedGraphicsScene):
+(QQuickWebViewPrivate::deviceScaleFactor):
+(QQuickWebViewPrivate::setIntrinsicDeviceScaleFactor):
+(QQuickWebViewFlickablePrivate::onComponentComplete):
+(QQuickWebView::keyPressEvent):
+(QQuickWebView::keyReleaseEvent):
+(QQuickWebView::inputMethodEvent):
+(QQuickWebView::focusInEvent):
+(QQuickWebView::itemChange):
+(QQuickWebView::touchEvent):
+(QQuickWebView::wheelEvent):
+(QQuickWebView::hoverEnterEvent):
+(QQuickWebView::hoverMoveEvent):
+(QQuickWebView::hoverLeaveEvent):
+(QQuickWebView::dragMoveEvent):
+(QQuickWebView::dragEnterEvent):
+(QQuickWebView::dragLeaveEvent):
+(QQuickWebView::dropEvent):
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(WebCore):
+(WebKit):
+(QQuickWebViewPrivate):
+
+2013-04-09  Michael Brüning  
+
 [Qt][WK2] Use C API to enable Navigator Qt Object.
 https://bugs.webkit.org/show_bug.cgi?id=112810
 


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp (148010 => 148011)

--- tr

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

[michael . bruning]

Title: [148008] trunk/Source/WebKit2








Revision 148008
Author michael.brun...@digia.com
Date 2013-04-09 04:48:24 -0700 (Tue, 09 Apr 2013)


Log Message
[Qt][WK2] Use C API to enable Navigator Qt Object.
https://bugs.webkit.org/show_bug.cgi?id=112810

Reviewed by Andreas Kling.

Replace the direct reference to the WebPageProxy with use of
C API.

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

Modified Paths

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




Diff

Modified: trunk/Source/WebKit2/ChangeLog (148007 => 148008)

--- trunk/Source/WebKit2/ChangeLog	2013-04-09 11:42:56 UTC (rev 148007)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-09 11:48:24 UTC (rev 148008)
@@ -1,5 +1,18 @@
 2013-04-09  Michael Brüning  
 
+[Qt][WK2] Use C API to enable Navigator Qt Object.
+https://bugs.webkit.org/show_bug.cgi?id=112810
+
+Reviewed by Andreas Kling.
+
+Replace the direct reference to the WebPageProxy with use of
+C API.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::setNavigatorQtObjectEnabled):
+
+2013-04-09  Michael Brüning  
+
 [WK2] Add C API to copy selected files from WebOpenPanelParameters.
 https://bugs.webkit.org/show_bug.cgi?id=112339
 


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

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2013-04-09 11:42:56 UTC (rev 148007)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2013-04-09 11:48:24 UTC (rev 148008)
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -839,9 +840,9 @@
 // FIXME: Currently we have to keep this information in both processes and the setting is asynchronous.
 m_navigatorQtObjectEnabled = enabled;
 
-static String messageName("SetNavigatorQtObjectEnabled");
-RefPtr webEnabled = WebBoolean::create(enabled);
-webPageProxy->postMessageToInjectedBundle(messageName, webEnabled.get());
+static WKStringRef messageName = WKStringCreateWithUTF8CString("SetNavigatorQtObjectEnabled");
+WKRetainPtr wkEnabled = adoptWK(WKBooleanCreate(enabled));
+WKPagePostMessageToInjectedBundle(webPage.get(), messageName, wkEnabled.get());
 }
 
 static WKRetainPtr readUserScript(const QUrl& url)






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

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

[michael . bruning]

Title: [148005] trunk/Source/WebKit2








Revision 148005
Author michael.brun...@digia.com
Date 2013-04-09 04:13:44 -0700 (Tue, 09 Apr 2013)


Log Message
[WK2] Add C API to copy selected files from WebOpenPanelParameters.
https://bugs.webkit.org/show_bug.cgi?id=112339

Reviewed by Andreas Kling.

Replaces the existing WebOpenPanelParameters::selectedFileNames() method
to return a copy of the selected file names and exposes it through the
C API. This is done in order to reduce the direct use of WebKit2 internal
classes. The implementation is very similar to the one in
WebOpenPanelParameters::acceptMIMETypes().

This also updates the GTK port, which is the other user of selectedFileNames.

* Shared/WebOpenPanelParameters.cpp:
(WebKit::WebOpenPanelParameters::selectedFileNames):
(WebKit):
* Shared/WebOpenPanelParameters.h:
(WebOpenPanelParameters):
* UIProcess/API/C/WKOpenPanelParameters.cpp:
(WKOpenPanelParametersCopySelectedFileNames):
* UIProcess/API/C/WKOpenPanelParameters.h:
* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
(webkit_file_chooser_request_get_selected_files):
* UIProcess/qt/QtWebPageUIClient.cpp:
(WebKit::QtWebPageUIClient::runOpenPanel):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp
trunk/Source/WebKit2/Shared/WebOpenPanelParameters.h
trunk/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp
trunk/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.h
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (148004 => 148005)

--- trunk/Source/WebKit2/ChangeLog	2013-04-09 11:01:32 UTC (rev 148004)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-09 11:13:44 UTC (rev 148005)
@@ -1,3 +1,31 @@
+2013-04-09  Michael Brüning  
+
+[WK2] Add C API to copy selected files from WebOpenPanelParameters.
+https://bugs.webkit.org/show_bug.cgi?id=112339
+
+Reviewed by Andreas Kling.
+
+Replaces the existing WebOpenPanelParameters::selectedFileNames() method
+to return a copy of the selected file names and exposes it through the
+C API. This is done in order to reduce the direct use of WebKit2 internal
+classes. The implementation is very similar to the one in 
+WebOpenPanelParameters::acceptMIMETypes().
+
+This also updates the GTK port, which is the other user of selectedFileNames.
+
+* Shared/WebOpenPanelParameters.cpp:
+(WebKit::WebOpenPanelParameters::selectedFileNames):
+(WebKit):
+* Shared/WebOpenPanelParameters.h:
+(WebOpenPanelParameters):
+* UIProcess/API/C/WKOpenPanelParameters.cpp:
+(WKOpenPanelParametersCopySelectedFileNames):
+* UIProcess/API/C/WKOpenPanelParameters.h:
+* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+(webkit_file_chooser_request_get_selected_files):
+* UIProcess/qt/QtWebPageUIClient.cpp:
+(WebKit::QtWebPageUIClient::runOpenPanel):
+
 2013-04-09  Jinwoo Song  
 
 [WK2] Remove build warnings for unused parameters


Modified: trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp (148004 => 148005)

--- trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp	2013-04-09 11:01:32 UTC (rev 148004)
+++ trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp	2013-04-09 11:13:44 UTC (rev 148005)
@@ -68,5 +68,17 @@
 }
 #endif
 
+PassRefPtr WebOpenPanelParameters::selectedFileNames() const
+{
+size_t size = m_settings.selectedFiles.size();
 
+Vector > vector;
+vector.reserveInitialCapacity(size);
+
+for (size_t i = 0; i < size; ++i)
+vector.uncheckedAppend(WebString::create(m_settings.selectedFiles[i]));
+return ImmutableArray::adopt(vector);
+}
+
+
 } // namespace WebCore


Modified: trunk/Source/WebKit2/Shared/WebOpenPanelParameters.h (148004 => 148005)

--- trunk/Source/WebKit2/Shared/WebOpenPanelParameters.h	2013-04-09 11:01:32 UTC (rev 148004)
+++ trunk/Source/WebKit2/Shared/WebOpenPanelParameters.h	2013-04-09 11:13:44 UTC (rev 148005)
@@ -43,7 +43,7 @@
 
 bool allowMultipleFiles() const { return m_settings.allowsMultipleFiles; } 
 PassRefPtr acceptMIMETypes() const;
-Vector selectedFileNames() const { return m_settings.selectedFiles; }
+PassRefPtr selectedFileNames() const;
 #if ENABLE(MEDIA_CAPTURE)
 String capture() const;
 #endif


Modified: trunk/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp (148004 => 148005)

--- trunk/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp	2013-04-09 11:01:32 UTC (rev 148004)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp	2013-04-09 11:13:44 UTC (rev 148005)
@@ -56,3 +56,8 @@
 return 0;
 #endif
 }
+
+WKArrayRef WKOpenPanelParametersCopySelectedFileNames(WKOpenPanelParametersRef parametersRef)
+{
+return toAPI(toImpl(parametersRef)->selectedFileNames().leakRef());
+}


Modified: trunk/Source/WebKit2/UIP

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

[michael . bruning]

Title: [144165] trunk/Source/WebKit2








Revision 144165
Author michael.brun...@digia.com
Date 2013-02-27 03:40:36 -0800 (Wed, 27 Feb 2013)


Log Message
[Qt][WK2] Replace use of WebPreferences with use of WKPrefences C API
https://bugs.webkit.org/show_bug.cgi?id=108952

Reviewed by Simon Hausmann.

Signed off for WebKit2 by Benjamin Poulain.

This patch moves the view classes and preferences in the Qt API
to use the C API for accessing and manipulating preferences as
part of the cleanup and move towards using the C API as base for
the Qt WebKit2 API.

Adds the function WebKit::adoptToQString for convenience when
dealing with QString and copied String objects.

Removes the ScrollAnimatorEnabled options from QWebPreferences.

* UIProcess/API/cpp/qt/WKStringQt.cpp:
(WebKit::adoptToQString):
* UIProcess/API/cpp/qt/WKStringQt.h:
(WebKit):
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):
* UIProcess/API/qt/qwebpreferences.cpp:
(QWebPreferencesPrivate::testAttribute):
(QWebPreferencesPrivate::setAttribute):
(QWebPreferencesPrivate::setFontFamily):
(QWebPreferencesPrivate::fontFamily):
(QWebPreferencesPrivate::setFontSize):
(QWebPreferencesPrivate::fontSize):
* UIProcess/API/qt/qwebpreferences_p.h:
* UIProcess/API/qt/qwebpreferences_p_p.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
trunk/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (144164 => 144165)

--- trunk/Source/WebKit2/ChangeLog	2013-02-27 11:07:19 UTC (rev 144164)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-27 11:40:36 UTC (rev 144165)
@@ -1,3 +1,38 @@
+2013-02-27  Michael Brüning  
+
+[Qt][WK2] Replace use of WebPreferences with use of WKPrefences C API
+https://bugs.webkit.org/show_bug.cgi?id=108952
+
+Reviewed by Simon Hausmann.
+
+Signed off for WebKit2 by Benjamin Poulain.
+
+This patch moves the view classes and preferences in the Qt API
+to use the C API for accessing and manipulating preferences as
+part of the cleanup and move towards using the C API as base for
+the Qt WebKit2 API.
+
+Adds the function WebKit::adoptToQString for convenience when
+dealing with QString and copied String objects.
+
+Removes the ScrollAnimatorEnabled options from QWebPreferences.
+
+* UIProcess/API/cpp/qt/WKStringQt.cpp:
+(WebKit::adoptToQString):
+* UIProcess/API/cpp/qt/WKStringQt.h:
+(WebKit):
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::initialize):
+* UIProcess/API/qt/qwebpreferences.cpp:
+(QWebPreferencesPrivate::testAttribute):
+(QWebPreferencesPrivate::setAttribute):
+(QWebPreferencesPrivate::setFontFamily):
+(QWebPreferencesPrivate::fontFamily):
+(QWebPreferencesPrivate::setFontSize):
+(QWebPreferencesPrivate::fontSize):
+* UIProcess/API/qt/qwebpreferences_p.h:
+* UIProcess/API/qt/qwebpreferences_p_p.h:
+
 2013-02-26  Anders Carlsson  
 
 Implement StorageAreaProxy::getItem and StorageAreaProxy::setItem


Modified: trunk/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp (144164 => 144165)

--- trunk/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp	2013-02-27 11:07:19 UTC (rev 144164)
+++ trunk/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp	2013-02-27 11:40:36 UTC (rev 144165)
@@ -22,6 +22,7 @@
 #include "WKStringQt.h"
 
 #include "WKAPICast.h"
+#include "WKRetainPtr.h"
 #include 
 #include 
 #include 
@@ -41,3 +42,10 @@
 const WTF::String& string = toImpl(stringRef)->string();
 return QString(reinterpret_cast(string.characters()), string.length());
 }
+
+namespace WebKit {
+QString adoptToQString(WKStringRef stringRef)
+{
+return WKStringCopyQString(adoptWK(stringRef).get());
+}
+} /* namespace WebKit */


Modified: trunk/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h (144164 => 144165)

--- trunk/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h	2013-02-27 11:07:19 UTC (rev 144164)
+++ trunk/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h	2013-02-27 11:40:36 UTC (rev 144165)
@@ -27,4 +27,9 @@
 WK_EXPORT WKStringRef WKStringCreateWithQString(const QString& string);
 WK_EXPORT QString WKStringCopyQString(WKStringRef string);
 
+namespace WebKit {
+QString adoptToQString(WKStringRef);
+} /* namespace WebKit */
+
+using WebKit::adoptToQString;
 #endif /* WKStringQt_h */


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

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2013-02-27 11:07:19 UTC (rev 144164)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2013-02-27 11:40:36 UTC (rev 14

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

[michael . bruning]

Title: [142095] trunk/Source/WebKit2








Revision 142095
Author michael.brun...@digia.com
Date 2013-02-07 04:34:08 -0800 (Thu, 07 Feb 2013)


Log Message
[Qt][WK2] Fold QtWebPageLoadClient into QQuickWebViewPrivate and move to C API.
https://bugs.webkit.org/show_bug.cgi?id=108473

Reviewed by Simon Hausmann.
Signed off for WebKit2 by Benjamin Poulain.

This patch removes the QtWebPageLoadClient and moves the functionality into the
QQuickWebViewPrivate as most callback methods are calling the private webview
indirectly anyway.

The patch also moves as much of the functionality to the C API as is possible with
the current C API.

* Target.pri:
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):
(QQuickWebViewPrivate::didStartProvisionalLoadForFrame):
(QQuickWebViewPrivate::didReceiveServerRedirectForProvisionalLoadForFrame):
(QQuickWebViewPrivate::didFailLoad):
(QQuickWebViewPrivate::didCommitLoadForFrame):
(QQuickWebViewPrivate::didFinishLoadForFrame):
(QQuickWebViewPrivate::didSameDocumentNavigationForFrame):
(QQuickWebViewPrivate::didReceiveTitleForFrame):
(QQuickWebViewPrivate::didStartProgress):
(QQuickWebViewPrivate::didChangeProgress):
(QQuickWebViewPrivate::didFinishProgress):
(QQuickWebViewPrivate::didChangeBackForwardList):
(QQuickWebViewPrivate::setTransparentBackground):
(QQuickWebViewPrivate::transparentBackground):
(QQuickWebViewPrivate::loadProgressDidChange):
* UIProcess/API/qt/qquickwebview_p.h:
(WebKit):
* UIProcess/API/qt/qquickwebview_p_p.h:
(WebKit):
(QQuickWebViewPrivate):
* UIProcess/qt/QtWebError.cpp:
(WebKit::QtWebError::url):
* UIProcess/qt/QtWebPageLoadClient.cpp: Removed.
* UIProcess/qt/QtWebPageLoadClient.h: Removed.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Target.pri
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
trunk/Source/WebKit2/UIProcess/qt/QtWebError.cpp


Removed Paths

trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (142094 => 142095)

--- trunk/Source/WebKit2/ChangeLog	2013-02-07 12:21:43 UTC (rev 142094)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-07 12:34:08 UTC (rev 142095)
@@ -1,3 +1,45 @@
+2013-02-07  Michael Brüning  
+
+[Qt][WK2] Fold QtWebPageLoadClient into QQuickWebViewPrivate and move to C API.
+https://bugs.webkit.org/show_bug.cgi?id=108473
+
+Reviewed by Simon Hausmann.
+Signed off for WebKit2 by Benjamin Poulain.
+
+This patch removes the QtWebPageLoadClient and moves the functionality into the
+QQuickWebViewPrivate as most callback methods are calling the private webview
+indirectly anyway.
+
+The patch also moves as much of the functionality to the C API as is possible with
+the current C API.
+
+* Target.pri:
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::initialize):
+(QQuickWebViewPrivate::didStartProvisionalLoadForFrame):
+(QQuickWebViewPrivate::didReceiveServerRedirectForProvisionalLoadForFrame):
+(QQuickWebViewPrivate::didFailLoad):
+(QQuickWebViewPrivate::didCommitLoadForFrame):
+(QQuickWebViewPrivate::didFinishLoadForFrame):
+(QQuickWebViewPrivate::didSameDocumentNavigationForFrame):
+(QQuickWebViewPrivate::didReceiveTitleForFrame):
+(QQuickWebViewPrivate::didStartProgress):
+(QQuickWebViewPrivate::didChangeProgress):
+(QQuickWebViewPrivate::didFinishProgress):
+(QQuickWebViewPrivate::didChangeBackForwardList):
+(QQuickWebViewPrivate::setTransparentBackground):
+(QQuickWebViewPrivate::transparentBackground):
+(QQuickWebViewPrivate::loadProgressDidChange):
+* UIProcess/API/qt/qquickwebview_p.h:
+(WebKit):
+* UIProcess/API/qt/qquickwebview_p_p.h:
+(WebKit):
+(QQuickWebViewPrivate):
+* UIProcess/qt/QtWebError.cpp:
+(WebKit::QtWebError::url):
+* UIProcess/qt/QtWebPageLoadClient.cpp: Removed.
+* UIProcess/qt/QtWebPageLoadClient.h: Removed.
+
 2013-02-05  Eunmi Lee   and Raphael Kubo da Costa  
 
 [EFL][WK2] Refactoring initialization and shutdown codes of EFL libraries.


Modified: trunk/Source/WebKit2/Target.pri (142094 => 142095)

--- trunk/Source/WebKit2/Target.pri	2013-02-07 12:21:43 UTC (rev 142094)
+++ trunk/Source/WebKit2/Target.pri	2013-02-07 12:34:08 UTC (rev 142095)
@@ -785,7 +785,6 @@
 UIProcess/qt/QtDialogRunner.h \
 UIProcess/qt/QtDownloadManager.h \
 UIProcess/qt/QtPageClient.h \
-UIProcess/qt/QtWebPageLoadClient.h \
 UIProcess/qt/QtWebPagePolicyClient.h \
 UIProcess/qt/QtWebPageSGNode.h \
 UIProcess/qt/QtWebPageUIClient.h \
@@ -812,7 +811,6 @@
 UIProcess/qt/QtDialogRunner.cpp \
 

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

[michael . bruning]

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








Revision 141107
Author michael.brun...@digia.com
Date 2013-01-29 06:48:41 -0800 (Tue, 29 Jan 2013)


Log Message
[Qt][WK1] Fix QObject Bridge tests expected output.
https://bugs.webkit.org/show_bug.cgi?id=107827

Reviewed by Simon Hausmann.

The "not a function" TypeError now includes the call that caused the error.
Correct expected values accordingly.

* tests/qobjectbridge/tst_qobjectbridge.cpp:
(tst_QObjectBridge::connectAndDisconnect):

Modified Paths

trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (141106 => 141107)

--- trunk/Source/WebKit/qt/ChangeLog	2013-01-29 14:37:49 UTC (rev 141106)
+++ trunk/Source/WebKit/qt/ChangeLog	2013-01-29 14:48:41 UTC (rev 141107)
@@ -1,3 +1,16 @@
+2013-01-29  Michael Brüning  
+
+[Qt][WK1] Fix QObject Bridge tests expected output.
+https://bugs.webkit.org/show_bug.cgi?id=107827
+
+Reviewed by Simon Hausmann.
+
+The "not a function" TypeError now includes the call that caused the error.
+Correct expected values accordingly.
+
+* tests/qobjectbridge/tst_qobjectbridge.cpp:
+(tst_QObjectBridge::connectAndDisconnect):
+
 2013-01-28  Huang Dongsung  
 
 [TexMap] Enable debug borders and repaint counter via Settings.


Modified: trunk/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp (141106 => 141107)

--- trunk/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp	2013-01-29 14:37:49 UTC (rev 141106)
+++ trunk/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp	2013-01-29 14:48:41 UTC (rev 141107)
@@ -1572,26 +1572,26 @@
 QString type;
 QString ret = evalJS("(function() { }).connect()", type);
 QCOMPARE(type, sError);
-QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function"));
+QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating '(function() { }).connect()')"));
 }
 {
 QString type;
 QString ret = evalJS("var o = { }; o.connect = Function.prototype.connect;  o.connect()", type);
 QCOMPARE(type, sError);
-QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function"));
+QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating 'o.connect()')"));
 }
 
 {
 QString type;
 QString ret = evalJS("(function() { }).connect(123)", type);
 QCOMPARE(type, sError);
-QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function"));
+QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating '(function() { }).connect(123)')"));
 }
 {
 QString type;
 QString ret = evalJS("var o = { }; o.connect = Function.prototype.connect;  o.connect(123)", type);
 QCOMPARE(type, sError);
-QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function"));
+QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating 'o.connect(123)')"));
 }
 
 {






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

[webkit-changes] [141095] trunk/Tools

[michael . bruning]

Title: [141095] trunk/Tools








Revision 141095
Author michael.brun...@digia.com
Date 2013-01-29 03:58:30 -0800 (Tue, 29 Jan 2013)


Log Message
Unreviewed, updated my email information.

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

Modified Paths

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




Diff

Modified: trunk/Tools/ChangeLog (141094 => 141095)

--- trunk/Tools/ChangeLog	2013-01-29 11:55:43 UTC (rev 141094)
+++ trunk/Tools/ChangeLog	2013-01-29 11:58:30 UTC (rev 141095)
@@ -1,3 +1,9 @@
+2013-01-29  Michael Brüning  
+
+Unreviewed, updated my email information.
+
+* Scripts/webkitpy/common/config/committers.py:
+
 2013-01-29  Jochen Eisinger  
 
 [chromium] delete DRTTestRunner


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

--- trunk/Tools/Scripts/webkitpy/common/config/committers.py	2013-01-29 11:55:43 UTC (rev 141094)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers.py	2013-01-29 11:58:30 UTC (rev 141095)
@@ -368,7 +368,7 @@
 Committer("Max Vujovic", ["mvujo...@adobe.com", "maxvujo...@gmail.com"], "mvujovic"),
 Committer("Maxime Britto", ["maxime.bri...@gmail.com", "bri...@apple.com"]),
 Committer("Maxime Simon", ["simon.max...@gmail.com", "maxime.si...@webkit.org"], "maxime.simon"),
-Committer(u"Michael Br\u00fcning", ["michaelbruen...@gmail.com", "michael.brun...@digia.com", "michael.brun...@nokia.com"], "mibrunin"),
+Committer(u"Michael Br\u00fcning", ["michael.brun...@digia.com", "michaelbruen...@gmail.com"], "mibrunin"),
 Committer("Michael Nordman", "micha...@google.com", "michaeln"),
 Committer("Michelangelo De Simone", "michelang...@webkit.org", "michelangelo"),
 Committer("Mihnea Ovidenie", "mih...@adobe.com", "mihnea"),






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

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

[michael . bruning]

Title: [141085] trunk/Source/WebCore








Revision 141085
Author michael.brun...@digia.com
Date 2013-01-29 01:41:31 -0800 (Tue, 29 Jan 2013)


Log Message
[Qt][WK1] Reflect recursion limit and loop checks also for list conversions.
https://bugs.webkit.org/show_bug.cgi?id=107950

Reviewed by Allan Sandfeld Jensen.

No new tests, bugfix, no behavioral change.

Make conversions from _javascript_ values to QLists take the maximum
recursion depth into consideration and check for objects that were
already visited. Otherwise, the conversion may recurse until the
stack is full and then cause a segmentation fault.

* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::convertToList):
(JSC::Bindings::convertValueToQVariant):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bridge/qt/qt_runtime.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (141084 => 141085)

--- trunk/Source/WebCore/ChangeLog	2013-01-29 09:37:14 UTC (rev 141084)
+++ trunk/Source/WebCore/ChangeLog	2013-01-29 09:41:31 UTC (rev 141085)
@@ -1,3 +1,21 @@
+2013-01-29  Michael Brüning  
+
+[Qt][WK1] Reflect recursion limit and loop checks also for list conversions.
+https://bugs.webkit.org/show_bug.cgi?id=107950
+
+Reviewed by Allan Sandfeld Jensen.
+
+No new tests, bugfix, no behavioral change.
+
+Make conversions from _javascript_ values to QLists take the maximum
+recursion depth into consideration and check for objects that were
+already visited. Otherwise, the conversion may recurse until the
+stack is full and then cause a segmentation fault.
+
+* bridge/qt/qt_runtime.cpp:
+(JSC::Bindings::convertToList):
+(JSC::Bindings::convertValueToQVariant):
+
 2013-01-29  Elliott Sprehn  
 
 Clean up interface to ElementShadow


Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.cpp (141084 => 141085)

--- trunk/Source/WebCore/bridge/qt/qt_runtime.cpp	2013-01-29 09:37:14 UTC (rev 141084)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.cpp	2013-01-29 09:41:31 UTC (rev 141085)
@@ -236,7 +236,7 @@
 
 template 
 QList convertToList(JSContextRef context, JSRealType type, JSObjectRef object,
-  JSValueRef value, int* distance, JSValueRef* exception,
+  JSValueRef value, int* distance, HashSet* visitedObjects, int recursionLimit, JSValueRef* exception,
   const QMetaType::Type typeId = static_cast(qMetaTypeId()))
 {
 QList list;
@@ -248,7 +248,7 @@
 for (size_t i = 0; i < length; ++i) {
 JSValueRef value = JSObjectGetPropertyAtIndex(context, object, i, exception);
 int itemDistance = -1;
-QVariant variant = convertValueToQVariant(context, value, typeId, &itemDistance, exception);
+QVariant variant = convertValueToQVariant(context, value, typeId, &itemDistance, visitedObjects, recursionLimit, exception);
 if (itemDistance >= 0)
 list << variant.value();
 else
@@ -260,7 +260,7 @@
 *distance = 5;
 } else {
 int itemDistance = -1;
-QVariant variant = convertValueToQVariant(context, value, typeId, &itemDistance, exception);
+QVariant variant = convertValueToQVariant(context, value, typeId, &itemDistance, visitedObjects, recursionLimit, exception);
 if (itemDistance >= 0) {
 list << variant.value();
 if (distance)
@@ -481,11 +481,11 @@
 break;
 
 case QMetaType::QVariantList:
-ret = QVariant(convertToList(context, type, object, value, &dist, exception, QMetaType::Void));
+ret = QVariant(convertToList(context, type, object, value, &dist, visitedObjects, recursionLimit, exception, QMetaType::Void));
 break;
 
 case QMetaType::QStringList: {
-ret = QVariant(convertToList(context, type, object, value, &dist, exception));
+ret = QVariant(convertToList(context, type, object, value, &dist, visitedObjects, recursionLimit, exception));
 break;
 }
 
@@ -616,11 +616,11 @@
 default:
 // Non const type ids
 if (hint == (QMetaType::Type) qMetaTypeId()) {
-ret = QVariant::fromValue(convertToList(context, type, object, value, &dist, exception));
+ret = QVariant::fromValue(convertToList(context, type, object, value, &dist, visitedObjects, recursionLimit, exception));
 break;
 }
 if (hint == (QMetaType::Type) qMetaTypeId >()) {
-ret = QVariant::fromValue(convertToList(context, type, object, value, &dist, exception));
+ret = QVariant::fromValue(convertToList(context, type, object, value, &dist, visitedObjects, recursionLimit, exception));
 break;
 }
 if (QtPixmapRuntime::canHandle(static_cast(hint))) {

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

[michael . bruning]

Title: [140676] trunk/Source/WebKit2








Revision 140676
Author michael.brun...@digia.com
Date 2013-01-24 04:25:19 -0800 (Thu, 24 Jan 2013)


Log Message
[Qt][WK2] Pages / resources cannot be loaded from qrc files.
https://bugs.webkit.org/show_bug.cgi?id=107031

Reviewed by Jocelyn Turcotte.

Enables WebKit2 Qt applications to load files from the bundled
qrc files. This is achieved by adding a url scheme handler for
the "qrc" scheme using the application scheme handler and ignoring
all handlers for the qrc application scheme that the application might
set.

* UIProcess/API/qt/qquickurlschemedelegate.cpp:
(QQuickQrcSchemeDelegate::QQuickQrcSchemeDelegate):
(QQuickQrcSchemeDelegate::readResourceAndSend):
* UIProcess/API/qt/qquickurlschemedelegate_p.h:
(QQuickQrcSchemeDelegate):
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::initialize):
(QQuickWebViewExperimental::schemeDelegates_Append):
(QQuickWebViewExperimental::invokeApplicationSchemeHandler):
* UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml:
* UIProcess/API/qt/tests/qmltests/common/qrctest.html: Added.
* UIProcess/API/qt/tests/qmltests/resources.qrc:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate.cpp
trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/resources.qrc


Added Paths

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




Diff

Modified: trunk/Source/WebKit2/ChangeLog (140675 => 140676)

--- trunk/Source/WebKit2/ChangeLog	2013-01-24 12:19:50 UTC (rev 140675)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-24 12:25:19 UTC (rev 140676)
@@ -1,3 +1,29 @@
+2013-01-24  Michael Brüning  
+
+[Qt][WK2] Pages / resources cannot be loaded from qrc files.
+https://bugs.webkit.org/show_bug.cgi?id=107031
+
+Reviewed by Jocelyn Turcotte.
+
+Enables WebKit2 Qt applications to load files from the bundled
+qrc files. This is achieved by adding a url scheme handler for
+the "qrc" scheme using the application scheme handler and ignoring
+all handlers for the qrc application scheme that the application might
+set.
+
+* UIProcess/API/qt/qquickurlschemedelegate.cpp:
+(QQuickQrcSchemeDelegate::QQuickQrcSchemeDelegate):
+(QQuickQrcSchemeDelegate::readResourceAndSend):
+* UIProcess/API/qt/qquickurlschemedelegate_p.h:
+(QQuickQrcSchemeDelegate):
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebViewPrivate::initialize):
+(QQuickWebViewExperimental::schemeDelegates_Append):
+(QQuickWebViewExperimental::invokeApplicationSchemeHandler):
+* UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml:
+* UIProcess/API/qt/tests/qmltests/common/qrctest.html: Added.
+* UIProcess/API/qt/tests/qmltests/resources.qrc:
+
 2013-01-24  Krzysztof Czech  
 
 [EFL][WK2] Expose accessibility hierarchy in WebKit2-EFL.


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate.cpp (140675 => 140676)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate.cpp	2013-01-24 12:19:50 UTC (rev 140675)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate.cpp	2013-01-24 12:25:19 UTC (rev 140676)
@@ -24,6 +24,11 @@
 #include "qquicknetworkreply_p.h"
 #include "qquicknetworkrequest_p.h"
 
+#include 
+#include 
+#include 
+#include 
+
 QQuickUrlSchemeDelegate::QQuickUrlSchemeDelegate(QObject* parent)
 : QObject(parent)
 , m_request(new QQuickNetworkRequest(this))
@@ -51,4 +56,27 @@
 return m_reply;
 }
 
+QQuickQrcSchemeDelegate::QQuickQrcSchemeDelegate(const QUrl& url)
+: QQuickUrlSchemeDelegate()
+, m_fileName(QLatin1Char(':') + url.path())
+{
+}
+
+void QQuickQrcSchemeDelegate::readResourceAndSend()
+{
+QFile file(m_fileName);
+QFileInfo fileInfo(file);
+if (fileInfo.isDir() || !file.open(QIODevice::ReadOnly | QIODevice::Unbuffered))
+return;
+
+QByteArray fileData(file.readAll());
+QMimeDatabase mimeDb;
+QMimeType mimeType = mimeDb.mimeTypeForFileNameAndData(m_fileName, fileData);
+file.close();
+
+reply()->setData(fileData);
+reply()->setContentType(mimeType.name());
+reply()->send();
+}
+
 #include "moc_qquickurlschemedelegate_p.cpp"


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h (140675 => 140676)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h	2013-01-24 12:19:50 UTC (rev 140675)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h	2013-01-24 12:25:19 UTC (rev 140676)
@@ -27,6 +27,7 @@
 
 class QQuickNetworkRequest;
 class QQuickNetworkReply;
+class QUrl;
 
 class QWEBKIT_EXPORT QQuickUrlSchemeDelegate : public QObject {

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

[michael . bruning]

Title: [140675] trunk/Source/WebCore








Revision 140675
Author michael.brun...@digia.com
Date 2013-01-24 04:19:50 -0800 (Thu, 24 Jan 2013)


Log Message
[Qt] Webkit debug build links against release binaries of ANGLE libEGL, libGLESv2
https://bugs.webkit.org/show_bug.cgi?id=106217

Patch by Kai Koehne  on 2013-01-24
Reviewed by Jocelyn Turcotte.

Use libEGLd, libEGLSv2d if qtbase was compiled with ANGLE.

* WebCore.pri: Mirror logic of qtbase\mkspecs\features\win32\opengl.prf

Modified Paths

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




Diff

Modified: trunk/Source/WebCore/ChangeLog (140674 => 140675)

--- trunk/Source/WebCore/ChangeLog	2013-01-24 12:19:37 UTC (rev 140674)
+++ trunk/Source/WebCore/ChangeLog	2013-01-24 12:19:50 UTC (rev 140675)
@@ -1,3 +1,14 @@
+2013-01-24  Kai Koehne  
+
+[Qt] Webkit debug build links against release binaries of ANGLE libEGL, libGLESv2
+https://bugs.webkit.org/show_bug.cgi?id=106217
+
+Reviewed by Jocelyn Turcotte.
+
+Use libEGLd, libEGLSv2d if qtbase was compiled with ANGLE.
+
+* WebCore.pri: Mirror logic of qtbase\mkspecs\features\win32\opengl.prf
+
 2013-01-24  Sergio Villar Senin  
 
 [GTK] Unreviewed build fix.


Modified: trunk/Source/WebCore/WebCore.pri (140674 => 140675)

--- trunk/Source/WebCore/WebCore.pri	2013-01-24 12:19:37 UTC (rev 140674)
+++ trunk/Source/WebCore/WebCore.pri	2013-01-24 12:19:50 UTC (rev 140675)
@@ -219,7 +219,11 @@
 win32-g++: {
 # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
 contains(QT_CONFIG, opengles2) {
-LIBS += $$QMAKE_LIBS_OPENGL_ES2
+CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
+LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
+} else {
+LIBS += $$QMAKE_LIBS_OPENGL_ES2
+}
 } else {
 LIBS += $$QMAKE_LIBS_OPENGL
 }






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

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

[michael . bruning]

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








Revision 138946
Author michael.brun...@digia.com
Date 2013-01-07 07:51:38 -0800 (Mon, 07 Jan 2013)


Log Message
[Qt] Apply correct patch for the scrolling issue from bug 105014
https://bugs.webkit.org/show_bug.cgi?id=106219

Correct the if condition when overwriting the layout direction option
with the values from the facade options to only overwrite if the facade
direction is not equal to LayoutDirectionAuto.

Reviewed by Allan Sandfeld Jensen.

* WidgetSupport/QStyleFacadeImp.cpp:
(WebKit::initGenericStyleOption):

Modified Paths

trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (138945 => 138946)

--- trunk/Source/WebKit/qt/ChangeLog	2013-01-07 15:45:50 UTC (rev 138945)
+++ trunk/Source/WebKit/qt/ChangeLog	2013-01-07 15:51:38 UTC (rev 138946)
@@ -1,5 +1,19 @@
 2013-01-07  Michael Brüning  
 
+[Qt] Apply correct patch for the scrolling issue from bug 105014
+https://bugs.webkit.org/show_bug.cgi?id=106219
+
+Correct the if condition when overwriting the layout direction option
+with the values from the facade options to only overwrite if the facade
+direction is not equal to LayoutDirectionAuto.
+
+Reviewed by Allan Sandfeld Jensen.
+
+* WidgetSupport/QStyleFacadeImp.cpp:
+(WebKit::initGenericStyleOption):
+
+2013-01-07  Michael Brüning  
+
 [Qt] Horizontal scrollbars events are offseted making them difficult to use
 https://bugs.webkit.org/show_bug.cgi?id=105014
 


Modified: trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp (138945 => 138946)

--- trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp	2013-01-07 15:45:50 UTC (rev 138945)
+++ trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp	2013-01-07 15:51:38 UTC (rev 138946)
@@ -77,7 +77,7 @@
 
 option->rect = facadeOption.rect;
 option->state = convertToQStyleState(facadeOption.state);
-if (option->direction == Qt::LayoutDirectionAuto)
+if (facadeOption.direction != Qt::LayoutDirectionAuto)
 option->direction = facadeOption.direction;
 option->palette = facadeOption.palette;
 }






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

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

[michael . bruning]

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








Revision 138933
Author michael.brun...@digia.com
Date 2013-01-07 02:09:16 -0800 (Mon, 07 Jan 2013)


Log Message
[Qt] Horizontal scrollbars events are offseted making them difficult to use
https://bugs.webkit.org/show_bug.cgi?id=105014

Reviewed by Allan Sandfeld Jensen.

Patch co-authored by Simon Hausmann.

Only copy the layout direction from the facade options if the
current option is Qt::LayoutDirectionAuto in order to prevent
misinterpretations as different layout direction when hit testing.

Tests added to tst_qwebview and tst_qgraphicswebview to verify
that the view actually is scrolled in the right direction.

* WidgetSupport/QStyleFacadeImp.cpp:
(WebKit::initGenericStyleOption):
* tests/qgraphicswebview/resources/scrolltest_page.html: Added.
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView):
(tst_QGraphicsWebView::horizontalScrollbarTest):
* tests/qgraphicswebview/tst_qgraphicswebview.qrc:
* tests/qwebview/resources/scrolltest_page.html: Added.
* tests/qwebview/tst_qwebview.cpp:
(tst_QWebView):
(tst_QWebView::horizontalScrollbarTest):
* tests/qwebview/tst_qwebview.qrc:

Modified Paths

trunk/Source/WebKit/qt/ChangeLog
trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp
trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.qrc
trunk/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp
trunk/Source/WebKit/qt/tests/qwebview/tst_qwebview.qrc


Added Paths

trunk/Source/WebKit/qt/tests/qgraphicswebview/resources/scrolltest_page.html
trunk/Source/WebKit/qt/tests/qwebview/resources/scrolltest_page.html




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (138932 => 138933)

--- trunk/Source/WebKit/qt/ChangeLog	2013-01-07 10:01:29 UTC (rev 138932)
+++ trunk/Source/WebKit/qt/ChangeLog	2013-01-07 10:09:16 UTC (rev 138933)
@@ -1,3 +1,32 @@
+2013-01-07  Michael Brüning  
+
+[Qt] Horizontal scrollbars events are offseted making them difficult to use
+https://bugs.webkit.org/show_bug.cgi?id=105014
+
+Reviewed by Allan Sandfeld Jensen.
+
+Patch co-authored by Simon Hausmann.
+
+Only copy the layout direction from the facade options if the
+current option is Qt::LayoutDirectionAuto in order to prevent
+misinterpretations as different layout direction when hit testing.
+
+Tests added to tst_qwebview and tst_qgraphicswebview to verify
+that the view actually is scrolled in the right direction.
+
+* WidgetSupport/QStyleFacadeImp.cpp:
+(WebKit::initGenericStyleOption):
+* tests/qgraphicswebview/resources/scrolltest_page.html: Added.
+* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+(tst_QGraphicsWebView):
+(tst_QGraphicsWebView::horizontalScrollbarTest):
+* tests/qgraphicswebview/tst_qgraphicswebview.qrc:
+* tests/qwebview/resources/scrolltest_page.html: Added.
+* tests/qwebview/tst_qwebview.cpp:
+(tst_QWebView):
+(tst_QWebView::horizontalScrollbarTest):
+* tests/qwebview/tst_qwebview.qrc:
+
 2012-12-23  Alexey Proskuryakov  
 
  Network process should respect cookie accept policy


Modified: trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp (138932 => 138933)

--- trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp	2013-01-07 10:01:29 UTC (rev 138932)
+++ trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp	2013-01-07 10:09:16 UTC (rev 138933)
@@ -77,7 +77,8 @@
 
 option->rect = facadeOption.rect;
 option->state = convertToQStyleState(facadeOption.state);
-option->direction = facadeOption.direction;
+if (option->direction == Qt::LayoutDirectionAuto)
+option->direction = facadeOption.direction;
 option->palette = facadeOption.palette;
 }
 


Added: trunk/Source/WebKit/qt/tests/qgraphicswebview/resources/scrolltest_page.html (0 => 138933)

--- trunk/Source/WebKit/qt/tests/qgraphicswebview/resources/scrolltest_page.html	(rev 0)
+++ trunk/Source/WebKit/qt/tests/qgraphicswebview/resources/scrolltest_page.html	2013-01-07 10:09:16 UTC (rev 138933)
@@ -0,0 +1,6 @@
+
+Scrolling test
+
+  
+
+


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

--- trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp	2013-01-07 10:01:29 UTC (rev 138932)
+++ trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp	2013-01-07 10:09:16 UTC (rev 138933)
@@ -42,6 +42,7 @@
 void crashOnSetScaleBeforeSetUrl();
 void widgetsRenderingThroughCache();
 void windowResizeEvent();
+void horizontalScrollbarTest();
 
 #if !(defined(WTF_USE_QT_MOBILE_THEME) && WTF_USE_QT_MOBILE_THEME)
 void setPalette_data();
@@ -680,6 +681,44 @@
 QCOMPARE(resizeSpy.size(), QSize(60, 60));
 }
 
+void tst_QGraphicsWebView::horizontalScrollbarTest()
+{
+QWebPage* page = new

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

[michael . bruning]

Title: [137139] trunk/Source/WebCore








Revision 137139
Author michael.brun...@digia.com
Date 2012-12-10 05:14:10 -0800 (Mon, 10 Dec 2012)


Log Message
[Qt] Builds for Mac are tied to the OS system instead of the SDK version.
https://bugs.webkit.org/show_bug.cgi?id=104529

Reviewed by Simon Hausmann.

Using work by Eike Ziller .

The build system now first tries to assign the correct system libraries
for the SDK being used for Mac builds. If this does not yield any
result, it falls back to using the Mac OS version to determine the
correct library.

No new tests (not applicable).

* WebCore.pri:

Modified Paths

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




Diff

Modified: trunk/Source/WebCore/ChangeLog (137138 => 137139)

--- trunk/Source/WebCore/ChangeLog	2012-12-10 12:58:53 UTC (rev 137138)
+++ trunk/Source/WebCore/ChangeLog	2012-12-10 13:14:10 UTC (rev 137139)
@@ -1,3 +1,21 @@
+2012-12-10  Michael Brüning  
+
+[Qt] Builds for Mac are tied to the OS system instead of the SDK version.
+https://bugs.webkit.org/show_bug.cgi?id=104529
+
+Reviewed by Simon Hausmann.
+
+Using work by Eike Ziller .
+
+The build system now first tries to assign the correct system libraries
+for the SDK being used for Mac builds. If this does not yield any
+result, it falls back to using the Mac OS version to determine the
+correct library.
+
+No new tests (not applicable).
+
+* WebCore.pri:
+
 2012-12-10  Ilya Tikhonovsky  
 
 Unreviewed: touch RenderingAllInOne.cpp to fix Apple Windows builder.


Modified: trunk/Source/WebCore/WebCore.pri (137138 => 137139)

--- trunk/Source/WebCore/WebCore.pri	2012-12-10 12:58:53 UTC (rev 137138)
+++ trunk/Source/WebCore/WebCore.pri	2012-12-10 13:14:10 UTC (rev 137139)
@@ -177,18 +177,25 @@
 -framework QuartzCore -framework QTKit \
 -framework Security -framework IOKit
 
-# We can know the Mac OS version by using the Darwin major version
 DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
 DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
-equals(DARWIN_MAJOR_VERSION, "12") {
-LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
-} else:equals(DARWIN_MAJOR_VERSION, "11") {
-LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
-} else:equals(DARWIN_MAJOR_VERSION, "10") {
-LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
-} else:equals(DARWIN_MAJOR_VERSION, "9") {
-LIBS += $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
+
+# We first check if a specific SDK is set to be used for the build.
+contains(QMAKE_MAC_SDK, ".*MacOSX10.7.sdk.*") {
+SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
+} else:contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk.*") {
+SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
 }
+
+# If the previous check did not yield a result, we resort to the Darwin version.
+isEmpty(SYSTEM_LIBRARY_PATH) {
+equals(DARWIN_MAJOR_VERSION, "11") {
+SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceLion.a
+} else:equals(DARWIN_MAJOR_VERSION, "12") {
+SYSTEM_LIBRARY_PATH = $${ROOT_WEBKIT_DIR}/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
+}
+}
+LIBS += $$SYSTEM_LIBRARY_PATH
 } else:use?(GSTREAMER) {
 INCLUDEPATH += $$SOURCE_DIR/platform/graphics/gstreamer
 } else:use?(QT_MULTIMEDIA) {






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

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

[michael . bruning]

Title: [136391] trunk/Source/WebKit2








Revision 136391
Author michael.brun...@digia.com
Date 2012-12-03 06:26:18 -0800 (Mon, 03 Dec 2012)


Log Message
[Qt][WK2] New resize tests fail
https://bugs.webkit.org/show_bug.cgi?id=103875

Reviewed by Jocelyn Turcotte.

Removes reference to unused viewportSpy, adds clearing the sizeSpy to the init method instead.

* UIProcess/API/qt/tests/qmltests/WebView/tst_resize.qml:

Modified Paths

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




Diff

Modified: trunk/Source/WebKit2/ChangeLog (136390 => 136391)

--- trunk/Source/WebKit2/ChangeLog	2012-12-03 14:15:08 UTC (rev 136390)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-03 14:26:18 UTC (rev 136391)
@@ -1,3 +1,14 @@
+2012-12-03  Michael Brüning  
+
+[Qt][WK2] New resize tests fail
+https://bugs.webkit.org/show_bug.cgi?id=103875
+
+Reviewed by Jocelyn Turcotte.
+
+Removes reference to unused viewportSpy, adds clearing the sizeSpy to the init method instead.   
+
+* UIProcess/API/qt/tests/qmltests/WebView/tst_resize.qml:
+
 2012-12-03  Joaquim Rocha  
 
 [GTK] Custom URI schemes stop working on Epiphany using WebKit2 after killing the web process


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_resize.qml (136390 => 136391)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_resize.qml	2012-12-03 14:15:08 UTC (rev 136390)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_resize.qml	2012-12-03 14:26:18 UTC (rev 136391)
@@ -52,7 +52,7 @@
 function init() {
 resultSpy.clear()
 scaleSpy.clear()
-viewportSpy.clear()
+sizeSpy.clear()
 }
 
 function run(signalSpy, script) {






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

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

[michael . bruning]

Title: [136126] trunk/Source/WebKit2








Revision 136126
Author michael.brun...@digia.com
Date 2012-11-29 06:17:30 -0800 (Thu, 29 Nov 2012)


Log Message
[Qt][WK2] Commit the preedit string in the input method when focus is about to be moved.
https://bugs.webkit.org/show_bug.cgi?id=97774

Reviewed by Kenneth Rohde Christiansen.

Implements the handler for willSetInputMethodState in WebKit2 in Qt.
This is needed to tell the input method instance in Qt to commit its
preedit content when the focus has moved to another node to prevent a
bug where the old preedit string was kept as the preedit string and
the editor moved focus back to the old node when continuing to enter
text via the input method.

This behavior is analog to the behavior of the QtQuick text input
elements.

* UIProcess/API/qt/raw/qrawwebview.cpp:
(QRawWebViewPrivate::handleWillSetInputMethodState):
* UIProcess/API/qt/raw/qrawwebview_p_p.h:
(QRawWebViewPrivate):
* UIProcess/PageClient.h:
(PageClient):
* UIProcess/WebPageProxy.h:
(WebPageProxy):
* UIProcess/WebPageProxy.messages.in:
* UIProcess/qt/QtPageClient.cpp:
(WebKit::QtPageClient::handleWillSetInputMethodState):
(WebKit):
* UIProcess/qt/QtPageClient.h:
(QtPageClient):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::handleWillSetInputMethodState):
(WebKit):
* UIProcess/qt/QtWebPageEventHandler.h:
(QtWebPageEventHandler):
* UIProcess/qt/WebPageProxyQt.cpp:
(WebKit::WebPageProxy::willSetInputMethodState):
(WebKit):
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::willSetInputMethodState):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h
trunk/Source/WebKit2/UIProcess/PageClient.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h
trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (136125 => 136126)

--- trunk/Source/WebKit2/ChangeLog	2012-11-29 13:34:34 UTC (rev 136125)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-29 14:17:30 UTC (rev 136126)
@@ -1,3 +1,45 @@
+2012-11-29  Michael Brüning  
+
+[Qt][WK2] Commit the preedit string in the input method when focus is about to be moved.
+https://bugs.webkit.org/show_bug.cgi?id=97774
+
+Reviewed by Kenneth Rohde Christiansen.
+
+Implements the handler for willSetInputMethodState in WebKit2 in Qt.
+This is needed to tell the input method instance in Qt to commit its
+preedit content when the focus has moved to another node to prevent a
+bug where the old preedit string was kept as the preedit string and
+the editor moved focus back to the old node when continuing to enter
+text via the input method.
+
+This behavior is analog to the behavior of the QtQuick text input
+elements.
+
+* UIProcess/API/qt/raw/qrawwebview.cpp:
+(QRawWebViewPrivate::handleWillSetInputMethodState):
+* UIProcess/API/qt/raw/qrawwebview_p_p.h:
+(QRawWebViewPrivate):
+* UIProcess/PageClient.h:
+(PageClient):
+* UIProcess/WebPageProxy.h:
+(WebPageProxy):
+* UIProcess/WebPageProxy.messages.in:
+* UIProcess/qt/QtPageClient.cpp:
+(WebKit::QtPageClient::handleWillSetInputMethodState):
+(WebKit):
+* UIProcess/qt/QtPageClient.h:
+(QtPageClient):
+* UIProcess/qt/QtWebPageEventHandler.cpp:
+(WebKit::QtWebPageEventHandler::handleWillSetInputMethodState):
+(WebKit):
+* UIProcess/qt/QtWebPageEventHandler.h:
+(QtWebPageEventHandler):
+* UIProcess/qt/WebPageProxyQt.cpp:
+(WebKit::WebPageProxy::willSetInputMethodState):
+(WebKit):
+* WebProcess/WebCoreSupport/WebEditorClient.cpp:
+(WebKit::WebEditorClient::willSetInputMethodState):
+
 2012-11-28  Jocelyn Turcotte  
 
 [Qt] The WebView should be flickable only using touch events


Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp (136125 => 136126)

--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp	2012-11-29 13:34:34 UTC (rev 136125)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp	2012-11-29 14:17:30 UTC (rev 136126)
@@ -130,6 +130,11 @@
 notImplemented();
 }
 
+void QRawWebViewPrivate::handleWillSetInputMethodState()
+{
+notImplemented();
+}
+
 #if ENABLE(GESTURE_EVENTS)
 void QRawWebViewPrivate::doneWithGestureEvent(const WebKit::WebGestureEvent& event, bool wasEventHandled)
 {


Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h (136125 => 

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

[michael . bruning]

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








Revision 135696
Author michael.brun...@digia.com
Date 2012-11-26 02:35:28 -0800 (Mon, 26 Nov 2012)


Log Message
[Qt] QStyleFacadeImp build break with latest Qt 5
https://bugs.webkit.org/show_bug.cgi?id=103198

Reviewed by Simon Hausmann.

Original patch by J-P Nurmi .

Fixes QtWebKit build by replacing qobject_cast to
QMacStyle with calls to QObject::inherits. Also
replaces Q_WS_MAC preprocesser directives with Q_OS_MAC
for Qt 5 compatibility.

* WebCoreSupport/QStyleFacadeImp.cpp:
(WebKit::QStyleFacadeImp::getButtonMetrics):
(WebKit::QStyleFacadeImp::paintComboBox):
(WebKit::QStyleFacadeImp::paintInnerSpinButton):
(WebKit::QStyleFacadeImp::paintScrollBar):

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/qt/ChangeLog (135695 => 135696)

--- trunk/Source/WebKit/qt/ChangeLog	2012-11-26 10:21:53 UTC (rev 135695)
+++ trunk/Source/WebKit/qt/ChangeLog	2012-11-26 10:35:28 UTC (rev 135696)
@@ -1,3 +1,23 @@
+2012-11-26  Michael Brüning  
+
+[Qt] QStyleFacadeImp build break with latest Qt 5
+https://bugs.webkit.org/show_bug.cgi?id=103198
+
+Reviewed by Simon Hausmann.
+
+Original patch by J-P Nurmi .
+
+Fixes QtWebKit build by replacing qobject_cast to
+QMacStyle with calls to QObject::inherits. Also
+replaces Q_WS_MAC preprocesser directives with Q_OS_MAC
+for Qt 5 compatibility.
+
+* WebCoreSupport/QStyleFacadeImp.cpp:
+(WebKit::QStyleFacadeImp::getButtonMetrics):
+(WebKit::QStyleFacadeImp::paintComboBox):
+(WebKit::QStyleFacadeImp::paintInnerSpinButton):
+(WebKit::QStyleFacadeImp::paintScrollBar):
+
 2012-11-24  Sheriff Bot  
 
 Unreviewed, rolling out r135648 and r135649.


Modified: trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp (135695 => 135696)

--- trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp	2012-11-26 10:21:53 UTC (rev 135695)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QStyleFacadeImp.cpp	2012-11-26 10:35:28 UTC (rev 135696)
@@ -27,7 +27,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -221,7 +220,7 @@
 QFont defaultButtonFont = QApplication::font(&button);
 *buttonFontFamily = defaultButtonFont.family();
 *buttonFontPixelSize = 0;
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 button.setAttribute(Qt::WA_MacSmallSize);
 QFontInfo fontInfo(defaultButtonFont);
 *buttonFontPixelSize = fontInfo.pixelSize();
@@ -275,11 +274,11 @@
 
 IntRect rect = opt.rect;
 
-#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
+#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
 // QMacStyle makes the combo boxes a little bit smaller to leave space for the focus rect.
 // Because of it, the combo button is drawn at a point to the left of where it was expect to be and may end up
 // overlapped with the text. This will force QMacStyle to draw the combo box with the expected width.
-if (qobject_cast(m_style))
+if (m_style->inherits("QMacStyle"))
 rect.inflateX(3);
 #endif
 
@@ -359,11 +358,11 @@
 // Default to moving the buttons a little bit within the editor frame.
 int inflateX = -2;
 int inflateY = -2;
-#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
+#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
 // QMacStyle will position the aqua buttons flush to the right.
 // This will move them more within the control for better style, a la
 // Chromium look & feel.
-if (qobject_cast(m_style)) {
+if (m_style->inherits("QMacStyle")) {
 inflateX = -4;
 // Render mini aqua spin buttons for QMacStyle to fit nicely into
 // the editor area, like Chromium.
@@ -451,10 +450,10 @@
 
 MappedStyleOption opt(widget, proxyOption);
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 // FIXME: We also need to check the widget style but today ScrollbarTheme is not aware of the page so we
 // can't get the widget.
-if (qobject_cast(m_style))
+if (m_style->inherits("QMacStyle"))
 m_style->drawComplexControl(QStyle::CC_ScrollBar, &opt, painter, widget);
 else
 #endif






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

[webkit-changes] [133294] trunk

[michael . bruning]

Title: [133294] trunk








Revision 133294
Author michael.brun...@digia.com
Date 2012-11-02 07:25:35 -0700 (Fri, 02 Nov 2012)


Log Message
[Qt][WK2] ASSERT hit for every mouse click
https://bugs.webkit.org/show_bug.cgi?id=100607

Reviewed by Jocelyn Turcotte.

.:

Added a test with a link that contains an  tag surrounding the entire inner text.
The test should be run on an assert enabled build and the assert should not be
triggered when tapping the link.

* ManualTests/tap-gesture-on-em-link-tap-highlight-assert.html: Added.

Source/WebCore:

Changed the logic of absolutePathForRenderer to use the first highlight box as the mid box
by uniting the two in case the mid box is empty. This allows the first box to be merged with
the last box should they intersect, and thereby prevents an ASSERT in addHighlightRect that is
triggered by two intersecting boxes being passed to addHighlightRect as separate ones.

Also, this patch removes some superfluous checks for LayoutRect::isEmpty, which is being checked
in LayoutRect::intersects already.

No new tests, but added manual test: ManualTests/tap-gesture-on-em-link-tap-highlight-assert.html

* page/GestureTapHighlighter.cpp:

Modified Paths

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


Added Paths

trunk/ManualTests/tap-gesture-on-em-link-tap-highlight-assert.html




Diff

Modified: trunk/ChangeLog (133293 => 133294)

--- trunk/ChangeLog	2012-11-02 14:07:45 UTC (rev 133293)
+++ trunk/ChangeLog	2012-11-02 14:25:35 UTC (rev 133294)
@@ -1,3 +1,16 @@
+2012-11-02  Michael Brüning  
+
+[Qt][WK2] ASSERT hit for every mouse click
+https://bugs.webkit.org/show_bug.cgi?id=100607
+
+Reviewed by Jocelyn Turcotte.
+
+Added a test with a link that contains an  tag surrounding the entire inner text.
+The test should be run on an assert enabled build and the assert should not be
+triggered when tapping the link.
+
+* ManualTests/tap-gesture-on-em-link-tap-highlight-assert.html: Added.
+
 2012-11-01  Ami Fischman  
 
 HTMLMediaPlayer should free m_player when src is set/changed


Added: trunk/ManualTests/tap-gesture-on-em-link-tap-highlight-assert.html (0 => 133294)

--- trunk/ManualTests/tap-gesture-on-em-link-tap-highlight-assert.html	(rev 0)
+++ trunk/ManualTests/tap-gesture-on-em-link-tap-highlight-assert.html	2012-11-02 14:25:35 UTC (rev 133294)
@@ -0,0 +1,7 @@
+
+
+This test verifies that a link that starts with or contains an em tag does not assert in debug builds.
+Tapping on the link should not trigger an assert.
+
+


Modified: trunk/Source/WebCore/ChangeLog (133293 => 133294)

--- trunk/Source/WebCore/ChangeLog	2012-11-02 14:07:45 UTC (rev 133293)
+++ trunk/Source/WebCore/ChangeLog	2012-11-02 14:25:35 UTC (rev 133294)
@@ -1,3 +1,22 @@
+2012-11-02  Michael Brüning  
+
+[Qt][WK2] ASSERT hit for every mouse click
+https://bugs.webkit.org/show_bug.cgi?id=100607
+
+Reviewed by Jocelyn Turcotte.
+
+Changed the logic of absolutePathForRenderer to use the first highlight box as the mid box 
+by uniting the two in case the mid box is empty. This allows the first box to be merged with
+the last box should they intersect, and thereby prevents an ASSERT in addHighlightRect that is
+triggered by two intersecting boxes being passed to addHighlightRect as separate ones.
+
+Also, this patch removes some superfluous checks for LayoutRect::isEmpty, which is being checked
+in LayoutRect::intersects already.
+
+No new tests, but added manual test: ManualTests/tap-gesture-on-em-link-tap-highlight-assert.html
+
+* page/GestureTapHighlighter.cpp:
+
 2012-11-02  Arpita Bahuguna  
 
 Regression r130057: Improper preferred width calculation when an inline replaced object, wrapped in an inline flow, follows some text.


Modified: trunk/Source/WebCore/page/GestureTapHighlighter.cpp (133293 => 133294)

--- trunk/Source/WebCore/page/GestureTapHighlighter.cpp	2012-11-02 14:07:45 UTC (rev 133293)
+++ trunk/Source/WebCore/page/GestureTapHighlighter.cpp	2012-11-02 14:25:35 UTC (rev 133294)
@@ -165,9 +165,13 @@
 LayoutRect first;
 LayoutRect last;
 
-// Add the first box, but merge it with the center boxes if it intersects.
+// Add the first box, but merge it with the center boxes if it intersects or if the center box is empty.
 if (rects.size() && !rects.first().isEmpty()) {
-if (!mid.isEmpty() && mid.intersects(rects.first()))
+// If the mid box is empty at this point, unite it with the first box. This allows the first box to be
+// united with the last box if they intersect in the following check for last. Not uniting them would
+// trigger in assert in addHighlighRect due to the first and the last box intersecting, but being passed
+// as two separate boxes.
+if (mid.isEmpty() || mid.i

[webkit-changes] [130173] trunk/LayoutTests

[michael . bruning]

Title: [130173] trunk/LayoutTests








Revision 130173
Author michael.brun...@digia.com
Date 2012-10-02 08:43:29 -0700 (Tue, 02 Oct 2012)


Log Message
[Qt][WK2] inspector/extensions/extensions-network.html times out
https://bugs.webkit.org/show_bug.cgi?id=98136

Unreviewed gardening.

WebInspectorProxy::platformCreateInspectorPage() is not implemented for
the Qt 5.0 WK2 port.

* platform/qt-5.0-wk2/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (130172 => 130173)

--- trunk/LayoutTests/ChangeLog	2012-10-02 15:22:40 UTC (rev 130172)
+++ trunk/LayoutTests/ChangeLog	2012-10-02 15:43:29 UTC (rev 130173)
@@ -1,3 +1,15 @@
+2012-10-02  Michael Brüning  
+
+[Qt][WK2] inspector/extensions/extensions-network.html times out
+https://bugs.webkit.org/show_bug.cgi?id=98136
+
+Unreviewed gardening.
+
+WebInspectorProxy::platformCreateInspectorPage() is not implemented for
+the Qt 5.0 WK2 port.
+
+* platform/qt-5.0-wk2/TestExpectations:
+
 2012-10-02  Csaba Osztrogonác  
 
 [Qt] Unreviewed gardening, skip one more failing test.


Modified: trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations (130172 => 130173)

--- trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations	2012-10-02 15:22:40 UTC (rev 130172)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations	2012-10-02 15:43:29 UTC (rev 130173)
@@ -532,3 +532,7 @@
 # [Qt][WK2] fast/events/popup-blocked-from-fake-user-gesture.html times out
 # https://bugs.webkit.org/show_bug.cgi?id=97598
 fast/events/popup-blocked-from-fake-user-gesture.html
+
+# [Qt][WK2] inspector/extensions/extensions-network.html times out
+# https://bugs.webkit.org/show_bug.cgi?id=98136
+inspector/extensions/extensions-network.html






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