<!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>[180250] 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/180250">180250</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-02-17 18:58:59 -0800 (Tue, 17 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>SoftLinking.h: Update copyright and license; clean up whitespace
* platform/win/SoftLinking.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformwinSoftLinkingh">trunk/Source/WebCore/platform/win/SoftLinking.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180249 => 180250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-18 02:52:06 UTC (rev 180249)
+++ trunk/Source/WebCore/ChangeLog 2015-02-18 02:58:59 UTC (rev 180250)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2015-02-17 David Kilzer <ddkilzer@apple.com>
+
+ SoftLinking.h: Update copyright and license; clean up whitespace
+
+ * platform/win/SoftLinking.h:
+
</ins><span class="cx"> 2015-02-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Slight CachedPage class clean up
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinSoftLinkingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/SoftLinking.h (180249 => 180250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/SoftLinking.h 2015-02-18 02:52:06 UTC (rev 180249)
+++ trunk/Source/WebCore/platform/win/SoftLinking.h 2015-02-18 02:58:59 UTC (rev 180250)
</span><span class="lines">@@ -1,29 +1,25 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2009-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="cx"> * are met:
</span><del>- *
</del><span class="cx"> * 1. Redistributions of source code must retain the above copyright
</span><del>- * notice, this list of conditions and the following disclaimer.
</del><ins>+ * notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><del>- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
</del><ins>+ * documentation and/or other materials provided with the distribution.
</ins><span class="cx"> *
</span><del>- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</del><ins>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
</ins><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="cx"> * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
</span><del>- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
</del><ins>+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
</ins><span class="cx"> * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
</span><span class="cx"> * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
</span><del>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #ifndef SoftLinking_h
</span><span class="lines">@@ -52,10 +48,10 @@
</span><span class="cx"> softLink##functionName = reinterpret_cast<resultType (callingConvention*) parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
</span><span class="cx"> ASSERT(softLink##functionName); \
</span><span class="cx"> return softLink##functionName parameterNames; \
</span><del>- }\
</del><ins>+ } \
</ins><span class="cx"> \
</span><span class="cx"> inline resultType functionName parameterDeclarations \
</span><del>- {\
</del><ins>+ { \
</ins><span class="cx"> return softLink##functionName parameterNames; \
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,7 +68,7 @@
</span><span class="cx"> \
</span><span class="cx"> ptr = reinterpret_cast<functionName##PtrType>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
</span><span class="cx"> return ptr; \
</span><del>- }\
</del><ins>+ } \
</ins><span class="cx">
</span><span class="cx"> #define SOFT_LINK_LOADED_LIBRARY(library, functionName, resultType, callingConvention, parameterDeclarations) \
</span><span class="cx"> typedef resultType (callingConvention *functionName##PtrType) parameterDeclarations; \
</span><span class="lines">@@ -89,15 +85,15 @@
</span><span class="cx"> \
</span><span class="cx"> ptr = reinterpret_cast<functionName##PtrType>(SOFT_LINK_GETPROCADDRESS(libraryInstance, #functionName)); \
</span><span class="cx"> return ptr; \
</span><del>- }\
</del><ins>+ } \
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> In order to soft link against functions decorated with __declspec(dllimport), we prepend "softLink_" to the function names.
</span><span class="cx"> If you use SOFT_LINK_DLL_IMPORT(), you will also need to #define the function name to account for this, e.g.:
</span><del>-
</del><ins>+
</ins><span class="cx"> SOFT_LINK_DLL_IMPORT(myLibrary, myFunction, ...)
</span><span class="cx"> #define myFunction softLink_myFunction
</span><del>-*/
</del><ins>+*/
</ins><span class="cx"> #define SOFT_LINK_DLL_IMPORT(library, functionName, resultType, callingConvention, parameterDeclarations, parameterNames) \
</span><span class="cx"> static resultType callingConvention init##functionName parameterDeclarations; \
</span><span class="cx"> static resultType(callingConvention*softLink##functionName) parameterDeclarations = init##functionName; \
</span><span class="lines">@@ -107,10 +103,10 @@
</span><span class="cx"> softLink##functionName = reinterpret_cast<resultType (callingConvention*)parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
</span><span class="cx"> ASSERT(softLink##functionName); \
</span><span class="cx"> return softLink##functionName parameterNames; \
</span><del>- }\
</del><ins>+ } \
</ins><span class="cx"> \
</span><span class="cx"> inline resultType softLink_##functionName parameterDeclarations \
</span><del>- {\
</del><ins>+ { \
</ins><span class="cx"> return softLink##functionName parameterNames; \
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -127,7 +123,7 @@
</span><span class="cx"> \
</span><span class="cx"> ptr = reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
</span><span class="cx"> return ptr; \
</span><del>- }\
</del><ins>+ } \
</ins><span class="cx">
</span><span class="cx"> #define SOFT_LINK_DLL_IMPORT_OPTIONAL(library, functionName, resultType, callingConvention, parameterDeclarations) \
</span><span class="cx"> typedef resultType (callingConvention *functionName##PtrType) parameterDeclarations; \
</span><span class="lines">@@ -142,22 +138,22 @@
</span><span class="cx"> \
</span><span class="cx"> ptr = reinterpret_cast<resultType(callingConvention*)parameterDeclarations>(SOFT_LINK_GETPROCADDRESS(library##Library(), #functionName)); \
</span><span class="cx"> return ptr; \
</span><del>- }\
</del><ins>+ } \
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> Variables exported by a DLL need to be accessed through a function.
</span><span class="cx"> If you use SOFT_LINK_VARIABLE_DLL_IMPORT(), you will also need to #define the variable name to account for this, e.g.:
</span><del>-
</del><ins>+
</ins><span class="cx"> SOFT_LINK_VARIABLE_DLL_IMPORT(myLibrary, myVar, int)
</span><span class="cx"> #define myVar get_myVar()
</span><del>-*/
</del><ins>+*/
</ins><span class="cx"> #define SOFT_LINK_VARIABLE_DLL_IMPORT(library, variableName, variableType) \
</span><span class="cx"> static variableType get##variableName() \
</span><span class="cx"> { \
</span><span class="cx"> static variableType* ptr = reinterpret_cast<variableType*>(SOFT_LINK_GETPROCADDRESS(library##Library(), #variableName)); \
</span><span class="cx"> ASSERT(ptr); \
</span><span class="cx"> return *ptr; \
</span><del>- }\
</del><ins>+ } \
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> Note that this will only work for variable types for which a return value of 0 can signal an error.
</span><span class="lines">@@ -169,6 +165,6 @@
</span><span class="cx"> if (!ptr) \
</span><span class="cx"> return 0; \
</span><span class="cx"> return *ptr; \
</span><del>- }\
</del><ins>+ } \
</ins><span class="cx">
</span><span class="cx"> #endif // SoftLinking_h
</span></span></pre>
</div>
</div>
</body>
</html>