<!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>[182757] trunk/Source/WebCore</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/182757">182757</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-04-13 14:37:42 -0700 (Mon, 13 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Unreviewed fix after <a href="http://trac.webkit.org/projects/webkit/changeset/182161">r182161</a>.
The change caused Windows to lose Media UI, since the new 'getFileSize'
signature was being improperly used for a 'UInt8'-based string.
Fix was to provide implementations for the two new methods, and to make
sure RenderThemeWin was using the proper signature.
This should actually be a little more efficient, since we have the file
handle when we call this new method. Previously, a Windows 'find file' was
being done with the requested path, which was unnecessary work.
* platform/win/FileSystemWin.cpp:
(WebCore::getFileSizeFromByHandleFileInformationStructure): Added helper function.
(WebCore::getFileSize): Provide implementation.
(WebCore::renameFile):
* rendering/RenderThemeWin.cpp:
(WebCore::RenderThemeWin::stringWithContentsOfFile): Use the file handle to
get the file size, rather than using the path-based size lookup (which involves
performing an unnecessary file search.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformwinFileSystemWincpp">trunk/Source/WebCore/platform/win/FileSystemWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWincpp">trunk/Source/WebCore/rendering/RenderThemeWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182756 => 182757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-13 21:23:09 UTC (rev 182756)
+++ trunk/Source/WebCore/ChangeLog 2015-04-13 21:37:42 UTC (rev 182757)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-04-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed fix after r182161.
+
+ The change caused Windows to lose Media UI, since the new 'getFileSize'
+ signature was being improperly used for a 'UInt8'-based string.
+
+ Fix was to provide implementations for the two new methods, and to make
+ sure RenderThemeWin was using the proper signature.
+
+ This should actually be a little more efficient, since we have the file
+ handle when we call this new method. Previously, a Windows 'find file' was
+ being done with the requested path, which was unnecessary work.
+
+ * platform/win/FileSystemWin.cpp:
+ (WebCore::getFileSizeFromByHandleFileInformationStructure): Added helper function.
+ (WebCore::getFileSize): Provide implementation.
+ (WebCore::renameFile):
+ * rendering/RenderThemeWin.cpp:
+ (WebCore::RenderThemeWin::stringWithContentsOfFile): Use the file handle to
+ get the file size, rather than using the path-based size lookup (which involves
+ performing an unnecessary file search.
+
</ins><span class="cx"> 2015-04-13 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Share sheets from Share menus appear outside the browser window.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinFileSystemWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (182756 => 182757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2015-04-13 21:23:09 UTC (rev 182756)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2015-04-13 21:37:42 UTC (rev 182757)
</span><span class="lines">@@ -68,6 +68,19 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool getFileSizeFromByHandleFileInformationStructure(const BY_HANDLE_FILE_INFORMATION& fileInformation, long long& size)
+{
+ ULARGE_INTEGER fileSize;
+ fileSize.HighPart = fileInformation.nFileSizeHigh;
+ fileSize.LowPart = fileInformation.nFileSizeLow;
+
+ if (fileSize.QuadPart > static_cast<ULONGLONG>(std::numeric_limits<long long>::max()))
+ return false;
+
+ size = fileSize.QuadPart;
+ return true;
+}
+
</ins><span class="cx"> static void getFileCreationTimeFromFindData(const WIN32_FIND_DATAW& findData, time_t& time)
</span><span class="cx"> {
</span><span class="cx"> ULARGE_INTEGER fileTime;
</span><span class="lines">@@ -98,10 +111,13 @@
</span><span class="cx"> return getFileSizeFromFindData(findData, size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool getFileSize(PlatformFileHandle, long long&)
</del><ins>+bool getFileSize(PlatformFileHandle fileHandle, long long& size)
</ins><span class="cx"> {
</span><del>- notImplemented();
- return false;
</del><ins>+ BY_HANDLE_FILE_INFORMATION fileInformation;
+ if (!::GetFileInformationByHandle(fileHandle, &fileInformation))
+ return false;
+
+ return getFileSizeFromByHandleFileInformationStructure(fileInformation, size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool getFileModificationTime(const String& path, time_t& time)
</span><span class="lines">@@ -160,8 +176,16 @@
</span><span class="cx"> return !!RemoveDirectoryW(filename.charactersWithNullTermination().data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool renameFile(const String&, const String&)
</del><ins>+bool renameFile(const String& oldPath, const String& newPath)
</ins><span class="cx"> {
</span><ins>+ CString oldPathFsRep = fileSystemRepresentation(oldPath);
+ if (!oldPathFsRep.data() || oldPathFsRep.data()[0] == '\0')
+ return false;
+
+ CString newPathFsRep = fileSystemRepresentation(newPath);
+ if (!newPathFsRep.data() || newPathFsRep.data()[0] == '\0')
+ return false;
+
</ins><span class="cx"> notImplemented();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (182756 => 182757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2015-04-13 21:23:09 UTC (rev 182756)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2015-04-13 21:37:42 UTC (rev 182757)
</span><span class="lines">@@ -1066,7 +1066,7 @@
</span><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> long long filesize = -1;
</span><del>- if (!getFileSize(requestedFilePath, filesize)) {
</del><ins>+ if (!getFileSize(requestedFileHandle, filesize)) {
</ins><span class="cx"> closeFile(requestedFileHandle);
</span><span class="cx"> return String();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>