Reorder Qt WebCore includes
authorkenneth@webkit.org <kenneth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Sep 2012 15:17:36 +0000 (15:17 +0000)
committerkenneth@webkit.org <kenneth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Sep 2012 15:17:36 +0000 (15:17 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@129647 268f45cc-cd09-0410-ab3c-d52691b4dbfc

23 files changed:
Source/WebCore/ChangeLog
Source/WebCore/bridge/qt/qt_instance.cpp
Source/WebCore/bridge/qt/qt_instance.h
Source/WebCore/bridge/qt/qt_pixmapruntime.cpp
Source/WebCore/bridge/qt/qt_runtime.cpp
Source/WebCore/platform/graphics/qt/FontCacheQt.cpp
Source/WebCore/platform/graphics/qt/FontCustomPlatformData.h
Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
Source/WebCore/platform/graphics/qt/ImageDecoderQt.h
Source/WebCore/platform/graphics/qt/PathQt.cpp
Source/WebCore/platform/graphics/qt/TransformationMatrixQt.cpp
Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
Source/WebCore/platform/network/qt/DnsPrefetchHelper.h
Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
Source/WebCore/platform/network/qt/ResourceHandleQt.cpp
Source/WebCore/platform/qt/ClipboardQt.cpp
Source/WebCore/platform/qt/GamepadsQt.cpp
Source/WebCore/platform/qt/PasteboardQt.cpp
Source/WebCore/platform/qt/PlatformScreenQt.cpp
Source/WebCore/platform/qt/RenderThemeQt.cpp
Source/WebCore/platform/text/qt/TextBoundariesQt.cpp
Source/WebCore/plugins/qt/PluginPackageQt.cpp
Source/WebCore/plugins/qt/PluginViewQt.cpp

index c75d3bf..d55733c 100644 (file)
@@ -1,3 +1,33 @@
+2012-09-26  Kenneth Rohde Christiansen  <kenneth@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.dumez@intel.com>
 
         [EFL] mediaControlsEflFullscreen.css overrides regular media controls styling
 2012-09-26  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL] mediaControlsEflFullscreen.css overrides regular media controls styling
index fe942ba..a13e3ff 100644 (file)
@@ -30,8 +30,8 @@
 #include "PropertyNameArray.h"
 #include "qt_class.h"
 #include "qt_runtime.h"
 #include "PropertyNameArray.h"
 #include "qt_class.h"
 #include "qt_runtime.h"
-#include "runtime_object.h"
 #include "runtime/FunctionPrototype.h"
 #include "runtime/FunctionPrototype.h"
+#include "runtime_object.h"
 
 #include <qdebug.h>
 #include <qhash.h>
 
 #include <qdebug.h>
 #include <qhash.h>
index 54df34b..09d43bc 100644 (file)
@@ -22,9 +22,9 @@
 
 #include "BridgeJSC.h"
 #include "JSWeakObjectMapRefPrivate.h"
 
 #include "BridgeJSC.h"
 #include "JSWeakObjectMapRefPrivate.h"
-#include <QPointer>
 #include "Weak.h"
 #include "runtime_root.h"
 #include "Weak.h"
 #include "runtime_root.h"
+#include <QPointer>
 #include <qhash.h>
 #include <qset.h>
 
 #include <qhash.h>
 #include <qset.h>
 
index af6c07d..150724b 100644 (file)
 #include "JSRetainPtr.h"
 #include "JavaScript.h"
 #include "StillImageQt.h"
 #include "JSRetainPtr.h"
 #include "JavaScript.h"
 #include "StillImageQt.h"
-#include <QtEndian>
 #include <QBuffer>
 #include <QByteArray>
 #include <QColor>
 #include <QImage>
 #include <QPixmap>
 #include <QVariant>
 #include <QBuffer>
 #include <QByteArray>
 #include <QColor>
 #include <QImage>
 #include <QPixmap>
 #include <QVariant>
+#include <QtEndian>
 
 using namespace WebCore;
 namespace JSC {
 
 using namespace WebCore;
 namespace JSC {
index 8c480c2..951fa1c 100644 (file)
 #include "Interpreter.h"
 #include "JSArray.h"
 #include "JSContextRefPrivate.h"
 #include "Interpreter.h"
 #include "JSArray.h"
 #include "JSContextRefPrivate.h"
-#include "JSDocument.h"
 #include "JSDOMBinding.h"
 #include "JSDOMWindow.h"
 #include "JSDOMBinding.h"
 #include "JSDOMWindow.h"
-#include <JSFunction.h>
+#include "JSDocument.h"
 #include "JSGlobalObject.h"
 #include "JSHTMLElement.h"
 #include "JSLock.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 "qt_instance.h"
 #include "qt_pixmapruntime.h"
 #include "qvarlengtharray.h"
+#include <JSFunction.h>
 
 #include <wtf/DateMath.h>
 
 
 #include <wtf/DateMath.h>
 
index b58198f..562ec57 100644 (file)
@@ -25,9 +25,9 @@
 #include "config.h"
 #include "FontCache.h"
 
 #include "config.h"
 #include "FontCache.h"
 
+#include "Font.h"
 #include "FontDescription.h"
 #include "FontPlatformData.h"
 #include "FontDescription.h"
 #include "FontPlatformData.h"
-#include "Font.h"
 #include <utility>
 #include <wtf/ListHashSet.h>
 #include <wtf/StdLibExtras.h>
 #include <utility>
 #include <wtf/ListHashSet.h>
 #include <wtf/StdLibExtras.h>
index fbf9a15..8d4efec 100644 (file)
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
 #include "TextOrientation.h"
 #include "FontRenderingMode.h"
 #include "FontWidthVariant.h"
 #include "TextOrientation.h"
+#include <QRawFont>
 #include <wtf/FastAllocBase.h>
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/FastAllocBase.h>
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
-#include <QRawFont>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index f039e43..d45e61c 100644 (file)
@@ -29,8 +29,8 @@
 #include "config.h"
 #include "ImageDecoderQt.h"
 
 #include "config.h"
 #include "ImageDecoderQt.h"
 
-#include <QtCore/QByteArray>
 #include <QtCore/QBuffer>
 #include <QtCore/QBuffer>
+#include <QtCore/QByteArray>
 #include <QtGui/QImageReader>
 
 namespace WebCore {
 #include <QtGui/QImageReader>
 
 namespace WebCore {
index 3e421c3..8ae3b42 100644 (file)
 #define ImageDecoderQt_h
 
 #include "ImageDecoder.h"
 #define ImageDecoderQt_h
 
 #include "ImageDecoder.h"
+#include <QtCore/QBuffer>
+#include <QtCore/QHash>
+#include <QtCore/QList>
 #include <QtGui/QImageReader>
 #include <QtGui/QPixmap>
 #include <QtGui/QImageReader>
 #include <QtGui/QPixmap>
-#include <QtCore/QList>
-#include <QtCore/QHash>
-#include <QtCore/QBuffer>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
index 4f65151..b3c6337 100644 (file)
@@ -38,8 +38,8 @@
 #include "NativeImageQt.h"
 #include "StrokeStyleApplier.h"
 #include <QPainterPath>
 #include "NativeImageQt.h"
 #include "StrokeStyleApplier.h"
 #include <QPainterPath>
-#include <QTransform>
 #include <QString>
 #include <QString>
+#include <QTransform>
 #include <wtf/MathExtras.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/text/WTFString.h>
 #include <wtf/MathExtras.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/text/WTFString.h>
index 7ff432b..73a0e41 100644 (file)
@@ -27,8 +27,8 @@
 #include "AffineTransform.h"
 #include "TransformationMatrix.h"
 
 #include "AffineTransform.h"
 #include "TransformationMatrix.h"
 
-#include "IntRect.h"
 #include "FloatRect.h"
 #include "FloatRect.h"
+#include "IntRect.h"
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index 1bbeb73..57c0f04 100644 (file)
 
 #include "TextureMapperGL.h"
 // Qt headers must be included before glx headers.
 
 #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 <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 <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xrender.h>
+#include <qpa/qplatformwindow.h>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index b57729d..d2ab1cf 100644 (file)
@@ -19,9 +19,9 @@
 #ifndef DnsPrefetchHelper_h
 #define DnsPrefetchHelper_h
 
 #ifndef DnsPrefetchHelper_h
 #define DnsPrefetchHelper_h
 
-#include <QObject>
 #include <QCache>
 #include <QHostInfo>
 #include <QCache>
 #include <QHostInfo>
+#include <QObject>
 #include <QSet>
 #include <QString>
 #include <QTime>
 #include <QSet>
 #include <QString>
 #include <QTime>
index 116acb2..8d43dd0 100644 (file)
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
 #include "ResourceHandleInternal.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
 #include "ResourceHandleInternal.h"
-#include "ResourceResponse.h"
 #include "ResourceRequest.h"
 #include "ResourceRequest.h"
+#include "ResourceResponse.h"
 #include <QDateTime>
 #include <QFile>
 #include <QFileInfo>
 #include <QDateTime>
 #include <QFile>
 #include <QFileInfo>
-#include <QNetworkReply>
 #include <QNetworkCookie>
 #include <QNetworkCookie>
+#include <QNetworkReply>
 
 #include <wtf/text/CString.h>
 
 
 #include <wtf/text/CString.h>
 
-#include <QDebug>
 #include <QCoreApplication>
 #include <QCoreApplication>
+#include <QDebug>
 
 // 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.
 
 // 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.
index 262ceb7..2c2acbe 100644 (file)
 
 #include <QAbstractNetworkCache>
 #include <QCoreApplication>
 
 #include <QAbstractNetworkCache>
 #include <QCoreApplication>
-#include <QUrl>
 #include <QNetworkAccessManager>
 #include <QNetworkAccessManager>
-#include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QUrl>
 
 namespace WebCore {
 
 
 namespace WebCore {
 
index e156992..c0f4cd1 100644 (file)
@@ -48,8 +48,8 @@
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
-#include <QGuiApplication>
 #include <QClipboard>
 #include <QClipboard>
+#include <QGuiApplication>
 #include <QImage>
 #include <QList>
 #include <QMimeData>
 #include <QImage>
 #include <QList>
 #include <QMimeData>
index 624fde9..dc4f16a 100644 (file)
@@ -34,7 +34,7 @@
 #include <QSocketNotifier>
 
 extern "C" {
 #include <QSocketNotifier>
 
 extern "C" {
-    #include <libudev.h>
+#include <libudev.h>
 }
 
 #include <unistd.h>
 }
 
 #include <unistd.h>
index 66b0e40..a0beb48 100644 (file)
@@ -35,9 +35,9 @@
 #include "Image.h"
 #include "RenderImage.h"
 #include "markup.h"
 #include "Image.h"
 #include "RenderImage.h"
 #include "markup.h"
-#include <qguiapplication.h>
 #include <qclipboard.h>
 #include <qdebug.h>
 #include <qclipboard.h>
 #include <qdebug.h>
+#include <qguiapplication.h>
 #include <qmimedata.h>
 #include <qurl.h>
 
 #include <qmimedata.h>
 #include <qurl.h>
 
index fa2e837..d082302 100644 (file)
@@ -36,8 +36,8 @@
 #include "FrameView.h"
 #include "HostWindow.h"
 #include "NotImplemented.h"
 #include "FrameView.h"
 #include "HostWindow.h"
 #include "NotImplemented.h"
-#include "Widget.h"
 #include "QWebPageClient.h"
 #include "QWebPageClient.h"
+#include "Widget.h"
 #include <QGuiApplication>
 #include <QScreen>
 
 #include <QGuiApplication>
 #include <QScreen>
 
index 1de8153..af36a4f 100644 (file)
 #include "UserAgentStyleSheets.h"
 #include <wtf/text/StringBuilder.h>
 
 #include "UserAgentStyleSheets.h"
 #include <wtf/text/StringBuilder.h>
 
-#include <QGuiApplication>
 #include <QColor>
 #include <QFile>
 #include <QFontMetrics>
 #include <QColor>
 #include <QFile>
 #include <QFontMetrics>
+#include <QGuiApplication>
 
 #include <QStyleHints>
 
 
 #include <QStyleHints>
 
index a354ca6..c66d738 100644 (file)
  */
 
 #include "config.h"
  */
 
 #include "config.h"
-
 #include "TextBoundaries.h"
 #include "TextBoundaries.h"
+
 #include "NotImplemented.h"
 
 #include "NotImplemented.h"
 
-#include <QString>
 #include <QChar>
 #include <QChar>
+#include <QString>
 
 #include <QDebug>
 #include <stdio.h>
 
 #include <QDebug>
 #include <stdio.h>
index ddab475..98c5758 100644 (file)
@@ -28,9 +28,9 @@
 #include "PluginPackage.h"
 
 #include "MIMETypeRegistry.h"
 #include "PluginPackage.h"
 
 #include "MIMETypeRegistry.h"
-#include "npruntime_impl.h"
 #include "PluginDatabase.h"
 #include "PluginDebug.h"
 #include "PluginDatabase.h"
 #include "PluginDebug.h"
+#include "npruntime_impl.h"
 #include <QFileInfo>
 #include <wtf/text/CString.h>
 
 #include <QFileInfo>
 #include <wtf/text/CString.h>
 
index 9bc0227..579ed03 100644 (file)
 #include "MouseEvent.h"
 #include "NotImplemented.h"
 #include "Page.h"
 #include "MouseEvent.h"
 #include "NotImplemented.h"
 #include "Page.h"
-#include "PlatformMouseEvent.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformKeyboardEvent.h"
+#include "PlatformMouseEvent.h"
 #include "PluginDebug.h"
 #include "PluginDebug.h"
-#include "PluginPackage.h"
 #include "PluginMainThreadScheduler.h"
 #include "PluginMainThreadScheduler.h"
+#include "PluginPackage.h"
 #include "QWebPageClient.h"
 #include "RenderObject.h"
 #include "Settings.h"
 #include "QWebPageClient.h"
 #include "RenderObject.h"
 #include "Settings.h"
@@ -81,8 +81,8 @@
 
 #include "QtX11ImageConversion.h"
 #include <QGuiApplication>
 
 #include "QtX11ImageConversion.h"
 #include <QGuiApplication>
-#include <qpa/qplatformnativeinterface.h>
 #include <QWindow>
 #include <QWindow>
+#include <qpa/qplatformnativeinterface.h>
 
 using JSC::ExecState;
 #if USE(JSC)
 
 using JSC::ExecState;
 #if USE(JSC)