Changeset 52261 in webkit


Ignore:
Timestamp:
Dec 17, 2009 10:39:42 AM (14 years ago)
Author:
eric@webkit.org
Message:

2009-12-17 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] support navigator.onLine and ononline/onoffline events.
​https://bugs.webkit.org/show_bug.cgi?id=32555

Hooked up Bearer Management to NetworkStateNotifier. This solution is available
only if QtMobility's Bearer Management is installed.

  • WebCore.pro:
  • platform/network/NetworkStateNotifier.h:
  • platform/network/qt/NetworkStateNotifierPrivate.h: Added.
  • platform/network/qt/NetworkStateNotifierQt.cpp: Added. (WebCore::NetworkStateNotifierPrivate::NetworkStateNotifierPrivate): (WebCore::NetworkStateNotifierPrivate::onlineStateChanged): (WebCore::NetworkStateNotifierPrivate::~NetworkStateNotifierPrivate): (WebCore::NetworkStateNotifier::updateState): (WebCore::NetworkStateNotifier::NetworkStateNotifier):
Location:
trunk/WebCore
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r52260 r52261  
     12009-12-17  Yael Aharon  <yael.aharon@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] support navigator.onLine and ononline/onoffline events.
     6        https://bugs.webkit.org/show_bug.cgi?id=32555
     7
     8        Hooked up Bearer Management to NetworkStateNotifier. This solution is available
     9        only if QtMobility's Bearer Management is installed.
     10
     11        * WebCore.pro:
     12        * platform/network/NetworkStateNotifier.h:
     13        * platform/network/qt/NetworkStateNotifierPrivate.h: Added.
     14        * platform/network/qt/NetworkStateNotifierQt.cpp: Added.
     15        (WebCore::NetworkStateNotifierPrivate::NetworkStateNotifierPrivate):
     16        (WebCore::NetworkStateNotifierPrivate::onlineStateChanged):
     17        (WebCore::NetworkStateNotifierPrivate::~NetworkStateNotifierPrivate):
     18        (WebCore::NetworkStateNotifier::updateState):
     19        (WebCore::NetworkStateNotifier::NetworkStateNotifier):
     20
    1212009-12-17  Pavel Feldman  <pfeldman@chromium.org>
    222

  • trunk/WebCore/WebCore.pro

    r52199 r52261  
    178178    contains(QT_CONFIG, xmlpatterns):!lessThan(QT_MINOR_VERSION, 5):DEFINES += ENABLE_XSLT=1
    179179    else:DEFINES += ENABLE_XSLT=0
     180}
     181
     182
     183!contains(DEFINES, ENABLE_QT_BEARER=.) {
     184    symbian: {
     185        exists($${EPOCROOT}epoc32/release/winscw/udeb/QtBearer.lib)| \
     186        exists($${EPOCROOT}epoc32/release/armv5/lib/QtBearer.lib) {
     187            DEFINES += ENABLE_QT_BEARER=1
     188        }
     189    }
    180190}
    181191
    … …  
    28922902}
    28932903
     2904contains(DEFINES, ENABLE_QT_BEARER=1) {
     2905    HEADERS += \
     2906        platform/network/qt/NetworkStateNotifierPrivate.h
     2907
     2908    SOURCES += \
     2909        platform/network/qt/NetworkStateNotifierQt.cpp
     2910
     2911    LIBS += -lQtBearer
     2912
     2913}
     2914
    28942915contains(DEFINES, ENABLE_SVG=1) {
    28952916    FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1

  • trunk/WebCore/platform/network/NetworkStateNotifier.h

    r51179 r52261  
    4949namespace WebCore {
    5050
     51#if (PLATFORM(QT) && ENABLE(QT_BEARER))
     52class NetworkStateNotifierPrivate;
     53#endif
     54
    5155class NetworkStateNotifier : public Noncopyable {
    5256public:
    … …  
    8185#elif PLATFORM(CHROMIUM)
    8286    NetworkStateNotifierPrivate p;
     87
     88#elif PLATFORM(QT) && ENABLE(QT_BEARER)
     89    friend class NetworkStateNotifierPrivate;
     90    NetworkStateNotifierPrivate* p;
    8391#endif
    8492};
    8593
    86 #if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(CHROMIUM)
     94#if !PLATFORM(MAC) && !PLATFORM(WIN) && !PLATFORM(CHROMIUM) && !(PLATFORM(QT) && ENABLE(QT_BEARER))
    8795
    8896inline NetworkStateNotifier::NetworkStateNotifier()
Note: See TracChangeset for help on using the changeset viewer.