Changeset 48219 in webkit


Ignore:
Timestamp:
Sep 9, 2009 1:15:18 PM (15 years ago)
Author:
kenneth@webkit.org
Message:

.: [Qt] Add the alternative QtLauncher (based on QGraphicsView) to the build.

Patch by Kenneth Rohde Christiansen <​kenneth@webkit.org> on 2009-09-09
Reviewed by Simon Hausmann.

​https://bugs.webkit.org/show_bug.cgi?id=28862

  • WebKit.pro:

WebCore: Add the qwebgraphicsitem.cpp to the build system.

Patch by Kenneth Rohde Christiansen <​kenneth@webkit.org> on 2009-09-09
Reviewed by Simon Hausmann.

​https://bugs.webkit.org/show_bug.cgi?id=28862

  • WebCore.pro:

WebKit/qt: Add a new QGraphicsWidget based version of the "QWebView"
under the name "QWebGraphicsItem".

Patch by Kenneth Rohde Christiansen <​kenneth@webkit.org>, Antonio Gomes <​antonio.gomes@openbossa.org> on 2009-09-09
Reviewed by Simon Hausmann.

​https://bugs.webkit.org/show_bug.cgi?id=28862

Includes an alternative Qt launcher using the QGraphicsView.

  • Api/headers.pri:
  • Api/qwebgraphicsitem.cpp: Added.
  • Api/qwebgraphicsitem.h: Added.
  • Api/qwebpage.h:
  • QGVLauncher/QGVLauncher.pro: Copied from WebKit/qt/QtLauncher/QtLauncher.pro.
  • QGVLauncher/main.cpp: Added.
  • WebCoreSupport/ChromeClientQt.cpp:

(WebCore::ChromeClientQt::repaint):
(WebCore::ChromeClientQt::scroll):

Location:
trunk
Files:
5 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r48123 r48219  
     12009-09-09  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        [Qt] Add the alternative QtLauncher (based on QGraphicsView) to the build.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=28862
     8
     9        * WebKit.pro:
     10
    1112009-09-07  Xan Lopez  <xlopez@igalia.com>
    212

  • trunk/WebCore/ChangeLog

    r48213 r48219  
     12009-09-09  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        Add the qwebgraphicsitem.cpp to the build system.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=28862
     8
     9        * WebCore.pro:
     10
    1112009-09-08  Kevin Watters  <kevinwatters@gmail.com>
    212

  • trunk/WebCore/WebCore.pro

    r48180 r48219  
    23802380    ../WebKit/qt/WebCoreSupport/InspectorClientQt.cpp \
    23812381    ../WebKit/qt/Api/qwebframe.cpp \
     2382    ../WebKit/qt/Api/qwebgraphicsitem.cpp \
    23822383    ../WebKit/qt/Api/qwebpage.cpp \
    23832384    ../WebKit/qt/Api/qwebview.cpp \

  • trunk/WebKit.pro

    r47033 r48219  
    66        JavaScriptCore/jsc.pro \
    77        WebKit/qt/QtLauncher \
     8        WebKit/qt/QGVLauncher \
    89        WebKit/qt/tests
    910

  • trunk/WebKit/qt/Api/headers.pri

    r46762 r48219  
    11WEBKIT_API_HEADERS = $$PWD/qwebframe.h \
     2                     $$PWD/qwebgraphicsitem.h \
    23                     $$PWD/qwebkitglobal.h \
    34                     $$PWD/qwebpage.h \

  • trunk/WebKit/qt/Api/qwebpage.h

    r46170 r48219  
    352352    friend class QWebPagePrivate;
    353353    friend class QWebView;
     354    friend class QWebGraphicsItem;
    354355    friend class WebCore::ChromeClientQt;
    355356    friend class WebCore::EditorClientQt;

  • trunk/WebKit/qt/ChangeLog

    r48179 r48219  
     12009-09-09  Kenneth Rohde Christiansen  <kenneth@webkit.org>, Antonio Gomes  <antonio.gomes@openbossa.org>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        Add a new QGraphicsWidget based version of the "QWebView"
     6        under the name "QWebGraphicsItem".
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=28862
     9
     10        Includes an alternative Qt launcher using the QGraphicsView.
     11
     12        * Api/headers.pri:
     13        * Api/qwebgraphicsitem.cpp: Added.
     14        * Api/qwebgraphicsitem.h: Added.
     15        * Api/qwebpage.h:
     16        * QGVLauncher/QGVLauncher.pro: Copied from WebKit/qt/QtLauncher/QtLauncher.pro.
     17        * QGVLauncher/main.cpp: Added.
     18        * WebCoreSupport/ChromeClientQt.cpp:
     19        (WebCore::ChromeClientQt::repaint):
     20        (WebCore::ChromeClientQt::scroll):
     21
    1222009-09-08  Kenneth Rohde Christiansen  <kenneth@webkit.org>
    223

  • trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

    r46344 r48219  
    4646#include "qwebsecurityorigin.h"
    4747#include "qwebsecurityorigin_p.h"
     48#include "qwebview.h"
    4849
    4950#include <qtooltip.h>
    … …  
    308309    // No double buffer, so only update the QWidget if content changed.
    309310    if (contentChanged) {
    310         QWidget* view = m_webPage->view();
    311         if (view) {
     311        // Only do implicit paints for QWebView's
     312        if (QWebView* view = qobject_cast<QWebView*>(m_webPage->view())) {
    312313            QRect rect(windowRect);
    313314            rect = rect.intersected(QRect(QPoint(0, 0), m_webPage->viewportSize()));
    … …  
    324325void ChromeClientQt::scroll(const IntSize& delta, const IntRect& scrollViewRect, const IntRect&)
    325326{
    326     QWidget* view = m_webPage->view();
    327     if (view)
     327    // Only do implicit paints for QWebView's
     328    if (QWebView* view = qobject_cast<QWebView*>(m_webPage->view()))
    328329        view->scroll(delta.width(), delta.height(), scrollViewRect);
    329330    emit m_webPage->scrollRequested(delta.width(), delta.height(), scrollViewRect);
Note: See TracChangeset for help on using the changeset viewer.