Title: [183931] trunk/Source/WebKit2
- Revision
- 183931
- Author
- o...@webkit.org
- Date
- 2015-05-07 10:18:13 -0700 (Thu, 07 May 2015)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (183930 => 183931)
--- trunk/Source/WebKit2/ChangeLog 2015-05-07 16:46:05 UTC (rev 183930)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-07 17:18:13 UTC (rev 183931)
@@ -1,3 +1,18 @@
+2015-05-07 Csaba Osztrogonác <o...@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 <cgar...@igalia.com>
REGRESSION(r182032): [GTK] Production build is broken after r182032
Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (183930 => 183931)
--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2015-05-07 16:46:05 UTC (rev 183930)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2015-05-07 17:18:13 UTC (rev 183931)
@@ -62,7 +62,6 @@
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 @@
return kDefaultMemorySize;
return ((pageSize / 1024) * physPages) / 1024;
-#else
- // Fallback to default for other platforms.
- return kDefaultMemorySize;
-#endif
}
void NetworkProcess::userPreferredLanguagesChanged(const Vector<String>& languages)
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (183930 => 183931)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2015-05-07 16:46:05 UTC (rev 183930)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2015-05-07 17:18:13 UTC (rev 183931)
@@ -568,9 +568,6 @@
#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 @@
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;
Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (183930 => 183931)
--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-05-07 16:46:05 UTC (rev 183930)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-05-07 17:18:13 UTC (rev 183931)
@@ -61,7 +61,6 @@
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 @@
return kDefaultMemorySize;
return ((pageSize / 1024LL) * physPages) / 1024LL;
-#else
- // Fallback to default for other platforms.
- return kDefaultMemorySize;
-#endif
}
void WebProcess::platformSetCacheModel(CacheModel cacheModel)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
