<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[23970] tags/Safari-5522.10/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23970">23970</a></dd>
<dt>Author</dt> <dd>thatcher</dd>
<dt>Date</dt> <dd>2007-07-03 17:06:20 -0700 (Tue, 03 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge r23946 to fix 64-bit build.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari552210WebKitChangeLog">tags/Safari-5522.10/WebKit/ChangeLog</a></li>
<li><a href="#tagsSafari552210WebKitWebCoreSupportWebInspectorClientmm">tags/Safari-5522.10/WebKit/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#tagsSafari552210WebKitWebViewWebDocumentInternalh">tags/Safari-5522.10/WebKit/WebView/WebDocumentInternal.h</a></li>
<li><a href="#tagsSafari552210WebKitWebViewWebHTMLViewmm">tags/Safari-5522.10/WebKit/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari552210WebKitChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-5522.10/WebKit/ChangeLog (23969 => 23970)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-5522.10/WebKit/ChangeLog 2007-07-04 00:04:19 UTC (rev 23969)
+++ tags/Safari-5522.10/WebKit/ChangeLog 2007-07-04 00:06:20 UTC (rev 23970)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2007-07-04 Mark Rowe <mrowe@apple.com>
+
+ Unreviewed 64-bit build fixes.
+
+ * WebCoreSupport/WebInspectorClient.mm: Let the compiler know that WebFrameView is a subclass of NSView.
+ * WebView/WebDocumentInternal.h: Remove our preprocessor macro once we're done with it.
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView markAllMatchesForText:caseSensitive:limit:]): Fix argument types.
+
</ins><span class="cx"> 2007-06-25 Kevin Decker <kdecker@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="tagsSafari552210WebKitWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-5522.10/WebKit/WebCoreSupport/WebInspectorClient.mm (23969 => 23970)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-5522.10/WebKit/WebCoreSupport/WebInspectorClient.mm 2007-07-04 00:04:19 UTC (rev 23969)
+++ tags/Safari-5522.10/WebKit/WebCoreSupport/WebInspectorClient.mm 2007-07-04 00:06:20 UTC (rev 23970)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import "WebInspectorClient.h"
</span><span class="cx">
</span><span class="cx"> #import "WebFrameInternal.h"
</span><ins>+#import "WebFrameView.h"
</ins><span class="cx"> #import "WebNodeHighlight.h"
</span><span class="cx"> #import "WebPreferences.h"
</span><span class="cx"> #import "WebView.h"
</span></span></pre></div>
<a id="tagsSafari552210WebKitWebViewWebDocumentInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-5522.10/WebKit/WebView/WebDocumentInternal.h (23969 => 23970)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-5522.10/WebKit/WebView/WebDocumentInternal.h 2007-07-04 00:04:19 UTC (rev 23969)
+++ tags/Safari-5522.10/WebKit/WebView/WebDocumentInternal.h 2007-07-04 00:06:20 UTC (rev 23970)
</span><span class="lines">@@ -86,3 +86,5 @@
</span><span class="cx">
</span><span class="cx"> @interface WebHTMLView (WebDocumentInternalProtocols) <WebDocumentElement, WebMultipleTextMatches>
</span><span class="cx"> @end
</span><ins>+
+#undef WebNSUInteger
</ins></span></pre></div>
<a id="tagsSafari552210WebKitWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-5522.10/WebKit/WebView/WebHTMLView.mm (23969 => 23970)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-5522.10/WebKit/WebView/WebHTMLView.mm 2007-07-04 00:04:19 UTC (rev 23969)
+++ tags/Safari-5522.10/WebKit/WebView/WebHTMLView.mm 2007-07-04 00:06:20 UTC (rev 23970)
</span><span class="lines">@@ -5961,7 +5961,7 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (unsigned)markAllMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag limit:(unsigned)limit
</del><ins>+- (WebNSUInteger)markAllMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag limit:(WebNSUInteger)limit
</ins><span class="cx"> {
</span><span class="cx"> return [[self _bridge] markAllMatchesForText:string caseSensitive:caseFlag limit:limit];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>