Diff
Modified: trunk/Source/WebCore/ChangeLog (113360 => 113361)
--- trunk/Source/WebCore/ChangeLog 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebCore/ChangeLog 2012-04-05 20:01:38 UTC (rev 113361)
@@ -1,3 +1,15 @@
+2012-04-05 Patrick Gansterer <par...@webkit.org>
+
+ [Qt] Correct <wtf/*.h> include paths.
+ https://bugs.webkit.org/show_bug.cgi?id=83270
+
+ Reviewed by Eric Seidel.
+
+ Modify the #include declerations so that the
+ wtf types are included using the full path.
+
+ * platform/graphics/TiledBackingStoreBackend.h:
+
2012-04-05 Antonio Gomes <ago...@rim.com>
Unreviewed bit left over from rebasing the origin patch before landing it.
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStoreBackend.h (113360 => 113361)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStoreBackend.h 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStoreBackend.h 2012-04-05 20:01:38 UTC (rev 113361)
@@ -22,8 +22,8 @@
#if USE(TILED_BACKING_STORE)
-#include "PassOwnPtr.h"
#include "Tile.h"
+#include <wtf/PassOwnPtr.h>
namespace WebCore {
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (113360 => 113361)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-04-05 20:01:38 UTC (rev 113361)
@@ -74,7 +74,6 @@
#include "HTMLFrameOwnerElement.h"
#include "HTMLInputElement.h"
#include "HTMLNames.h"
-#include "HashMap.h"
#include "HitTestResult.h"
#include "Image.h"
#include "InitWebCoreQt.h"
@@ -101,7 +100,6 @@
#include "PluginPackage.h"
#include "ProgressTracker.h"
#include "QtPlatformPlugin.h"
-#include "RefPtr.h"
#include "RenderTextControl.h"
#include "RenderThemeQt.h"
#include "SchemeRegistry.h"
Modified: trunk/Source/WebKit/qt/ChangeLog (113360 => 113361)
--- trunk/Source/WebKit/qt/ChangeLog 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-04-05 20:01:38 UTC (rev 113361)
@@ -1,3 +1,19 @@
+2012-04-05 Patrick Gansterer <par...@webkit.org>
+
+ [Qt] Correct <wtf/*.h> include paths.
+ https://bugs.webkit.org/show_bug.cgi?id=83270
+
+ Reviewed by Eric Seidel.
+
+ Modify the #include declerations so that the
+ wtf types are included using the full path.
+
+ * Api/qwebpage.cpp:
+ * WebCoreSupport/ContextMenuClientQt.h:
+ * WebCoreSupport/EditorClientQt.h:
+ * WebCoreSupport/FrameLoaderClientQt.h:
+ * WebCoreSupport/InspectorServerQt.cpp:
+
2012-04-05 Csaba Osztrogonác <o...@webkit.org>
[Qt] Fix includes after QtDeclarative -> QtQML renaming
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h (113360 => 113361)
--- trunk/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h 2012-04-05 20:01:38 UTC (rev 113361)
@@ -28,7 +28,7 @@
#include "ContextMenuClient.h"
-#include <RefCounted.h>
+#include <wtf/RefCounted.h>
namespace WebCore {
class ContextMenu;
Modified: trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.h (113360 => 113361)
--- trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.h 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.h 2012-04-05 20:01:38 UTC (rev 113361)
@@ -31,9 +31,9 @@
#define EditorClientQt_h
#include "EditorClient.h"
-#include "RefCounted.h"
#include "TextCheckerClientQt.h"
#include <wtf/Forward.h>
+#include <wtf/RefCounted.h>
class QWebPage;
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h (113360 => 113361)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h 2012-04-05 20:01:38 UTC (rev 113361)
@@ -35,14 +35,14 @@
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "KURL.h"
-#include <wtf/OwnPtr.h>
#include "WebCore/plugins/PluginView.h"
-#include "RefCounted.h"
#include "ResourceError.h"
#include "ResourceResponse.h"
#include <QUrl>
#include <qobject.h>
#include <wtf/Forward.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/RefCounted.h>
QT_BEGIN_NAMESPACE
class QNetworkReply;
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp (113360 => 113361)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp 2012-04-05 20:01:38 UTC (rev 113361)
@@ -22,7 +22,6 @@
#include "InspectorClientQt.h"
#include "InspectorController.h"
-#include "MD5.h"
#include "Page.h"
#include "qhttpheader_p.h"
#include "qwebpage.h"
@@ -35,6 +34,7 @@
#include <QUrl>
#include <QWidget>
#include <qendian.h>
+#include <wtf/MD5.h>
#include <wtf/text/CString.h>
namespace WebCore {
Modified: trunk/Source/WebKit2/ChangeLog (113360 => 113361)
--- trunk/Source/WebKit2/ChangeLog 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-05 20:01:38 UTC (rev 113361)
@@ -1,3 +1,21 @@
+2012-04-05 Patrick Gansterer <par...@webkit.org>
+
+ [Qt] Correct <wtf/*.h> include paths.
+ https://bugs.webkit.org/show_bug.cgi?id=83270
+
+ Reviewed by Eric Seidel.
+
+ Modify the #include declerations so that the
+ wtf types are included using the full path.
+
+ * Shared/qt/QtNetworkReplyData.cpp:
+ * UIProcess/WebLayerTreeRenderer.cpp:
+ * UIProcess/qt/LayerBackingStore.h:
+ * UIProcess/qt/QtViewportInteractionEngine.cpp:
+ * UIProcess/qt/QtViewportInteractionEngine.h:
+ * UIProcess/qt/QtWebPageSGNode.h:
+ * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+
2012-04-05 Jia Pu <j...@apple.com>
Move correction panel related functions from EditorClient into separated AlternativeTextClient class.
Modified: trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.cpp (113360 => 113361)
--- trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.cpp 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.cpp 2012-04-05 20:01:38 UTC (rev 113361)
@@ -28,11 +28,11 @@
#include "ArgumentCodersQt.h"
#include "KURL.h"
-#include "Noncopyable.h"
#include "SharedMemory.h"
#include "WebCoreArgumentCoders.h"
#include <QNetworkAccessManager>
#include <QNetworkRequest>
+#include <wtf/Noncopyable.h>
#include <wtf/text/WTFString.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp (113360 => 113361)
--- trunk/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp 2012-04-05 20:01:38 UTC (rev 113361)
@@ -26,7 +26,6 @@
#include "GraphicsLayerTextureMapper.h"
#include "LayerBackingStore.h"
#include "LayerTreeHostProxy.h"
-#include "MainThread.h"
#include "MessageID.h"
#include "ShareableBitmap.h"
#include "TextureMapper.h"
@@ -35,6 +34,7 @@
#include "UpdateInfo.h"
#include <OpenGLShims.h>
#include <wtf/Atomics.h>
+#include <wtf/MainThread.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.h (113360 => 113361)
--- trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.h 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.h 2012-04-05 20:01:38 UTC (rev 113361)
@@ -21,10 +21,11 @@
#define LayerBackingStore_h
#if USE(UI_SIDE_COMPOSITING)
-#include "HashMap.h"
+
#include "ShareableBitmap.h"
#include "TextureMapper.h"
#include "TextureMapperBackingStore.h"
+#include <wtf/HashMap.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (113360 => 113361)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-04-05 20:01:38 UTC (rev 113361)
@@ -22,13 +22,13 @@
#include "config.h"
#include "QtViewportInteractionEngine.h"
-#include "PassOwnPtr.h"
#include "qquickwebpage_p.h"
#include "qquickwebview_p.h"
#include <QPointF>
#include <QTransform>
#include <QWheelEvent>
#include <QtQuick/qquickitem.h>
+#include <wtf/PassOwnPtr.h>
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h (113360 => 113361)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h 2012-04-05 20:01:38 UTC (rev 113361)
@@ -22,13 +22,13 @@
#ifndef QtViewportInteractionEngine_h
#define QtViewportInteractionEngine_h
-#include "OwnPtr.h"
#include "qwebkitglobal.h"
#include <QTouchEvent>
#include <QtCore/QObject>
#include <QtCore/QRectF>
#include <QtCore/QVariant>
#include <QtCore/QVariantAnimation>
+#include <wtf/OwnPtr.h>
QT_BEGIN_NAMESPACE
class QPointF;
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h (113360 => 113361)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h 2012-04-05 20:01:38 UTC (rev 113361)
@@ -21,8 +21,9 @@
#ifndef QtWebPageSGNode_h
#define QtWebPageSGNode_h
-#include "PassRefPtr.h"
#include <QtQuick/QSGTransformNode>
+#include <wtf/PassRefPtr.h>
+
class QSGSimpleRectNode;
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (113360 => 113361)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-04-05 20:01:38 UTC (rev 113361)
@@ -33,9 +33,9 @@
#include "Page.h"
#include "TiledBackingStoreRemoteTile.h"
#include "WebPage.h"
-#include "text/CString.h"
-#include <HashMap.h>
#include <wtf/CurrentTime.h>
+#include <wtf/HashMap.h>
+#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Tools/ChangeLog (113360 => 113361)
--- trunk/Tools/ChangeLog 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Tools/ChangeLog 2012-04-05 20:01:38 UTC (rev 113361)
@@ -1,3 +1,15 @@
+2012-04-05 Patrick Gansterer <par...@webkit.org>
+
+ [Qt] Correct <wtf/*.h> include paths.
+ https://bugs.webkit.org/show_bug.cgi?id=83270
+
+ Reviewed by Eric Seidel.
+
+ Modify the #include declerations so that the
+ wtf types are included using the full path.
+
+ * WebKitTestRunner/qt/TestInvocationQt.cpp:
+
2012-04-05 Philippe Normand <pnorm...@igalia.com>
gtk_unittest.GtkPortTest.test_get_crash_log failing on windows
Modified: trunk/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp (113360 => 113361)
--- trunk/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp 2012-04-05 19:49:47 UTC (rev 113360)
+++ trunk/Tools/WebKitTestRunner/qt/TestInvocationQt.cpp 2012-04-05 20:01:38 UTC (rev 113361)
@@ -25,14 +25,14 @@
#include "config.h"
-#include "Assertions.h"
#include "TestInvocation.h"
#include <QBuffer>
#include <QCryptographicHash>
#include <WebKit2/WKImageQt.h>
#include <stdio.h>
-#include "UnusedParam.h"
+#include <wtf/Assertions.h>
+#include <wtf/UnusedParam.h>
namespace WTR {
