Changeset 102679 in webkit


Ignore:
Timestamp:
Dec 13, 2011, 7:19:50 AM (13 years ago)
Author:
vestbo@webkit.org
Message:

[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.

Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r102624 r102679  
     12011-12-13  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
     2
     3        [Qt] Get rid of layering violations in includes
     4
     5        WebKit/qt/API and WebKit/qt/WebCoreSupport should not be included
     6        in the webcore.prf, but rather in each target that specificly needs
     7        headers in these location. We used to include them directly in webcore
     8        since we had layering violations between WebCore and WebKit, but now
     9        that they are gone there's no reason to do that.
     10
     11        Reviewed by Simon Hausmann.
     12
     13        * Source/api.pri:
     14
    1152011-12-12  Andy Wingo  <wingo@igalia.com>
    216

  • trunk/Source/WebCore/ChangeLog

    r102671 r102679  
     12011-12-13  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
     2
     3        [Qt] Get rid of layering violations in includes
     4
     5        WebKit/qt/API and WebKit/qt/WebCoreSupport should not be included
     6        in the webcore.prf, but rather in each target that specificly needs
     7        headers in these location. We used to include them directly in webcore
     8        since we had layering violations between WebCore and WebKit, but now
     9        that they are gone there's no reason to do that.
     10
     11        Reviewed by Simon Hausmann.
     12
     13        * bridge/qt/qt_instance.cpp:
     14        * platform/graphics/qt/GraphicsContext3DQt.cpp:
     15        * platform/graphics/qt/ImageQt.cpp:
     16        * platform/network/qt/QNetworkReplyHandler.cpp:
     17        * platform/network/qt/ResourceHandleQt.cpp:
     18        * platform/qt/CookieJarQt.cpp:
     19        * platform/qt/RenderThemeQStyle.cpp:
     20        * platform/qt/RenderThemeQt.cpp:
     21
    1222011-12-13  Vsevolod Vlasov  <vsevik@chromium.org>
    223

  • trunk/Source/WebCore/bridge/qt/qt_instance.cpp

    r100658 r102679  
    3636#include <qmetaobject.h>
    3737#include <qmetatype.h>
    38 #include <qwebelement.h>
    3938
    4039namespace JSC {

  • trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

    r101578 r102679  
    3737#include "QWebPageClient.h"
    3838#include "SharedBuffer.h"
    39 #include "qwebpage.h"
    4039#include <QAbstractScrollArea>
    4140#include <QGraphicsObject>

  • trunk/Source/WebCore/platform/graphics/qt/ImageQt.cpp

    r102404 r102679  
    4141#include "ShadowBlur.h"
    4242#include "StillImageQt.h"
    43 #include "qwebsettings.h"
    4443
    4544#include <QApplication>

  • trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

    r100731 r102679  
    3434#include <QNetworkReply>
    3535#include <QNetworkCookie>
    36 #include <qwebframe.h>
    37 #include <qwebpage.h>
    3836
    3937#include <wtf/text/CString.h>

  • trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp

    r95120 r102679  
    3131#include "ResourceHandle.h"
    3232
    33 #include "ChromeClientQt.h"
    3433#include "CachedResourceLoader.h"
    3534#include "Frame.h"
    3635#include "FrameNetworkingContext.h"
    37 #include "FrameLoaderClientQt.h"
    3836#include "NotImplemented.h"
    3937#include "Page.h"

  • trunk/Source/WebCore/platform/qt/CookieJarQt.cpp

    r100731 r102679  
    3434#include "Cookie.h"
    3535#include "Document.h"
    36 #include "FrameLoaderClientQt.h"
     36#include "Frame.h"
     37#include "FrameLoader.h"
    3738#include "KURL.h"
    3839#include "NetworkingContext.h"
    … …  
    4445#include <QSqlQuery>
    4546#include <QStringList>
     47#include <QVariant>
    4648
    4749namespace WebCore {

  • trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp

    r102589 r102679  
    3535#include "CSSValueKeywords.h"
    3636#include "Chrome.h"
    37 #include "ChromeClientQt.h"
     37#include "ChromeClient.h"
    3838#include "Color.h"
    3939#include "Document.h"

  • trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

    r100270 r102679  
    3434#include "CSSValueKeywords.h"
    3535#include "Chrome.h"
    36 #include "ChromeClientQt.h"
     36#include "ChromeClient.h"
    3737#include "Color.h"
    3838#include "Font.h"

  • trunk/Source/api.pri

    r101477 r102679  
    8080    $$PWD/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.h
    8181
     82INCLUDEPATH += $$PWD/WebKit/qt/WebCoreSupport
     83
    8284contains(DEFINES, ENABLE_VIDEO=1) {
    8385    !contains(DEFINES, WTF_USE_QTKIT=1):!contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {

  • trunk/Tools/ChangeLog

    r102677 r102679  
     12011-12-13  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
     2
     3        [Qt] Get rid of layering violations in includes
     4
     5        WebKit/qt/API and WebKit/qt/WebCoreSupport should not be included
     6        in the webcore.prf, but rather in each target that specificly needs
     7        headers in these location. We used to include them directly in webcore
     8        since we had layering violations between WebCore and WebKit, but now
     9        that they are gone there's no reason to do that.
     10
     11        Reviewed by Simon Hausmann.
     12
     13        * DumpRenderTree/qt/DumpRenderTree.pro:
     14        * QtTestBrowser/launcherwindow.h:
     15        * WebKitTestRunner/InjectedBundle/Target.pri:
     16        * qmake/mkspecs/features/webcore.prf:
     17        * qmake/mkspecs/features/webkit2.prf:
     18
    1192011-12-13  János Badics  <dicska@gmail.com>
    220

  • trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro

    r101493 r102679  
    1717CONFIG += qtwebkit
    1818
    19 INCLUDEPATH += $$PWD/..
     19INCLUDEPATH += \
     20    $$PWD/.. \
     21    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport
    2022
    2123!embedded: PKGCONFIG += fontconfig

  • trunk/Tools/QtTestBrowser/launcherwindow.h

    r99274 r102679  
    5757#include <qwebsettings.h>
    5858
    59 #include "DumpRenderTreeSupportQt.h"
    6059#include "mainwindow.h"
    6160#include "urlloader.h"

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri

    r101247 r102679  
    6363    $$PWD/.. \
    6464    $$PWD/Bindings \
    65     $${ROOT_WEBKIT_DIR}/Source/WebCore/testing/js
     65    $${ROOT_WEBKIT_DIR}/Source/WebCore/testing/js \
     66    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport
    6667
    6768PREFIX_HEADER = $$PWD/../WebKitTestRunnerPrefix.h

  • trunk/Tools/qmake/mkspecs/features/webcore.prf

    r102237 r102679  
    113113    $$SOURCE_DIR/WebCore/platform/network/qt \
    114114    $$SOURCE_DIR/WebCore/platform/qt \
    115     $$SOURCE_DIR/WebKit/qt/Api \
    116     $$SOURCE_DIR/WebKit/qt/WebCoreSupport \
    117115    $$WEBCORE_INCLUDEPATH
    118116

  • trunk/Tools/qmake/mkspecs/features/webkit2.prf

    r102363 r102679  
    6565    $$SOURCE_DIR/WebKit2/PluginProcess
    6666
     67# The WebKit2 Qt APIs depend on qwebkitglobal.h, which lives in WebKit
     68WEBKIT2_INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/Api
     69
    6770INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$INCLUDEPATH
    6871
Note: See TracChangeset for help on using the changeset viewer.