diff options
| author | Andrei Popescu <andreip@google.com> | 2009-12-23 13:07:26 +0000 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2010-01-08 12:22:27 +0000 |
| commit | f07202aa5d185feb2bd6a0a038123863aadb3491 (patch) | |
| tree | 9798c2aee5b7a02086e70e68dc433041b55d54e8 /WebCore | |
| parent | b4ca27904cd6e62bd2b633ea156c1cefc3413171 (diff) | |
| download | external_webkit-f07202aa5d185feb2bd6a0a038123863aadb3491.zip external_webkit-f07202aa5d185feb2bd6a0a038123863aadb3491.tar.gz external_webkit-f07202aa5d185feb2bd6a0a038123863aadb3491.tar.bz2 | |
Update WebCore/platform/network with changes upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=32871
https://bugs.webkit.org/show_bug.cgi?id=32873
This will be submitted once the above changes land upstream.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/network/NetworkStateNotifier.h | 8 | ||||
| -rw-r--r-- | WebCore/platform/network/ResourceHandle.h | 2 | ||||
| -rw-r--r-- | WebCore/platform/network/ResourceHandleInternal.h | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/WebCore/platform/network/NetworkStateNotifier.h b/WebCore/platform/network/NetworkStateNotifier.h index a630ccd..570ced0 100644 --- a/WebCore/platform/network/NetworkStateNotifier.h +++ b/WebCore/platform/network/NetworkStateNotifier.h @@ -78,12 +78,12 @@ private: HANDLE m_waitHandle; OVERLAPPED m_overlapped; -#elif PLATFORM(ANDROID) -public: - void networkStateChange(bool online); - #elif PLATFORM(CHROMIUM) NetworkStateNotifierPrivate p; + +#elif PLATFORM(ANDROID) +public: + void networkStateChange(bool online); #endif }; diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h index e7f6092..b764add 100644 --- a/WebCore/platform/network/ResourceHandle.h +++ b/WebCore/platform/network/ResourceHandle.h @@ -170,7 +170,7 @@ public: friend LRESULT __stdcall ResourceHandleWndProc(HWND, unsigned message, WPARAM, LPARAM); #endif -#if PLATFORM(QT) || USE(CURL) || USE(SOUP) || defined(ANDROID) +#if PLATFORM(QT) || USE(CURL) || USE(SOUP) || PLATFORM(ANDROID) ResourceHandleInternal* getInternal() { return d.get(); } #endif diff --git a/WebCore/platform/network/ResourceHandleInternal.h b/WebCore/platform/network/ResourceHandleInternal.h index f7135ee..328fc89 100644 --- a/WebCore/platform/network/ResourceHandleInternal.h +++ b/WebCore/platform/network/ResourceHandleInternal.h @@ -133,9 +133,6 @@ namespace WebCore { , m_needsSiteSpecificQuirks(false) , m_currentMacChallenge(nil) #endif -#if PLATFORM(ANDROID) - , m_loader(0) -#endif , m_failureTimer(loader, &ResourceHandle::fireFailure) { const KURL& url = m_request.url(); |