<!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>[20651] branches/Safari-522/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20651">20651</a></dd>
<dt>Author</dt> <dd>sfalken</dd>
<dt>Date</dt> <dd>2007-04-01 16:29:50 -0700 (Sun, 01 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge fix from r20570</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSafari522WebCoreChangeLog">branches/Safari-522/WebCore/ChangeLog</a></li>
<li><a href="#branchesSafari522WebCorecssCSSComputedStyleDeclarationcpp">branches/Safari-522/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSafari522WebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebCore/ChangeLog (20650 => 20651)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebCore/ChangeLog 2007-04-01 23:27:14 UTC (rev 20650)
+++ branches/Safari-522/WebCore/ChangeLog 2007-04-01 23:29:50 UTC (rev 20651)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2007-03-29 David Hyatt <hyatt@apple.com>
+
+ Fix for <rdar://problem/4545060>, technorati and arstechnica fail because of getComputedStyle not
+ reporting display:none properly when it is set. This is bugzilla bug 13103.
+
+ Reviewed by mitz
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+
</ins><span class="cx"> 2007-03-28 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin.
</span></span></pre></div>
<a id="branchesSafari522WebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebCore/css/CSSComputedStyleDeclaration.cpp (20650 => 20651)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebCore/css/CSSComputedStyleDeclaration.cpp 2007-04-01 23:27:14 UTC (rev 20650)
+++ branches/Safari-522/WebCore/css/CSSComputedStyleDeclaration.cpp 2007-04-01 23:29:50 UTC (rev 20651)
</span><span class="lines">@@ -481,10 +481,15 @@
</span><span class="cx"> if (updateLayout)
</span><span class="cx"> node->document()->updateLayout();
</span><span class="cx">
</span><del>- // FIXME: This should work even if we do not have a renderer.
</del><ins>+ // FIXME: This should work even if we do not have a renderer for all properties.
</ins><span class="cx"> RenderObject* renderer = node->renderer();
</span><del>- if (!renderer)
</del><ins>+ if (!renderer) {
+ // Handle display:none at the very least. By definition if we don't have a renderer
+ // we are considered to have no display.
+ if (propertyID == CSS_PROP_DISPLAY)
+ return new CSSPrimitiveValue(CSS_VAL_NONE);
</ins><span class="cx"> return 0;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> RenderStyle* style = renderer->style();
</span><span class="cx"> if (!style)
</span></span></pre>
</div>
</div>
</body>
</html>