<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183931] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183931">183931</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-07 10:18:13 -0700 (Thu, 07 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp">trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183930 => 183931)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-05-07 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r182032): [GTK] Production build is broken after r182032
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (183930 => 183931)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> static uint64_t getMemorySize()
</span><span class="cx"> {
</span><span class="cx"> static uint64_t kDefaultMemorySize = 512;
</span><del>-#if !OS(WINDOWS)
</del><span class="cx"> long pageSize = sysconf(_SC_PAGESIZE);
</span><span class="cx"> if (pageSize == -1)
</span><span class="cx"> return kDefaultMemorySize;
</span><span class="lines">@@ -72,10 +71,6 @@
</span><span class="cx"> return kDefaultMemorySize;
</span><span class="cx">
</span><span class="cx"> return ((pageSize / 1024) * physPages) / 1024;
</span><del>-#else
- // Fallback to default for other platforms.
- return kDefaultMemorySize;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::userPreferredLanguagesChanged(const Vector<String>& languages)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (183930 => 183931)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -568,9 +568,6 @@
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> encoder << Attachment(token.frontBufferHandle, MACH_MSG_TYPE_MOVE_SEND);
</span><span class="cx"> encoder << Attachment(token.backBufferHandle, MACH_MSG_TYPE_MOVE_SEND);
</span><del>-#elif OS(WINDOWS)
- encoder << reinterpret_cast<uint64_t>(token.frontBufferHandle);
- encoder << reinterpret_cast<uint64_t>(token.backBufferHandle);
</del><span class="cx"> #elif OS(LINUX)
</span><span class="cx"> encoder << token.frontBufferHandle;
</span><span class="cx"> #endif
</span><span class="lines">@@ -578,16 +575,7 @@
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(ArgumentDecoder& decoder, WebCore::GraphicsSurfaceToken& token)
</span><span class="cx"> {
</span><del>-#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)
</del><ins>+#if OS(DARWIN)
</ins><span class="cx"> Attachment frontAttachment, backAttachment;
</span><span class="cx"> if (!decoder.decode(frontAttachment))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (183930 => 183931)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> static uint64_t getMemorySize()
</span><span class="cx"> {
</span><span class="cx"> static uint64_t kDefaultMemorySize = 512;
</span><del>-#if !OS(WINDOWS)
</del><span class="cx"> long pageSize = sysconf(_SC_PAGESIZE);
</span><span class="cx"> if (pageSize == -1)
</span><span class="cx"> return kDefaultMemorySize;
</span><span class="lines">@@ -71,10 +70,6 @@
</span><span class="cx"> return kDefaultMemorySize;
</span><span class="cx">
</span><span class="cx"> return ((pageSize / 1024LL) * physPages) / 1024LL;
</span><del>-#else
- // Fallback to default for other platforms.
- return kDefaultMemorySize;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::platformSetCacheModel(CacheModel cacheModel)
</span></span></pre>
</div>
</div>
</body>
</html>