Unreviewed build fix after r173200.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 Sep 2014 16:12:00 +0000 (16:12 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 Sep 2014 16:12:00 +0000 (16:12 +0000)
* WebView.cpp:
(WebView::setCacheModel): Use appropriate types for cache sizes to be
64-bit clean on CFNetwork compile.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173207 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp

index 23fb78e..643d128 100644 (file)
@@ -1,3 +1,11 @@
+2014-09-03  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed build fix after r173200.
+
+        * WebView.cpp:
+        (WebView::setCacheModel): Use appropriate types for cache sizes to be
+        64-bit clean on CFNetwork compile.
+
 2014-09-02  peavo@outlook.com  <peavo@outlook.com>
 
         [WinCairo] Memory cache capacity is not set.
index b7d706b..ec88613 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Apple, Inc.  All rights reserved.
+ * Copyright (C) 2006-2014 Apple, Inc.  All rights reserved.
  * Copyright (C) 2009, 2010, 2011 Appcelerator, Inc. All rights reserved.
  * Copyright (C) 2011 Brent Fulgham. All rights reserved.
  *
@@ -501,12 +501,13 @@ void WebView::setCacheModel(WebCacheModel cacheModel)
             cfurlCacheDirectory = WebCore::localUserSpecificStorageDirectory().createCFString();
     }
     cacheDirectory = String(cfurlCacheDirectory);
+    CFIndex cacheMemoryCapacity = 0;
+    CFIndex cacheDiskCapacity = 0;
 #elif USE(CURL)
     cacheDirectory = CurlCacheManager::getInstance().cacheDirectory();
-#endif
-
     long cacheMemoryCapacity = 0;
     long cacheDiskCapacity = 0;
+#endif
 
     // As a fudge factor, use 1000 instead of 1024, in case the reported byte 
     // count doesn't align exactly to a megabyte boundary.