Changeset 52406 in webkit

Timestamp:

Dec 20, 2009 1:52:52 AM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Adam Barth.

[Android] Android needs implementation of setCookies, cookies and cookiesEnabled functions.
​https://bugs.webkit.org/show_bug.cgi?id=32559

Add implementation of the cookie functions.
Fix a crash caused by dereferencing a 0 MainResourceLoader pointer
in ResourceHandle::start().

No new tests, this is platform code.

• platform/android/PlatformBridge.h:
• platform/network/android/AuthenticationChallenge.h: Added.
• platform/network/android/CookieJarAndroid.cpp: Added. (WebCore::setCookies): (WebCore::cookies): (WebCore::cookiesEnabled):
• platform/network/android/ResourceHandleAndroid.cpp: (WebCore::ResourceHandle::start):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/android/PlatformBridge.h (modified) (1 diff)
• platform/network/android/AuthenticationChallenge.h (copied) (copied from trunk/WebCore/platform/android/PlatformBridge.h) (2 diffs)
• platform/network/android/CookieJarAndroid.cpp (copied) (copied from trunk/WebCore/platform/android/PlatformBridge.h) (2 diffs)
• platform/network/android/ResourceHandleAndroid.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-20  Andrei Popescu  <andreip@google.com>
+
+        Reviewed by Adam Barth.
+
+        [Android] Android needs implementation of setCookies, cookies and cookiesEnabled functions.
+        https://bugs.webkit.org/show_bug.cgi?id=32559
+
+        Add implementation of the cookie functions.
+        Fix a crash caused by dereferencing a 0 MainResourceLoader pointer
+        in ResourceHandle::start().
+
+        No new tests, this is platform code.
+
+        * platform/android/PlatformBridge.h:
+        * platform/network/android/AuthenticationChallenge.h: Added.
+        * platform/network/android/CookieJarAndroid.cpp: Added.
+        (WebCore::setCookies):
+        (WebCore::cookies):
+        (WebCore::cookiesEnabled):
+        * platform/network/android/ResourceHandleAndroid.cpp:
+        (WebCore::ResourceHandle::start):
+
 2009-12-19  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/platform/android/PlatformBridge.h

@@ -49 +49 @@
     static WTF::Vector<String> getSupportedKeyStrengthList();
     static String getSignedPublicKeyAndChallengeString(unsigned index, const String& challenge, const KURL&);
+    // Cookies
+    static void setCookies(const KURL&, const String& value);
+    static String cookies(const KURL&);
+    static bool cookiesEnabled();
 };
+
 }
 #endif // PlatformBridge_h

trunk/WebCore/platform/network/android/AuthenticationChallenge.h

@@ -1 +1 @@
 /*
  * Copyright 2009, The Android Open Source Project
+ * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +25 @@
  */
 
-#ifndef PlatformBridge_h
-#define PlatformBridge_h
+#ifndef AuthenticationChallenge_h
+#define AuthenticationChallenge_h
 
-#include "KURL.h"
-#include "PlatformString.h"
-
-#include <wtf/Vector.h>
+#include "AuthenticationChallengeBase.h"
 
 namespace WebCore {
 
-// An interface to the embedding layer, which has the ability to answer
-// questions about the system and so on...
-// This is very similar to ChromiumBridge and the two are likely to converge
-// in the future.
-//
-// The methods in this class all need to reach across a JNI layer to the Java VM
-// where the embedder runs. The JNI machinery is currently all in WebKit/android
-// but the long term plan is to move to the WebKit API and share the bridge and its
-// implementation with Chromium. The JNI machinery will then move outside of WebKit,
-// similarly to how Chromium's IPC layer lives outside of WebKit.
-class PlatformBridge {
-public:
-    // KeyGenerator
-    static WTF::Vector<String> getSupportedKeyStrengthList();
-    static String getSignedPublicKeyAndChallengeString(unsigned index, const String& challenge, const KURL&);
+class AuthenticationChallenge : public AuthenticationChallengeBase {
 };
+
 }
-#endif // PlatformBridge_h
+
+#endif

trunk/WebCore/platform/network/android/CookieJarAndroid.cpp

@@ -1 +1 @@
 /*
- * Copyright 2009, The Android Open Source Project
+ * Copyright 2007, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef PlatformBridge_h
-#define PlatformBridge_h
+#include "config.h"
 
-#include "KURL.h"
-#include "PlatformString.h"
+#include "CookieJar.h"
 
-#include <wtf/Vector.h>
+#include "PlatformBridge.h"
 
 namespace WebCore {
 
-// An interface to the embedding layer, which has the ability to answer
-// questions about the system and so on...
-// This is very similar to ChromiumBridge and the two are likely to converge
-// in the future.
-//
-// The methods in this class all need to reach across a JNI layer to the Java VM
-// where the embedder runs. The JNI machinery is currently all in WebKit/android
-// but the long term plan is to move to the WebKit API and share the bridge and its
-// implementation with Chromium. The JNI machinery will then move outside of WebKit,
-// similarly to how Chromium's IPC layer lives outside of WebKit.
-class PlatformBridge {
-public:
-    // KeyGenerator
-    static WTF::Vector<String> getSupportedKeyStrengthList();
-    static String getSignedPublicKeyAndChallengeString(unsigned index, const String& challenge, const KURL&);
-};
+void setCookies(Document*, const KURL& url, const String& value)
+{
+    PlatformBridge::setCookies(url, value);
 }
-#endif // PlatformBridge_h
+
+String cookies(const Document*, const KURL& url)
+{
+    return PlatformBridge::cookies(url);
+}
+
+bool cookiesEnabled(const Document*)
+{
+    return PlatformBridge::cookiesEnabled();
+}
+
+}

trunk/WebCore/platform/network/android/ResourceHandleAndroid.cpp

@@ -53 +53 @@
     DocumentLoader* docLoader = frame->loader()->activeDocumentLoader();
     MainResourceLoader* mainLoader = docLoader->mainResourceLoader();
-    bool isMainResource = (mainLoader->handle() == this);
+    bool isMainResource = mainLoader && (mainLoader->handle() == this);
 
     PassRefPtr<ResourceLoaderAndroid> loader = ResourceLoaderAndroid::start(this, d->m_request, frame->loader()->client(), isMainResource, false);