[WK2] Remove Windows cruft
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 May 2015 17:18:13 +0000 (17:18 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 May 2015 17:18:13 +0000 (17:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=144745

Reviewed by Darin Adler.

* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::getMemorySize):
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode):
(IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode):
* WebProcess/soup/WebProcessSoup.cpp:
(WebKit::getMemorySize):

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

Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp
Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

index ea3c0cbfdff736c0e4473865e309f516432b5f43..78c9aed470b1969c194dbc08cf7e3c7f762d16d0 100644 (file)
@@ -1,3 +1,18 @@
+2015-05-07  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [WK2] Remove Windows cruft
+        https://bugs.webkit.org/show_bug.cgi?id=144745
+
+        Reviewed by Darin Adler.
+
+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
+        (WebKit::getMemorySize):
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+        (IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode):
+        (IPC::ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode):
+        * WebProcess/soup/WebProcessSoup.cpp:
+        (WebKit::getMemorySize):
+
 2015-05-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         REGRESSION(r182032): [GTK] Production build is broken after r182032
index e271ddd1292b647e2999c570dad37d4ced601395..3b7859472f796d3bb82fb648bc009f60350c7f8a 100644 (file)
@@ -62,7 +62,6 @@ static uint64_t getCacheDiskFreeSize(SoupCache* cache)
 static uint64_t getMemorySize()
 {
     static uint64_t kDefaultMemorySize = 512;
-#if !OS(WINDOWS)
     long pageSize = sysconf(_SC_PAGESIZE);
     if (pageSize == -1)
         return kDefaultMemorySize;
@@ -72,10 +71,6 @@ static uint64_t getMemorySize()
         return kDefaultMemorySize;
 
     return ((pageSize / 1024) * physPages) / 1024;
-#else
-    // Fallback to default for other platforms.
-    return kDefaultMemorySize;
-#endif
 }
 
 void NetworkProcess::userPreferredLanguagesChanged(const Vector<String>& languages)
index 990bd51d1f4506facf8bc392267173a846f932e6..2be9c87daadf7478131ad98143aa96d33bf6253a 100644 (file)
@@ -568,9 +568,6 @@ void ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode(ArgumentEncoder& encod
 #if OS(DARWIN)
     encoder << Attachment(token.frontBufferHandle, MACH_MSG_TYPE_MOVE_SEND);
     encoder << Attachment(token.backBufferHandle, MACH_MSG_TYPE_MOVE_SEND);
-#elif OS(WINDOWS)
-    encoder << reinterpret_cast<uint64_t>(token.frontBufferHandle);
-    encoder << reinterpret_cast<uint64_t>(token.backBufferHandle);
 #elif OS(LINUX)
     encoder << token.frontBufferHandle;
 #endif
@@ -578,16 +575,7 @@ void ArgumentCoder<WebCore::GraphicsSurfaceToken>::encode(ArgumentEncoder& encod
 
 bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(ArgumentDecoder& decoder, WebCore::GraphicsSurfaceToken& token)
 {
-#if OS(WINDOWS)
-    uint64_t frontBufferHandle;
-    if (!decoder.decode(frontBufferHandle))
-        return false;
-    token.frontBufferHandle = reinterpret_cast<GraphicsSurfaceToken::BufferHandle>(frontBufferHandle);
-    uint64_t backBufferHandle;
-    if (!decoder.decode(backBufferHandle))
-        return false;
-    token.backBufferHandle = reinterpret_cast<GraphicsSurfaceToken::BufferHandle>(backBufferHandle);
-#elif OS(DARWIN)
+#if OS(DARWIN)
     Attachment frontAttachment, backAttachment;
     if (!decoder.decode(frontAttachment))
         return false;
index a00592e6d31dde1e7d487b3184a348667dc3e9fc..7945abe7d3579e53d8caadccd25cd1628eddb20f 100644 (file)
@@ -61,7 +61,6 @@ static uint64_t getCacheDiskFreeSize(SoupCache* cache)
 static uint64_t getMemorySize()
 {
     static uint64_t kDefaultMemorySize = 512;
-#if !OS(WINDOWS)
     long pageSize = sysconf(_SC_PAGESIZE);
     if (pageSize == -1)
         return kDefaultMemorySize;
@@ -71,10 +70,6 @@ static uint64_t getMemorySize()
         return kDefaultMemorySize;
 
     return ((pageSize / 1024LL) * physPages) / 1024LL;
-#else
-    // Fallback to default for other platforms.
-    return kDefaultMemorySize;
-#endif
 }
 
 void WebProcess::platformSetCacheModel(CacheModel cacheModel)