Diff
Modified: trunk/ChangeLog (102678 => 102679)
--- trunk/ChangeLog 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/ChangeLog 2011-12-13 15:19:50 UTC (rev 102679)
@@ -1,3 +1,17 @@
+2011-12-13 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Get rid of layering violations in includes
+
+ WebKit/qt/API and WebKit/qt/WebCoreSupport should not be included
+ in the webcore.prf, but rather in each target that specificly needs
+ headers in these location. We used to include them directly in webcore
+ since we had layering violations between WebCore and WebKit, but now
+ that they are gone there's no reason to do that.
+
+ Reviewed by Simon Hausmann.
+
+ * Source/api.pri:
+
2011-12-12 Andy Wingo <[email protected]>
Simplify autotools configure.ac
Modified: trunk/Source/WebCore/ChangeLog (102678 => 102679)
--- trunk/Source/WebCore/ChangeLog 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/ChangeLog 2011-12-13 15:19:50 UTC (rev 102679)
@@ -1,3 +1,24 @@
+2011-12-13 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Get rid of layering violations in includes
+
+ WebKit/qt/API and WebKit/qt/WebCoreSupport should not be included
+ in the webcore.prf, but rather in each target that specificly needs
+ headers in these location. We used to include them directly in webcore
+ since we had layering violations between WebCore and WebKit, but now
+ that they are gone there's no reason to do that.
+
+ Reviewed by Simon Hausmann.
+
+ * bridge/qt/qt_instance.cpp:
+ * platform/graphics/qt/GraphicsContext3DQt.cpp:
+ * platform/graphics/qt/ImageQt.cpp:
+ * platform/network/qt/QNetworkReplyHandler.cpp:
+ * platform/network/qt/ResourceHandleQt.cpp:
+ * platform/qt/CookieJarQt.cpp:
+ * platform/qt/RenderThemeQStyle.cpp:
+ * platform/qt/RenderThemeQt.cpp:
+
2011-12-13 Vsevolod Vlasov <[email protected]>
Web Inspector: Add scripts navigator sidebar to scripts panel.
Modified: trunk/Source/WebCore/bridge/qt/qt_instance.cpp (102678 => 102679)
--- trunk/Source/WebCore/bridge/qt/qt_instance.cpp 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/bridge/qt/qt_instance.cpp 2011-12-13 15:19:50 UTC (rev 102679)
@@ -35,7 +35,6 @@
#include <qhash.h>
#include <qmetaobject.h>
#include <qmetatype.h>
-#include <qwebelement.h>
namespace JSC {
namespace Bindings {
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (102678 => 102679)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2011-12-13 15:19:50 UTC (rev 102679)
@@ -36,7 +36,6 @@
#include "NotImplemented.h"
#include "QWebPageClient.h"
#include "SharedBuffer.h"
-#include "qwebpage.h"
#include <QAbstractScrollArea>
#include <QGraphicsObject>
#include <QGLContext>
Modified: trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp (102678 => 102679)
--- trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp 2011-12-13 15:19:50 UTC (rev 102679)
@@ -40,7 +40,6 @@
#include "PlatformString.h"
#include "ShadowBlur.h"
#include "StillImageQt.h"
-#include "qwebsettings.h"
#include <QApplication>
#include <QDebug>
Modified: trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (102678 => 102679)
--- trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2011-12-13 15:19:50 UTC (rev 102679)
@@ -33,8 +33,6 @@
#include <QFileInfo>
#include <QNetworkReply>
#include <QNetworkCookie>
-#include <qwebframe.h>
-#include <qwebpage.h>
#include <wtf/text/CString.h>
Modified: trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp (102678 => 102679)
--- trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp 2011-12-13 15:19:50 UTC (rev 102679)
@@ -30,11 +30,9 @@
#include "config.h"
#include "ResourceHandle.h"
-#include "ChromeClientQt.h"
#include "CachedResourceLoader.h"
#include "Frame.h"
#include "FrameNetworkingContext.h"
-#include "FrameLoaderClientQt.h"
#include "NotImplemented.h"
#include "Page.h"
#include "QNetworkReplyHandler.h"
Modified: trunk/Source/WebCore/platform/qt/CookieJarQt.cpp (102678 => 102679)
--- trunk/Source/WebCore/platform/qt/CookieJarQt.cpp 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/platform/qt/CookieJarQt.cpp 2011-12-13 15:19:50 UTC (rev 102679)
@@ -33,7 +33,8 @@
#include "Cookie.h"
#include "Document.h"
-#include "FrameLoaderClientQt.h"
+#include "Frame.h"
+#include "FrameLoader.h"
#include "KURL.h"
#include "NetworkingContext.h"
#include "PlatformString.h"
@@ -43,6 +44,7 @@
#include <QNetworkCookie>
#include <QSqlQuery>
#include <QStringList>
+#include <QVariant>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp (102678 => 102679)
--- trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp 2011-12-13 15:19:50 UTC (rev 102679)
@@ -34,7 +34,7 @@
#include "CSSStyleSelector.h"
#include "CSSValueKeywords.h"
#include "Chrome.h"
-#include "ChromeClientQt.h"
+#include "ChromeClient.h"
#include "Color.h"
#include "Document.h"
#include "Font.h"
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp (102678 => 102679)
--- trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp 2011-12-13 15:19:50 UTC (rev 102679)
@@ -33,7 +33,7 @@
#include "CSSStyleSelector.h"
#include "CSSValueKeywords.h"
#include "Chrome.h"
-#include "ChromeClientQt.h"
+#include "ChromeClient.h"
#include "Color.h"
#include "Font.h"
#include "FontSelector.h"
Modified: trunk/Source/api.pri (102678 => 102679)
--- trunk/Source/api.pri 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Source/api.pri 2011-12-13 15:19:50 UTC (rev 102679)
@@ -79,6 +79,8 @@
$$PWD/WebKit/qt/WebCoreSupport/TextCheckerClientQt.h \
$$PWD/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.h
+INCLUDEPATH += $$PWD/WebKit/qt/WebCoreSupport
+
contains(DEFINES, ENABLE_VIDEO=1) {
!contains(DEFINES, WTF_USE_QTKIT=1):!contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
HEADERS += $$PWD/WebKit/qt/WebCoreSupport/FullScreenVideoWidget.h
Modified: trunk/Tools/ChangeLog (102678 => 102679)
--- trunk/Tools/ChangeLog 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Tools/ChangeLog 2011-12-13 15:19:50 UTC (rev 102679)
@@ -1,3 +1,21 @@
+2011-12-13 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Get rid of layering violations in includes
+
+ WebKit/qt/API and WebKit/qt/WebCoreSupport should not be included
+ in the webcore.prf, but rather in each target that specificly needs
+ headers in these location. We used to include them directly in webcore
+ since we had layering violations between WebCore and WebKit, but now
+ that they are gone there's no reason to do that.
+
+ Reviewed by Simon Hausmann.
+
+ * DumpRenderTree/qt/DumpRenderTree.pro:
+ * QtTestBrowser/launcherwindow.h:
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * qmake/mkspecs/features/webcore.prf:
+ * qmake/mkspecs/features/webkit2.prf:
+
2011-12-13 János Badics <[email protected]>
[NRWT] It crashes intermittently when there are WebProcess crashes
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro (102678 => 102679)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro 2011-12-13 15:19:50 UTC (rev 102679)
@@ -16,7 +16,9 @@
CONFIG += qtwebkit
-INCLUDEPATH += $$PWD/..
+INCLUDEPATH += \
+ $$PWD/.. \
+ $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport
!embedded: PKGCONFIG += fontconfig
Modified: trunk/Tools/QtTestBrowser/launcherwindow.h (102678 => 102679)
--- trunk/Tools/QtTestBrowser/launcherwindow.h 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Tools/QtTestBrowser/launcherwindow.h 2011-12-13 15:19:50 UTC (rev 102679)
@@ -56,7 +56,6 @@
#include <qwebinspector.h>
#include <qwebsettings.h>
-#include "DumpRenderTreeSupportQt.h"
#include "mainwindow.h"
#include "urlloader.h"
#include "utils.h"
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (102678 => 102679)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-12-13 15:19:50 UTC (rev 102679)
@@ -62,7 +62,8 @@
INCLUDEPATH += \
$$PWD/.. \
$$PWD/Bindings \
- $${ROOT_WEBKIT_DIR}/Source/WebCore/testing/js
+ $${ROOT_WEBKIT_DIR}/Source/WebCore/testing/js \
+ $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport
PREFIX_HEADER = $$PWD/../WebKitTestRunnerPrefix.h
*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
Modified: trunk/Tools/qmake/mkspecs/features/webcore.prf (102678 => 102679)
--- trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Tools/qmake/mkspecs/features/webcore.prf 2011-12-13 15:19:50 UTC (rev 102679)
@@ -112,8 +112,6 @@
$$SOURCE_DIR/WebCore/platform/graphics/qt \
$$SOURCE_DIR/WebCore/platform/network/qt \
$$SOURCE_DIR/WebCore/platform/qt \
- $$SOURCE_DIR/WebKit/qt/Api \
- $$SOURCE_DIR/WebKit/qt/WebCoreSupport \
$$WEBCORE_INCLUDEPATH
Modified: trunk/Tools/qmake/mkspecs/features/webkit2.prf (102678 => 102679)
--- trunk/Tools/qmake/mkspecs/features/webkit2.prf 2011-12-13 15:13:40 UTC (rev 102678)
+++ trunk/Tools/qmake/mkspecs/features/webkit2.prf 2011-12-13 15:19:50 UTC (rev 102679)
@@ -64,6 +64,9 @@
$$SOURCE_DIR/WebKit2/WebProcess/qt \
$$SOURCE_DIR/WebKit2/PluginProcess
+# The WebKit2 Qt APIs depend on qwebkitglobal.h, which lives in WebKit
+WEBKIT2_INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/Api
+
INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$INCLUDEPATH
needToLinkLibrary(WebKit2) {
