Changeset 99952 in webkit


Ignore:
Timestamp:
Nov 11, 2011, 5:19:06 AM (14 years ago)
Author:
alexis.menard@openbossa.org
Message:

[Qt] Add a way to have experimental features in WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=67707

Reviewed by Kenneth Rohde Christiansen.

.:

Add the new private QML module in the build.

  • Source/QtWebKit.pro:

Source/WebKit/qt:

This patch is adding a new module for accessing private
method and property from the view. It requires an import
QtWebKit.private in QML to be used.

  • declarative/private/plugin.cpp: Added.

(WebKitQmlPluginPrivate::registerTypes):

  • declarative/private/private.pro: Added.
  • declarative/private/qmldir: Added.

Source/WebKit2:

Add new QML extensions for our public view. This extension
returns the private object of the view so that the user could
use unstable/unreleased APIs. This requires our private class
to be exported and QObject subclass.

  • Target.pri:
  • UIProcess/API/qt/qquickwebview.cpp:
  • UIProcess/API/qt/qquickwebview_p.h:
  • UIProcess/API/qt/qquickwebviewprivateextension.cpp: Added.

(QQuickWebViewPrivateExtension::QQuickWebViewPrivateExtension):
(QQuickWebViewPrivateExtension::viewPrivate):

  • UIProcess/API/qt/qquickwebviewprivateextension_p.h: Added.
Location:
trunk
Files:
6 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r99872 r99952  
     12011-11-11  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        [Qt] Add a way to have experimental features in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=67707
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Add the new private QML module in the build.
     9
     10        * Source/QtWebKit.pro:
     11
    1122011-11-10  Balazs Kelemen  <kbalazs@webkit.org>
    213

  • trunk/Source/QtWebKit.pro

    r99843 r99952  
    1919
    2020SUBDIRS += WebKit/qt/declarative
     21haveQt(5) {
     22    SUBDIRS += WebKit/qt/declarative/private
     23}
    2124
    2225tests.file = tests.pri

  • trunk/Source/WebKit/qt/ChangeLog

    r99946 r99952  
     12011-11-11  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        [Qt] Add a way to have experimental features in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=67707
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        This patch is adding a new module for accessing private
     9        method and property from the view. It requires an import
     10        QtWebKit.private in QML to be used.
     11
     12        * declarative/private/plugin.cpp: Added.
     13        (WebKitQmlPluginPrivate::registerTypes):
     14        * declarative/private/private.pro: Added.
     15        * declarative/private/qmldir: Added.
     16
    1172011-11-11  Simon Hausmann  <simon.hausmann@nokia.com>
    218

  • trunk/Source/WebKit2/ChangeLog

    r99946 r99952  
     12011-11-11  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        [Qt] Add a way to have experimental features in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=67707
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Add new QML extensions for our public view. This extension
     9        returns the private object of the view so that the user could
     10        use unstable/unreleased APIs. This requires our private class
     11        to be exported and QObject subclass.
     12
     13        * Target.pri:
     14        * UIProcess/API/qt/qquickwebview.cpp:
     15        * UIProcess/API/qt/qquickwebview_p.h:
     16        * UIProcess/API/qt/qquickwebviewprivateextension.cpp: Added.
     17        (QQuickWebViewPrivateExtension::QQuickWebViewPrivateExtension):
     18        (QQuickWebViewPrivateExtension::viewPrivate):
     19        * UIProcess/API/qt/qquickwebviewprivateextension_p.h: Added.
     20
    1212011-11-11  Simon Hausmann  <simon.hausmann@nokia.com>
    222

  • trunk/Source/WebKit2/Target.pri

    r99946 r99952  
    248248    UIProcess/API/qt/qquickwebview.h \
    249249    UIProcess/API/qt/qquickwebview_p.h \
     250    UIProcess/API/qt/qquickwebviewprivateextension_p.h \
    250251    UIProcess/Authentication/AuthenticationChallengeProxy.h \
    251252    UIProcess/Authentication/AuthenticationDecisionListener.h \
    … …  
    547548    UIProcess/API/qt/qquickwebview.cpp \
    548549    UIProcess/API/qt/qwebpreferences.cpp \
     550    UIProcess/API/qt/qquickwebviewprivateextension.cpp \
    549551    UIProcess/Authentication/AuthenticationChallengeProxy.cpp \
    550552    UIProcess/Authentication/AuthenticationDecisionListener.cpp \

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

    r99946 r99952  
    496496
    497497#include "moc_qquickwebview.cpp"
     498#include "moc_qquickwebview_p.cpp"

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h

    r99845 r99952  
    2929#include "qquickwebview.h"
    3030
     31#include <QtCore/QObject>
    3132#include <QtCore/QScopedPointer>
    3233
    … …  
    3839QT_END_NAMESPACE
    3940
    40 class QWEBKIT_EXPORT QQuickWebViewPrivate : public WebKit::QtPolicyInterface {
     41class QWEBKIT_EXPORT QQuickWebViewPrivate : public QObject, public WebKit::QtPolicyInterface {
     42    Q_OBJECT
    4143    Q_DECLARE_PUBLIC(QQuickWebView)
    4244public:
    … …  
    5557    void updateViewportSize();
    5658    void updateViewportConstraints();
    57     void setUseTraditionalDesktopBehaviour(bool enable);
    5859
    5960    static QQuickWebViewPrivate* get(QQuickWebView* view)
    … …  
    7778    void didChangeViewportProperties(const WebCore::ViewportArguments& args);
    7879
     80public slots:
     81    void setUseTraditionalDesktopBehaviour(bool enable);
     82
     83private:
    7984    QScopedPointer<QQuickWebPage> pageView;
    8085    QScopedPointer<WebKit::QtViewInterface> viewInterface;
Note: See TracChangeset for help on using the changeset viewer.