Diff
Modified: trunk/Source/WebCore/ChangeLog (129646 => 129647)
--- trunk/Source/WebCore/ChangeLog 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/ChangeLog 2012-09-26 15:17:36 UTC (rev 129647)
@@ -1,3 +1,33 @@
+2012-09-26 Kenneth Rohde Christiansen <kenn...@webkit.org>
+
+ Reorder Qt WebCore includes
+ https://bugs.webkit.org/show_bug.cgi?id=97678
+
+ Reviewed by Noam Rosenthal.
+
+ * bridge/qt/qt_instance.cpp:
+ * bridge/qt/qt_instance.h:
+ * bridge/qt/qt_pixmapruntime.cpp:
+ * bridge/qt/qt_runtime.cpp:
+ * platform/graphics/qt/FontCacheQt.cpp:
+ * platform/graphics/qt/FontCustomPlatformData.h:
+ * platform/graphics/qt/ImageDecoderQt.cpp:
+ * platform/graphics/qt/ImageDecoderQt.h:
+ * platform/graphics/qt/PathQt.cpp:
+ * platform/graphics/qt/TransformationMatrixQt.cpp:
+ * platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp:
+ * platform/network/qt/DnsPrefetchHelper.h:
+ * platform/network/qt/QNetworkReplyHandler.cpp:
+ * platform/network/qt/ResourceHandleQt.cpp:
+ * platform/qt/ClipboardQt.cpp:
+ * platform/qt/GamepadsQt.cpp:
+ * platform/qt/PasteboardQt.cpp:
+ * platform/qt/PlatformScreenQt.cpp:
+ * platform/qt/RenderThemeQt.cpp:
+ * platform/text/qt/TextBoundariesQt.cpp:
+ * plugins/qt/PluginPackageQt.cpp:
+ * plugins/qt/PluginViewQt.cpp:
+
2012-09-26 Christophe Dumez <christophe.du...@intel.com>
[EFL] mediaControlsEflFullscreen.css overrides regular media controls styling
Modified: trunk/Source/WebCore/bridge/qt/qt_instance.cpp (129646 => 129647)
--- trunk/Source/WebCore/bridge/qt/qt_instance.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/bridge/qt/qt_instance.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -30,8 +30,8 @@
#include "PropertyNameArray.h"
#include "qt_class.h"
#include "qt_runtime.h"
+#include "runtime/FunctionPrototype.h"
#include "runtime_object.h"
-#include "runtime/FunctionPrototype.h"
#include <qdebug.h>
#include <qhash.h>
Modified: trunk/Source/WebCore/bridge/qt/qt_instance.h (129646 => 129647)
--- trunk/Source/WebCore/bridge/qt/qt_instance.h 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/bridge/qt/qt_instance.h 2012-09-26 15:17:36 UTC (rev 129647)
@@ -22,9 +22,9 @@
#include "BridgeJSC.h"
#include "JSWeakObjectMapRefPrivate.h"
-#include <QPointer>
#include "Weak.h"
#include "runtime_root.h"
+#include <QPointer>
#include <qhash.h>
#include <qset.h>
Modified: trunk/Source/WebCore/bridge/qt/qt_pixmapruntime.cpp (129646 => 129647)
--- trunk/Source/WebCore/bridge/qt/qt_pixmapruntime.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/bridge/qt/qt_pixmapruntime.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -31,13 +31,13 @@
#include "JSRetainPtr.h"
#include "_javascript_.h"
#include "StillImageQt.h"
-#include <QtEndian>
#include <QBuffer>
#include <QByteArray>
#include <QColor>
#include <QImage>
#include <QPixmap>
#include <QVariant>
+#include <QtEndian>
using namespace WebCore;
namespace JSC {
Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.cpp (129646 => 129647)
--- trunk/Source/WebCore/bridge/qt/qt_runtime.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -28,10 +28,9 @@
#include "Interpreter.h"
#include "JSArray.h"
#include "JSContextRefPrivate.h"
-#include "JSDocument.h"
#include "JSDOMBinding.h"
#include "JSDOMWindow.h"
-#include <JSFunction.h>
+#include "JSDocument.h"
#include "JSGlobalObject.h"
#include "JSHTMLElement.h"
#include "JSLock.h"
@@ -49,6 +48,7 @@
#include "qt_instance.h"
#include "qt_pixmapruntime.h"
#include "qvarlengtharray.h"
+#include <JSFunction.h>
#include <wtf/DateMath.h>
Modified: trunk/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -25,9 +25,9 @@
#include "config.h"
#include "FontCache.h"
+#include "Font.h"
#include "FontDescription.h"
#include "FontPlatformData.h"
-#include "Font.h"
#include <utility>
#include <wtf/ListHashSet.h>
#include <wtf/StdLibExtras.h>
Modified: trunk/Source/WebCore/platform/graphics/qt/FontCustomPlatformData.h (129646 => 129647)
--- trunk/Source/WebCore/platform/graphics/qt/FontCustomPlatformData.h 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/graphics/qt/FontCustomPlatformData.h 2012-09-26 15:17:36 UTC (rev 129647)
@@ -26,10 +26,10 @@
#include "FontRenderingMode.h"
#include "FontWidthVariant.h"
#include "TextOrientation.h"
+#include <QRawFont>
#include <wtf/FastAllocBase.h>
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
-#include <QRawFont>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -29,8 +29,8 @@
#include "config.h"
#include "ImageDecoderQt.h"
+#include <QtCore/QBuffer>
#include <QtCore/QByteArray>
-#include <QtCore/QBuffer>
#include <QtGui/QImageReader>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/qt/ImageDecoderQt.h (129646 => 129647)
--- trunk/Source/WebCore/platform/graphics/qt/ImageDecoderQt.h 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/graphics/qt/ImageDecoderQt.h 2012-09-26 15:17:36 UTC (rev 129647)
@@ -28,11 +28,11 @@
#define ImageDecoderQt_h
#include "ImageDecoder.h"
+#include <QtCore/QBuffer>
+#include <QtCore/QHash>
+#include <QtCore/QList>
#include <QtGui/QImageReader>
#include <QtGui/QPixmap>
-#include <QtCore/QList>
-#include <QtCore/QHash>
-#include <QtCore/QBuffer>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
Modified: trunk/Source/WebCore/platform/graphics/qt/PathQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/graphics/qt/PathQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/graphics/qt/PathQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -38,8 +38,8 @@
#include "NativeImageQt.h"
#include "StrokeStyleApplier.h"
#include <QPainterPath>
+#include <QString>
#include <QTransform>
-#include <QString>
#include <wtf/MathExtras.h>
#include <wtf/OwnPtr.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/platform/graphics/qt/TransformationMatrixQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/graphics/qt/TransformationMatrixQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/graphics/qt/TransformationMatrixQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -27,8 +27,8 @@
#include "AffineTransform.h"
#include "TransformationMatrix.h"
+#include "FloatRect.h"
#include "IntRect.h"
-#include "FloatRect.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -24,15 +24,15 @@
#include "TextureMapperGL.h"
// Qt headers must be included before glx headers.
+#include <GL/glext.h>
+#include <GL/glx.h>
#include <QCoreApplication>
#include <QOpenGLContext>
#include <QVector>
#include <QWindow>
-#include <qpa/qplatformwindow.h>
-#include <GL/glext.h>
-#include <GL/glx.h>
#include <X11/extensions/Xcomposite.h>
#include <X11/extensions/Xrender.h>
+#include <qpa/qplatformwindow.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/network/qt/DnsPrefetchHelper.h (129646 => 129647)
--- trunk/Source/WebCore/platform/network/qt/DnsPrefetchHelper.h 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/network/qt/DnsPrefetchHelper.h 2012-09-26 15:17:36 UTC (rev 129647)
@@ -19,9 +19,9 @@
#ifndef DnsPrefetchHelper_h
#define DnsPrefetchHelper_h
-#include <QObject>
#include <QCache>
#include <QHostInfo>
+#include <QObject>
#include <QSet>
#include <QString>
#include <QTime>
Modified: trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -26,18 +26,18 @@
#include "ResourceHandle.h"
#include "ResourceHandleClient.h"
#include "ResourceHandleInternal.h"
+#include "ResourceRequest.h"
#include "ResourceResponse.h"
-#include "ResourceRequest.h"
#include <QDateTime>
#include <QFile>
#include <QFileInfo>
+#include <QNetworkCookie>
#include <QNetworkReply>
-#include <QNetworkCookie>
#include <wtf/text/CString.h>
+#include <QCoreApplication>
#include <QDebug>
-#include <QCoreApplication>
// In Qt 4.8, the attribute for sending a request synchronously will be made public,
// for now, use this hackish solution for setting the internal attribute.
Modified: trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -42,10 +42,10 @@
#include <QAbstractNetworkCache>
#include <QCoreApplication>
-#include <QUrl>
#include <QNetworkAccessManager>
+#include <QNetworkReply>
#include <QNetworkRequest>
-#include <QNetworkReply>
+#include <QUrl>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/qt/ClipboardQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -48,8 +48,8 @@
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
+#include <QClipboard>
#include <QGuiApplication>
-#include <QClipboard>
#include <QImage>
#include <QList>
#include <QMimeData>
Modified: trunk/Source/WebCore/platform/qt/GamepadsQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/qt/GamepadsQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/qt/GamepadsQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -34,7 +34,7 @@
#include <QSocketNotifier>
extern "C" {
- #include <libudev.h>
+#include <libudev.h>
}
#include <unistd.h>
Modified: trunk/Source/WebCore/platform/qt/PasteboardQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/qt/PasteboardQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/qt/PasteboardQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -35,9 +35,9 @@
#include "Image.h"
#include "RenderImage.h"
#include "markup.h"
-#include <qguiapplication.h>
#include <qclipboard.h>
#include <qdebug.h>
+#include <qguiapplication.h>
#include <qmimedata.h>
#include <qurl.h>
Modified: trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -36,8 +36,8 @@
#include "FrameView.h"
#include "HostWindow.h"
#include "NotImplemented.h"
+#include "QWebPageClient.h"
#include "Widget.h"
-#include "QWebPageClient.h"
#include <QGuiApplication>
#include <QScreen>
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -60,10 +60,10 @@
#include "UserAgentStyleSheets.h"
#include <wtf/text/StringBuilder.h>
-#include <QGuiApplication>
#include <QColor>
#include <QFile>
#include <QFontMetrics>
+#include <QGuiApplication>
#include <QStyleHints>
Modified: trunk/Source/WebCore/platform/text/qt/TextBoundariesQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/platform/text/qt/TextBoundariesQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/platform/text/qt/TextBoundariesQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -26,12 +26,12 @@
*/
#include "config.h"
+#include "TextBoundaries.h"
-#include "TextBoundaries.h"
#include "NotImplemented.h"
+#include <QChar>
#include <QString>
-#include <QChar>
#include <QDebug>
#include <stdio.h>
Modified: trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -28,9 +28,9 @@
#include "PluginPackage.h"
#include "MIMETypeRegistry.h"
-#include "npruntime_impl.h"
#include "PluginDatabase.h"
#include "PluginDebug.h"
+#include "npruntime_impl.h"
#include <QFileInfo>
#include <wtf/text/CString.h>
Modified: trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp (129646 => 129647)
--- trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp 2012-09-26 15:13:12 UTC (rev 129646)
+++ trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp 2012-09-26 15:17:36 UTC (rev 129647)
@@ -56,11 +56,11 @@
#include "MouseEvent.h"
#include "NotImplemented.h"
#include "Page.h"
+#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
-#include "PlatformKeyboardEvent.h"
#include "PluginDebug.h"
+#include "PluginMainThreadScheduler.h"
#include "PluginPackage.h"
-#include "PluginMainThreadScheduler.h"
#include "QWebPageClient.h"
#include "RenderObject.h"
#include "Settings.h"
@@ -81,8 +81,8 @@
#include "QtX11ImageConversion.h"
#include <QGuiApplication>
+#include <QWindow>
#include <qpa/qplatformnativeinterface.h>
-#include <QWindow>
using JSC::ExecState;
#if USE(JSC)
