Changeset 52610 in webkit

Timestamp:

Dec 28, 2009 10:49:58 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-28 Andrei Popescu <​andreip@google.com>

Reviewed by Dmitry Titov.

On Android, ResourceHandle instances make use of a pointer to a
ResourceLoaderAndroid pointer. This needs to be stored in order to later cancel
the load, if necessary. Since this pointer is an internal implementation
details of ResourceHandle on Android, it needs to be stored in the
ResourceHandleInternal class. This patch adds this pointer.
​https://bugs.webkit.org/show_bug.cgi?id=32873

No new tests needed, this is platform-specific code.

• platform/network/ResourceHandle.h:
• platform/network/ResourceHandleInternal.h: (WebCore::ResourceHandleInternal::ResourceHandleInternal):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceHandle.h (modified) (1 diff)
• platform/network/ResourceHandleInternal.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-28  Andrei Popescu  <andreip@google.com>
+
+        Reviewed by Dmitry Titov.
+
+        On Android, ResourceHandle instances make use of a pointer to a
+        ResourceLoaderAndroid pointer. This needs to be stored in order to later cancel
+        the load, if necessary. Since this pointer is an internal implementation
+        details of ResourceHandle on Android, it needs to be stored in the
+        ResourceHandleInternal class. This patch adds this pointer.
+        https://bugs.webkit.org/show_bug.cgi?id=32873
+
+        No new tests needed, this is platform-specific code.
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/ResourceHandleInternal.h:
+        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+
 2009-12-28  Charles Wei  <charles.wei@torchmobile.com.cn>
 

trunk/WebCore/platform/network/ResourceHandle.h

@@ -171 +171 @@
 #endif
 
-#if PLATFORM(QT) || USE(CURL) || USE(SOUP)
+#if PLATFORM(QT) || USE(CURL) || USE(SOUP) || PLATFORM(ANDROID)
     ResourceHandleInternal* getInternal() { return d.get(); }
 #endif

trunk/WebCore/platform/network/ResourceHandleInternal.h

@@ -69 +69 @@
 #endif
 
+#if PLATFORM(ANDROID)
+#include "ResourceLoaderAndroid.h"
+#endif
+
 // The allocations and releases in ResourceHandleInternal are
 // Cocoa-exception-free (either simple Foundation classes or
@@ -212 +216 @@
         NSURLAuthenticationChallenge *m_currentMacChallenge;
 #endif
+#if PLATFORM(ANDROID)
+        RefPtr<ResourceLoaderAndroid> m_loader;
+#endif
         AuthenticationChallenge m_currentWebChallenge;