[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [36961] trunk
From: ddkilzer () apple ! com
Date: 2008-09-26 20:47:58
Message-ID: 20080926204759.C017C3F9C75 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[36961] trunk</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/36961">36961</a></dd> \
<dt>Author</dt> <dd>ddkilzer@apple.com</dd> <dt>Date</dt> <dd>2008-09-26 13:47:58 \
-0700 (Fri, 26 Sep 2008)</dd> </dl>
<h3>Log Message</h3>
<pre>Fix Mac build with XPATH and XSLT disabled
WebCore:
Fix Mac build with XPATH and XSLT disabled
Reviewed by Alexey.
* bindings/objc/DOMUtility.mm:
(JSC::createDOMWrapper): Conditionalize code with ENABLE(XPATH).
* dom/XMLTokenizerLibxml2.cpp:
(WebCore::errorFunc): Conditionalize method with ENABLE(XSLT) to
prevent an unused code warning.
WebKit/mac:
Fix Mac build with XSLT disabled
Reviewed by Alexey.
* Misc/WebCache.mm:
(+[WebCache statistics]): Populate xslStyleSheet statistics with
zeros if XSLT is disabled.
WebKit/win:
Speculative Windows build fix with XSLT disabled
Reviewed by Alexey.
* WebCache.cpp:
(WebCache::statistics): Populate xslStyleSheet statistics with
zeros if XSLT is disabled.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsobjcDOMUtilitymm">trunk/WebCore/bindings/objc/DOMUtility.mm</a></li>
<li><a href="#trunkWebCoredomXMLTokenizerLibxml2cpp">trunk/WebCore/dom/XMLTokenizerLibxml2.cpp</a></li>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacMiscWebCachemm">trunk/WebKit/mac/Misc/WebCache.mm</a></li>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebCachecpp">trunk/WebKit/win/WebCache.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (36960 => 36961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2008-09-26 17:57:55 UTC (rev 36960)
+++ trunk/WebCore/ChangeLog 2008-09-26 20:47:58 UTC (rev 36961)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2008-09-26 David Kilzer <ddkilzer@apple.com>
+
+ Fix Mac build with XPATH and XSLT disabled
+
+ Reviewed by Alexey.
+
+ * bindings/objc/DOMUtility.mm:
+ (JSC::createDOMWrapper): Conditionalize code with ENABLE(XPATH).
+ * dom/XMLTokenizerLibxml2.cpp:
+ (WebCore::errorFunc): Conditionalize method with ENABLE(XSLT) to
+ prevent an unused code warning.
+
</ins><span class="cx"> 2008-09-26 Kevin McCullough <kmccullough@apple.com>
</span><span class="cx">
</span><span class="cx"> Rubber stamped by Tim Hatcher.
</span></span></pre></div>
<a id="trunkWebCorebindingsobjcDOMUtilitymm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/objc/DOMUtility.mm (36960 \
=> 36961)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/objc/DOMUtility.mm 2008-09-26 17:57:55 \
UTC (rev 36960)
+++ trunk/WebCore/bindings/objc/DOMUtility.mm 2008-09-26 20:47:58 UTC (rev 36961)
</span><span class="lines">@@ -91,8 +91,10 @@
</span><span class="cx"> WRAP(Rect)
</span><span class="cx"> WRAP(StyleSheet)
</span><span class="cx"> WRAP(StyleSheetList)
</span><ins>+#if ENABLE(XPATH)
</ins><span class="cx"> WRAP(XPathExpression)
</span><span class="cx"> WRAP(XPathResult)
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // This must be after the HTMLOptionsCollection check, \
because it's a subclass in the JavaScript </span><span class="cx"> // binding, \
but not a subclass in the ObjC binding. </span></span></pre></div>
<a id="trunkWebCoredomXMLTokenizerLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/XMLTokenizerLibxml2.cpp (36960 \
=> 36961)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/XMLTokenizerLibxml2.cpp 2008-09-26 17:57:55 \
UTC (rev 36960)
+++ trunk/WebCore/dom/XMLTokenizerLibxml2.cpp 2008-09-26 20:47:58 UTC (rev 36961)
</span><span class="lines">@@ -445,10 +445,12 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(XSLT)
</ins><span class="cx"> static void errorFunc(void*, const char*, ...)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: It would be nice to display error messages \
somewhere. </span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void setLoaderForLibXMLCallbacks(DocLoader* docLoader)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (36960 => 36961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog 2008-09-26 17:57:55 UTC (rev 36960)
+++ trunk/WebKit/mac/ChangeLog 2008-09-26 20:47:58 UTC (rev 36961)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2008-09-26 David Kilzer <ddkilzer@apple.com>
+
+ Fix Mac build with XSLT disabled
+
+ Reviewed by Alexey.
+
+ * Misc/WebCache.mm:
+ (+[WebCache statistics]): Populate xslStyleSheet statistics with
+ zeros if XSLT is disabled.
+
</ins><span class="cx"> 2008-09-25 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=21101
</span></span></pre></div>
<a id="trunkWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Misc/WebCache.mm (36960 => \
36961)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Misc/WebCache.mm 2008-09-26 17:57:55 UTC (rev \
36960)
+++ trunk/WebKit/mac/Misc/WebCache.mm 2008-09-26 20:47:58 UTC (rev 36961)
</span><span class="lines">@@ -41,25 +41,41 @@
</span><span class="cx"> [NSDictionary dictionaryWithObjectsAndKeys:
</span><span class="cx"> [NSNumber numberWithInt:s.images.count], \
@"Images", </span><span class="cx"> [NSNumber \
numberWithInt:s.cssStyleSheets.count], @"CSS", </span><ins>+#if \
ENABLE(XSLT) </ins><span class="cx"> [NSNumber \
numberWithInt:s.xslStyleSheets.count], @"XSL", </span><ins>+#else
+ [NSNumber numberWithInt:0], @"XSL",
+#endif
</ins><span class="cx"> [NSNumber numberWithInt:s.scripts.count], \
@"JavaScript", </span><span class="cx"> nil],
</span><span class="cx"> [NSDictionary dictionaryWithObjectsAndKeys:
</span><span class="cx"> [NSNumber numberWithInt:s.images.size], \
@"Images", </span><span class="cx"> [NSNumber \
numberWithInt:s.cssStyleSheets.size] ,@"CSS", </span><ins>+#if ENABLE(XSLT)
</ins><span class="cx"> [NSNumber numberWithInt:s.xslStyleSheets.size], \
@"XSL", </span><ins>+#else
+ [NSNumber numberWithInt:0], @"XSL",
+#endif
</ins><span class="cx"> [NSNumber numberWithInt:s.scripts.size], \
@"JavaScript", </span><span class="cx"> nil],
</span><span class="cx"> [NSDictionary dictionaryWithObjectsAndKeys:
</span><span class="cx"> [NSNumber numberWithInt:s.images.liveSize], \
@"Images", </span><span class="cx"> [NSNumber \
numberWithInt:s.cssStyleSheets.liveSize] ,@"CSS", </span><ins>+#if \
ENABLE(XSLT) </ins><span class="cx"> [NSNumber \
numberWithInt:s.xslStyleSheets.liveSize], @"XSL", </span><ins>+#else
+ [NSNumber numberWithInt:0], @"XSL",
+#endif
</ins><span class="cx"> [NSNumber numberWithInt:s.scripts.liveSize], \
@"JavaScript", </span><span class="cx"> nil],
</span><span class="cx"> [NSDictionary dictionaryWithObjectsAndKeys:
</span><span class="cx"> [NSNumber numberWithInt:s.images.decodedSize], \
@"Images", </span><span class="cx"> [NSNumber \
numberWithInt:s.cssStyleSheets.decodedSize] ,@"CSS", </span><ins>+#if \
ENABLE(XSLT) </ins><span class="cx"> [NSNumber \
numberWithInt:s.xslStyleSheets.decodedSize], @"XSL", </span><ins>+#else
+ [NSNumber numberWithInt:0], @"XSL",
+#endif
</ins><span class="cx"> [NSNumber numberWithInt:s.scripts.decodedSize], \
@"JavaScript", </span><span class="cx"> nil],
</span><span class="cx"> nil];
</span></span></pre></div>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (36960 => 36961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog 2008-09-26 17:57:55 UTC (rev 36960)
+++ trunk/WebKit/win/ChangeLog 2008-09-26 20:47:58 UTC (rev 36961)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2008-09-26 David Kilzer <ddkilzer@apple.com>
+
+ Speculative Windows build fix with XSLT disabled
+
+ Reviewed by Alexey.
+
+ * WebCache.cpp:
+ (WebCache::statistics): Populate xslStyleSheet statistics with
+ zeros if XSLT is disabled.
+
</ins><span class="cx"> 2008-09-24 Matt Lilek <webkit@mattlilek.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebKitwinWebCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebCache.cpp (36960 => \
36961)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebCache.cpp 2008-09-26 17:57:55 UTC (rev \
36960)
+++ trunk/WebKit/win/WebCache.cpp 2008-09-26 20:47:58 UTC (rev 36961)
</span><span class="lines">@@ -104,6 +104,9 @@
</span><span class="cx"> static CFStringRef stylesheetsKey = CFSTR("style \
sheets"); </span><span class="cx"> static CFStringRef xslKey = \
CFSTR("xsl"); </span><span class="cx"> static CFStringRef scriptsKey = \
CFSTR("scripts"); </span><ins>+#if !ENABLE(XSLT)
+ const int zero = 0;
+#endif
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CFMutableDictionaryRef> \
dictionary(AdoptCF, </span><span class="cx"> CFDictionaryCreateMutable(0, 0, \
&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks)); \
</span><span class="lines">@@ -114,7 +117,11 @@ </span><span class="cx"> \
value.adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.cssStyleSheets.count)); \
</span><span class="cx"> CFDictionaryAddValue(dictionary.get(), stylesheetsKey, \
value.get()); </span><span class="cx">
</span><ins>+#if ENABLE(XSLT)
</ins><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.xslStyleSheets.count)); </span><ins>+#else
+ value.adoptCF(CFNumberCreate(0, kCFNumberIntType, &zero));
+#endif
</ins><span class="cx"> CFDictionaryAddValue(dictionary.get(), xslKey, \
value.get()); </span><span class="cx">
</span><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.scripts.count)); </span><span class="lines">@@ -132,7 +139,11 @@
</span><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.cssStyleSheets.size)); </span><span class="cx"> \
CFDictionaryAddValue(dictionary.get(), stylesheetsKey, value.get()); </span><span \
class="cx"> </span><ins>+#if ENABLE(XSLT)
</ins><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.xslStyleSheets.size)); </span><ins>+#else
+ value.adoptCF(CFNumberCreate(0, kCFNumberIntType, &zero));
+#endif
</ins><span class="cx"> CFDictionaryAddValue(dictionary.get(), xslKey, \
value.get()); </span><span class="cx">
</span><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.scripts.size)); </span><span class="lines">@@ -150,7 +161,11 @@
</span><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.cssStyleSheets.liveSize)); </span><span class="cx"> \
CFDictionaryAddValue(dictionary.get(), stylesheetsKey, value.get()); </span><span \
class="cx"> </span><ins>+#if ENABLE(XSLT)
</ins><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.xslStyleSheets.liveSize)); </span><ins>+#else
+ value.adoptCF(CFNumberCreate(0, kCFNumberIntType, &zero));
+#endif
</ins><span class="cx"> CFDictionaryAddValue(dictionary.get(), xslKey, \
value.get()); </span><span class="cx">
</span><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.scripts.liveSize)); </span><span class="lines">@@ -168,7 +183,11 @@
</span><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.cssStyleSheets.decodedSize)); </span><span class="cx"> \
CFDictionaryAddValue(dictionary.get(), stylesheetsKey, value.get()); </span><span \
class="cx"> </span><ins>+#if ENABLE(XSLT)
</ins><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.xslStyleSheets.decodedSize)); </span><ins>+#else
+ value.adoptCF(CFNumberCreate(0, kCFNumberIntType, &zero));
+#endif
</ins><span class="cx"> CFDictionaryAddValue(dictionary.get(), xslKey, \
value.get()); </span><span class="cx">
</span><span class="cx"> value.adoptCF(CFNumberCreate(0, kCFNumberIntType, \
&stat.scripts.decodedSize)); </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic