ChangeLog

2012-03-14  Dinu Jacob  <dinu.jacob@nokia.com>

        [Qt][WK2] Move code common to both ProxyAuthentication and Authentication context objects into a base class

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

        Reviewed by Kenneth Rohde Christiansen.

        No impact to AML API.

        * UIProcess/qt/QtDialogRunner.cpp:

        (BaseAuthenticationContextObject):

        (BaseAuthenticationContextObject::BaseAuthenticationContextObject):

        (HttpAuthenticationDialogContextObject):

        (HttpAuthenticationDialogContextObject::HttpAuthenticationDialogContextObject):

        (HttpAuthenticationDialogContextObject::realm):

        (ProxyAuthenticationDialogContextObject):

        (ProxyAuthenticationDialogContextObject::ProxyAuthenticationDialogContextObject):

        (QtDialogRunner::initForAuthentication):

2012-03-13  Anders Carlsson  <andersca@apple.com>

        Find bouncy doesn’t hide when a subframe is scrolled

Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp

@@private:

    QString m_defaultValue;

};

72 class Authentication~~Dialog~~ContextObject : public QObject {

72class BaseAuthenticationContextObject : public QObject {

7373 Q_OBJECT

7474 Q_PROPERTY(QString hostname READ hostname CONSTANT)

75 Q_PROPERTY(QString realm READ realm CONSTANT)

    Q_PROPERTY(QString prefilledUsername READ prefilledUsername CONSTANT)

public:

79 Authentication~~Dialog~~ContextObject(const QString& hostname, const QString& ~~realm, const QString&~~ prefilledUsername)

78 BaseAuthenticationContextObject(const QString& hostname, const QString& prefilledUsername)

8079 : QObject()

8180 , m_hostname(hostname)

82 , m_realm(realm)

        , m_prefilledUsername(prefilledUsername)

    {

    }

    QString hostname() const { return m_hostname; }

88 QString realm() const { return m_realm; }

    QString prefilledUsername() const { return m_prefilledUsername; }

public slots:

@@signals:

private:

    QString m_hostname;

101 QString m_realm;

    QString m_prefilledUsername;

};

105 class ProxyAuthenticationDialogContextObject : public QObject {

class HttpAuthenticationDialogContextObject : public BaseAuthenticationContextObject {

    Q_OBJECT

    Q_PROPERTY(QString realm READ realm CONSTANT)

public:

    HttpAuthenticationDialogContextObject(const QString& hostname, const QString& realm, const QString& prefilledUsername)

        : BaseAuthenticationContextObject(hostname, prefilledUsername)

        , m_realm(realm)

    {

    }

    QString realm() const { return m_realm; }

private:

    QString m_realm;

};

class ProxyAuthenticationDialogContextObject : public BaseAuthenticationContextObject {

106119 Q_OBJECT

107 Q_PROPERTY(QString hostname READ hostname CONSTANT)

108120 Q_PROPERTY(quint16 port READ port CONSTANT)

109 Q_PROPERTY(QString prefilledUsername READ prefilledUsername CONSTANT)

public:

    ProxyAuthenticationDialogContextObject(const QString& hostname, quint16 port, const QString& prefilledUsername)

113 : QObject()

114 , m_hostname(hostname)

124 : BaseAuthenticationContextObject(hostname, prefilledUsername)

115125 , m_port(port)

116 , m_prefilledUsername(prefilledUsername)

    {

    }

120 QString hostname() const { return m_hostname; }

121129 quint16 port() const { return m_port; }

    QString prefilledUsername() const { return m_prefilledUsername; }

public slots:

    void accept(const QString& username, const QString& password) { emit accepted(username, password); }

    void reject() { emit rejected(); }

signals:

    void accepted(const QString& username, const QString& password);

    void rejected();

131130

132131private:

133 QString m_hostname;

134132 quint16 m_port;

135 QString m_prefilledUsername;

};

class CertificateVerificationDialogContextObject : public QObject {

@@bool QtDialogRunner::initForPrompt(QDeclarativeComponent* component, QQuickItem*

bool QtDialogRunner::initForAuthentication(QDeclarativeComponent* component, QQuickItem* dialogParent, const QString& hostname, const QString& realm, const QString& prefilledUsername)

{

199 AuthenticationDialogContextObject* contextObject = new AuthenticationDialogContextObject(hostname, realm, prefilledUsername);

196 HttpAuthenticationDialogContextObject* contextObject = new HttpAuthenticationDialogContextObject(hostname, realm, prefilledUsername);

    if (!createDialog(component, dialogParent, contextObject))

        return false;