Title: [88259] trunk/Source
Revision
88259
Author
commit-qu...@webkit.org
Date
2011-06-07 13:37:29 -0700 (Tue, 07 Jun 2011)

Log Message

2011-06-07  Tim Horton  <timothy_hor...@apple.com>

        Reviewed by Alexey Proskuryakov.

        Use correct CFURLStorageSessionRef definition on Snow Leopard
        https://bugs.webkit.org/show_bug.cgi?id=62223

        * platform/mac/WebCoreSystemInterface.h:
        * platform/network/ResourceHandle.h:
        * platform/network/cf/ResourceRequest.h:
2011-06-07  Tim Horton  <timothy_hor...@apple.com>

        Reviewed by Alexey Proskuryakov.

        Use correct CFURLStorageSessionRef definition on Snow Leopard
        https://bugs.webkit.org/show_bug.cgi?id=62223

        * PluginProcess/mac/PluginProcessShim.mm:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (88258 => 88259)


--- trunk/Source/WebCore/ChangeLog	2011-06-07 20:28:54 UTC (rev 88258)
+++ trunk/Source/WebCore/ChangeLog	2011-06-07 20:37:29 UTC (rev 88259)
@@ -1,3 +1,14 @@
+2011-06-07  Tim Horton  <timothy_hor...@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use correct CFURLStorageSessionRef definition on Snow Leopard
+        https://bugs.webkit.org/show_bug.cgi?id=62223
+
+        * platform/mac/WebCoreSystemInterface.h:
+        * platform/network/ResourceHandle.h:
+        * platform/network/cf/ResourceRequest.h:
+
 2011-06-07  Alok Priyadarshi  <al...@chromium.org>
 
         Reviewed by Stephen White.

Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (88258 => 88259)


--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h	2011-06-07 20:28:54 UTC (rev 88258)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h	2011-06-07 20:37:29 UTC (rev 88259)
@@ -281,7 +281,10 @@
 extern BOOL (*wkGetBytesFromAXTextMarker)(CFTypeRef textMarker, void *bytes, size_t length);
 extern AXUIElementRef (*wkCreateAXUIElementRef)(id element);
 
-typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
+#if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LEOPARD)
+typedef struct __CFURLStorageSession* CFURLStorageSessionRef;
+#endif
+
 extern CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef);
 extern NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
 

Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (88258 => 88259)


--- trunk/Source/WebCore/platform/network/ResourceHandle.h	2011-06-07 20:28:54 UTC (rev 88258)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h	2011-06-07 20:37:29 UTC (rev 88259)
@@ -70,8 +70,8 @@
 typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
 #endif
 
-#if USE(CFURLSTORAGESESSIONS)
-typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
+#if USE(CFURLSTORAGESESSIONS) && defined(BUILDING_ON_SNOW_LEOPARD)
+typedef struct __CFURLStorageSession* CFURLStorageSessionRef;
 #endif
 
 namespace WebCore {

Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (88258 => 88259)


--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h	2011-06-07 20:28:54 UTC (rev 88258)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h	2011-06-07 20:37:29 UTC (rev 88259)
@@ -40,8 +40,8 @@
 #endif
 #endif
 
-#if USE(CFURLSTORAGESESSIONS)
-typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
+#if USE(CFURLSTORAGESESSIONS) && defined(BUILDING_ON_SNOW_LEOPARD)
+typedef struct __CFURLStorageSession* CFURLStorageSessionRef;
 #endif
 
 namespace WebCore {

Modified: trunk/Source/WebKit2/ChangeLog (88258 => 88259)


--- trunk/Source/WebKit2/ChangeLog	2011-06-07 20:28:54 UTC (rev 88258)
+++ trunk/Source/WebKit2/ChangeLog	2011-06-07 20:37:29 UTC (rev 88259)
@@ -1,3 +1,12 @@
+2011-06-07  Tim Horton  <timothy_hor...@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use correct CFURLStorageSessionRef definition on Snow Leopard
+        https://bugs.webkit.org/show_bug.cgi?id=62223
+
+        * PluginProcess/mac/PluginProcessShim.mm:
+
 2011-06-07  Carlos Garcia Campos  <cgar...@igalia.com>
 
         Reviewed by Martin Robinson.

Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (88258 => 88259)


--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm	2011-06-07 20:28:54 UTC (rev 88258)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm	2011-06-07 20:37:29 UTC (rev 88259)
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import <wtf/Platform.h>
 #import "PluginProcessShim.h"
 
 #import <AppKit/AppKit.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to