| Index: Source/core/loader/CookieJar.cpp
|
| diff --git a/Source/core/loader/CookieJar.cpp b/Source/core/loader/CookieJar.cpp
|
| index d2e9da0c179574f387175320e6293dcc6a87b7b7..9d6821adf7781891d5d9025e7329bfb218934344 100644
|
| --- a/Source/core/loader/CookieJar.cpp
|
| +++ b/Source/core/loader/CookieJar.cpp
|
| @@ -32,9 +32,9 @@
|
| #include "core/loader/CookieJar.h"
|
|
|
| #include "core/dom/Document.h"
|
| +#include "core/loader/FrameLoaderClient.h"
|
| #include "core/page/Frame.h"
|
| #include "core/platform/Cookie.h"
|
| -#include "core/platform/network/NetworkingContext.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebCookie.h"
|
| #include "public/platform/WebCookieJar.h"
|
| @@ -47,7 +47,12 @@ static WebKit::WebCookieJar* toCookieJar(const Document* document)
|
| {
|
| if (!document || !document->frame())
|
| return 0;
|
| - return document->frame()->loader()->networkingContext()->cookieJar();
|
| + WebKit::WebCookieJar* cookieJar = document->frame()->loader()->client()->cookieJar();
|
| + // FIXME: DRT depends on being able to get a cookie jar from Platform rather than
|
| + // FrameLoaderClient. Delete this when DRT is deleted.
|
| + if (!cookieJar)
|
| + cookieJar = WebKit::Platform::current()->cookieJar();
|
| + return cookieJar;
|
| }
|
|
|
| String cookies(const Document* document, const KURL& url)
|
|
|