<!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>[201910] trunk/Source/WebKit/win</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/201910">201910</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-09 22:39:38 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Windows build.
* WebKit.resources/resource.h: Removed.
* resource.h: Copied from WebKit.resources/resource.h.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinresourceh">trunk/Source/WebKit/win/resource.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinWebKitresourcesresourceh">trunk/Source/WebKit/win/WebKit.resources/resource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (201909 => 201910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-06-10 05:34:48 UTC (rev 201909)
+++ trunk/Source/WebKit/win/ChangeLog 2016-06-10 05:39:38 UTC (rev 201910)
</span><span class="lines">@@ -1,5 +1,12 @@
</span><span class="cx"> 2016-06-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Fix Windows build.
+
+ * WebKit.resources/resource.h: Removed.
+ * resource.h: Copied from WebKit.resources/resource.h.
+
+2016-06-09 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Actually fix Windows build after r201894
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158588
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitresourcesresourceh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/win/WebKit.resources/resource.h (201909 => 201910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKit.resources/resource.h 2016-06-10 05:34:48 UTC (rev 201909)
+++ trunk/Source/WebKit/win/WebKit.resources/resource.h 2016-06-10 05:39:38 UTC (rev 201910)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by WebKit.rc
-//
-#define IDR_WEBKIT 1
-#define IDR_RESIZE_CORNER 2
-#define IDR_MISSING_IMAGE 3
-#define IDR_URL_ICON 4
-#define IDR_NULL_PLUGIN 5
-#define IDR_ZOOM_IN_CURSOR 6
-#define IDR_ZOOM_OUT_CURSOR 7
-#define IDR_VERTICAL_TEXT_CURSOR 8
-#define IDR_PAN_SCROLL_ICON 9
-#define IDR_PAN_SOUTH_CURSOR 10
-#define IDR_PAN_NORTH_CURSOR 11
-#define IDR_PAN_EAST_CURSOR 12
-#define IDR_PAN_WEST_CURSOR 13
-#define IDR_PAN_SOUTH_EAST_CURSOR 14
-#define IDR_PAN_SOUTH_WEST_CURSOR 15
-#define IDR_PAN_NORTH_EAST_CURSOR 16
-#define IDR_PAN_NORTH_WEST_CURSOR 17
-#define IDR_SEARCH_CANCEL 18
-#define IDR_SEARCH_CANCEL_PRESSED 19
-#define IDR_SEARCH_MAGNIFIER 20
-#define IDR_SEARCH_MAGNIFIER_RESULTS 21
-#define IDR_FS_VIDEO_AUDIO_VOLUME_HIGH 22
-#define IDR_FS_VIDEO_AUDIO_VOLUME_LOW 23
-#define IDR_FS_VIDEO_EXIT_FULLSCREEN 24
-#define IDR_FS_VIDEO_PAUSE 25
-#define IDR_FS_VIDEO_PLAY 26
-#define IDC_STATIC -1
-
-#define BUILD_NUMBER 1
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 22
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitwinresourcehfromrev201908trunkSourceWebKitwinWebKitresourcesresourceh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/win/resource.h (from rev 201908, trunk/Source/WebKit/win/WebKit.resources/resource.h) (0 => 201910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/resource.h (rev 0)
+++ trunk/Source/WebKit/win/resource.h 2016-06-10 05:39:38 UTC (rev 201910)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by WebKit.rc
+//
+#define IDR_WEBKIT 1
+#define IDR_RESIZE_CORNER 2
+#define IDR_MISSING_IMAGE 3
+#define IDR_URL_ICON 4
+#define IDR_NULL_PLUGIN 5
+#define IDR_ZOOM_IN_CURSOR 6
+#define IDR_ZOOM_OUT_CURSOR 7
+#define IDR_VERTICAL_TEXT_CURSOR 8
+#define IDR_PAN_SCROLL_ICON 9
+#define IDR_PAN_SOUTH_CURSOR 10
+#define IDR_PAN_NORTH_CURSOR 11
+#define IDR_PAN_EAST_CURSOR 12
+#define IDR_PAN_WEST_CURSOR 13
+#define IDR_PAN_SOUTH_EAST_CURSOR 14
+#define IDR_PAN_SOUTH_WEST_CURSOR 15
+#define IDR_PAN_NORTH_EAST_CURSOR 16
+#define IDR_PAN_NORTH_WEST_CURSOR 17
+#define IDR_SEARCH_CANCEL 18
+#define IDR_SEARCH_CANCEL_PRESSED 19
+#define IDR_SEARCH_MAGNIFIER 20
+#define IDR_SEARCH_MAGNIFIER_RESULTS 21
+#define IDR_FS_VIDEO_AUDIO_VOLUME_HIGH 22
+#define IDR_FS_VIDEO_AUDIO_VOLUME_LOW 23
+#define IDR_FS_VIDEO_EXIT_FULLSCREEN 24
+#define IDR_FS_VIDEO_PAUSE 25
+#define IDR_FS_VIDEO_PLAY 26
+#define IDC_STATIC -1
+
+#define BUILD_NUMBER 1
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 22
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
</ins></span></pre>
</div>
</div>
</body>
</html>