Title: [199925] tags/Safari-602.1.29/Source/WebKit

Diff

Modified: tags/Safari-602.1.29/Source/WebKit/ChangeLog (199924 => 199925)


--- tags/Safari-602.1.29/Source/WebKit/ChangeLog	2016-04-22 23:02:42 UTC (rev 199924)
+++ tags/Safari-602.1.29/Source/WebKit/ChangeLog	2016-04-22 23:03:42 UTC (rev 199925)
@@ -1,3 +1,13 @@
+2016-04-22  Babak Shafiei  <bshaf...@apple.com>
+
+        Merge r199908.
+
+    2016-04-22  Brent Fulgham  <bfulg...@apple.com>
+
+            Unreviewed build fix after r199841.
+
+            * PlatformWin.cmake: Add missing WebApplicationCache.cpp buid directive.
+
 2016-04-11  Fujii Hironori  <hironori.fu...@jp.sony.com>
 
         [CMake] Make FOLDER property INHERITED

Modified: tags/Safari-602.1.29/Source/WebKit/PlatformWin.cmake (199924 => 199925)


--- tags/Safari-602.1.29/Source/WebKit/PlatformWin.cmake	2016-04-22 23:02:42 UTC (rev 199924)
+++ tags/Safari-602.1.29/Source/WebKit/PlatformWin.cmake	2016-04-22 23:03:42 UTC (rev 199925)
@@ -83,6 +83,7 @@
     win/MemoryStream.h
     win/ProgIDMacros.h
     win/WebActionPropertyBag.h
+    win/WebApplicationCache.h
     win/WebArchive.h
     win/WebBackForwardList.h
     win/WebCache.h
@@ -154,6 +155,7 @@
     win/MarshallingHelpers.cpp
     win/MemoryStream.cpp
     win/WebActionPropertyBag.cpp
+    win/WebApplicationCache.cpp
     win/WebArchive.cpp
     win/WebBackForwardList.cpp
     win/WebCache.cpp

Modified: tags/Safari-602.1.29/Source/WebKit/win/ChangeLog (199924 => 199925)


--- tags/Safari-602.1.29/Source/WebKit/win/ChangeLog	2016-04-22 23:02:42 UTC (rev 199924)
+++ tags/Safari-602.1.29/Source/WebKit/win/ChangeLog	2016-04-22 23:03:42 UTC (rev 199925)
@@ -1,3 +1,14 @@
+2016-04-22  Babak Shafiei  <bshaf...@apple.com>
+
+        Merge r199908.
+
+    2016-04-22  Brent Fulgham  <bfulg...@apple.com>
+
+            Unreviewed build fix after 4199841.
+
+            * WebApplicationCache.cpp:
+            (WebApplicationCache::WebApplicationCache): Provide missing preference key definition.
+
 2016-04-21  Anders Carlsson  <ander...@apple.com>
 
         Add a missing space, as noticed by Darin.

Modified: tags/Safari-602.1.29/Source/WebKit/win/WebApplicationCache.cpp (199924 => 199925)


--- tags/Safari-602.1.29/Source/WebKit/win/WebApplicationCache.cpp	2016-04-22 23:02:42 UTC (rev 199924)
+++ tags/Safari-602.1.29/Source/WebKit/win/WebApplicationCache.cpp	2016-04-22 23:03:42 UTC (rev 199925)
@@ -33,9 +33,14 @@
 #include <WebCore/ApplicationCache.h>
 #include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/COMPtr.h>
+#include <WebCore/FileSystem.h>
 #include <WebCore/SecurityOrigin.h>
 #include <comutil.h>
 
+using namespace WebCore;
+
+static CFStringRef WebKitLocalCacheDefaultsKey = CFSTR("WebKitLocalCache");
+
 // WebApplicationCache ---------------------------------------------------------------------------
 
 WebApplicationCache::WebApplicationCache()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to