<!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>[150783] 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/150783">150783</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2013-05-27 16:53:47 -0700 (Mon, 27 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move hasNonEmptyBoundingBox from Node to HTMLAnchorElement
https://bugs.webkit.org/show_bug.cgi?id=116842

Reviewed by Antti Koivisto.

* dom/Node.cpp: Removed hasNonEmptyBoundingBox.
* dom/Node.h: Ditto.

* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::isMouseFocusable): Fixed #if to be more readable and
added more-explicit clearer comments. No behavior change.
(WebCore::hasNonEmptyBox): Added.  Has the same code that was in
Node::hasNonEmptyBoundingBox with some additional comments.
(WebCore::HTMLAnchorElement::isKeyboardFocusable): Call hasNonEmptyBox.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (150782 => 150783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-27 23:40:38 UTC (rev 150782)
+++ trunk/Source/WebCore/ChangeLog        2013-05-27 23:53:47 UTC (rev 150783)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2013-05-27  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Move hasNonEmptyBoundingBox from Node to HTMLAnchorElement
+        https://bugs.webkit.org/show_bug.cgi?id=116842
+
+        Reviewed by Antti Koivisto.
+
+        * dom/Node.cpp: Removed hasNonEmptyBoundingBox.
+        * dom/Node.h: Ditto.
+
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::isMouseFocusable): Fixed #if to be more readable and
+        added more-explicit clearer comments. No behavior change.
+        (WebCore::hasNonEmptyBox): Added.  Has the same code that was in
+        Node::hasNonEmptyBoundingBox with some additional comments.
+        (WebCore::HTMLAnchorElement::isKeyboardFocusable): Call hasNonEmptyBox.
+
+2013-05-27  Darin Adler  &lt;darin@apple.com&gt;
+
</ins><span class="cx">         Move isBlockFlowElement and related functions out of the Node class into editing code
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=116846
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (150782 => 150783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp        2013-05-27 23:40:38 UTC (rev 150782)
+++ trunk/Source/WebCore/dom/Node.cpp        2013-05-27 23:53:47 UTC (rev 150783)
</span><span class="lines">@@ -773,27 +773,6 @@
</span><span class="cx">     return LayoutRect();    
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool Node::hasNonEmptyBoundingBox() const
-{
-    // Before calling absoluteRects, check for the common case where the renderer
-    // is non-empty, since this is a faster check and almost always returns true.
-    RenderBoxModelObject* box = renderBoxModelObject();
-    if (!box)
-        return false;
-    if (!box-&gt;borderBoundingBox().isEmpty())
-        return true;
-
-    Vector&lt;IntRect&gt; rects;
-    FloatPoint absPos = renderer()-&gt;localToAbsolute();
-    renderer()-&gt;absoluteRects(rects, flooredLayoutPoint(absPos));
-    size_t n = rects.size();
-    for (size_t i = 0; i &lt; n; ++i)
-        if (!rects[i].isEmpty())
-            return true;
-
-    return false;
-}
-
</del><span class="cx"> inline void Node::setStyleChange(StyleChangeType changeType)
</span><span class="cx"> {
</span><span class="cx">     m_nodeFlags = (m_nodeFlags &amp; ~StyleChangeMask) | changeType;
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (150782 => 150783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h        2013-05-27 23:40:38 UTC (rev 150782)
+++ trunk/Source/WebCore/dom/Node.h        2013-05-27 23:53:47 UTC (rev 150783)
</span><span class="lines">@@ -426,11 +426,6 @@
</span><span class="cx">     LayoutRect renderRect(bool* isReplaced);
</span><span class="cx">     IntRect pixelSnappedRenderRect(bool* isReplaced) { return pixelSnappedIntRect(renderRect(isReplaced)); }
</span><span class="cx"> 
</span><del>-    // Returns true if the node has a non-empty bounding box in layout.
-    // This does not 100% guarantee the user can see it, but is pretty close.
-    // Note: This method only works properly after layout has occurred.
-    bool hasNonEmptyBoundingBox() const;
-
</del><span class="cx">     unsigned nodeIndex() const;
</span><span class="cx"> 
</span><span class="cx">     // Returns the DOM ownerDocument attribute. This method never returns NULL, except in the case 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (150782 => 150783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp        2013-05-27 23:40:38 UTC (rev 150782)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp        2013-05-27 23:53:47 UTC (rev 150783)
</span><span class="lines">@@ -94,17 +94,40 @@
</span><span class="cx"> 
</span><span class="cx"> bool HTMLAnchorElement::isMouseFocusable() const
</span><span class="cx"> {
</span><del>-    // Anchor elements should be mouse focusable, https://bugs.webkit.org/show_bug.cgi?id=26856
-#if !PLATFORM(GTK) &amp;&amp; !PLATFORM(QT) &amp;&amp; !PLATFORM(EFL)
</del><ins>+#if !(PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT))
+    // Only allow links with tabIndex or contentEditable to be mouse focusable.
+    // This is our rule for the Mac platform; on many other platforms we focus any link you click on.
</ins><span class="cx">     if (isLink())
</span><del>-        // Only allow links with tabIndex or contentEditable to be mouse focusable.
</del><span class="cx">         return HTMLElement::supportsFocus();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    // Allow tab index etc to control focus.
</del><span class="cx">     return HTMLElement::isMouseFocusable();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static bool hasNonEmptyBox(RenderModelBoxObject* renderer)
+{
+    if (!renderer)
+        return false;
+
+    // Before calling absoluteRects, check for the common case where borderBoundingBox
+    // is non-empty, since this is a faster check and almost always returns true.
+    // FIXME: Why do we need to call absoluteRects at all?
+    if (!renderer-&gt;borderBoundingBox().isEmpty())
+        return true;
+
+    // FIXME: Since all we are checking is whether the rects are empty, could we just
+    // pass in 0,0 for the layout point instead of calling localToAbsolute?
+    Vector&lt;IntRect&gt; rects;
+    renderer-&gt;absoluteRects(rects, flooredLayoutPoint(renderer-&gt;localToAbsolute()));
+    size_t size = rects.size();
+    for (size_t i = 0; i &lt; size; ++i) {
+        if (!rects[i].isEmpty())
+            return true;
+    }
+
+    return false;
+}
+
</ins><span class="cx"> bool HTMLAnchorElement::isKeyboardFocusable(KeyboardEvent* event) const
</span><span class="cx"> {
</span><span class="cx">     if (!isLink())
</span><span class="lines">@@ -122,7 +145,7 @@
</span><span class="cx">     if (isInCanvasSubtree())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><del>-    return hasNonEmptyBoundingBox();
</del><ins>+    return hasNonEmptyBox(renderBoxModelObject());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void appendServerMapMousePosition(StringBuilder&amp; url, Event* event)
</span></span></pre>
</div>
</div>

</body>
</html>