<!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>[153014] 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/153014">153014</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2013-07-22 17:14:59 -0700 (Mon, 22 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>RenderEmbeddedObject::isReplacementObscured should include the arrow in its area-of-interest
https://bugs.webkit.org/show_bug.cgi?id=118995
&lt;rdar://problem/14516421&gt;

Reviewed by Anders Carlsson.

* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::unavailablePluginIndicatorBounds):
Rename method from replacementTextRect to unavailablePluginIndicatorBounds for accuracy.
Use the bounding box of the indicator's path, which includes the rounded rect behind
the text as well as the arrow button.

(WebCore::RenderEmbeddedObject::isReplacementObscured):
* rendering/RenderEmbeddedObject.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjecth">trunk/Source/WebCore/rendering/RenderEmbeddedObject.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (153013 => 153014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-07-23 00:05:46 UTC (rev 153013)
+++ trunk/Source/WebCore/ChangeLog        2013-07-23 00:14:59 UTC (rev 153014)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2013-07-22  Tim Horton  &lt;timothy_horton@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        RenderEmbeddedObject::isReplacementObscured should include the arrow in its area-of-interest
+        https://bugs.webkit.org/show_bug.cgi?id=118995
+        &lt;rdar://problem/14516421&gt;
+
+        Reviewed by Anders Carlsson.
+
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::unavailablePluginIndicatorBounds):
+        Rename method from replacementTextRect to unavailablePluginIndicatorBounds for accuracy.
+        Use the bounding box of the indicator's path, which includes the rounded rect behind
+        the text as well as the arrow button.
+
+        (WebCore::RenderEmbeddedObject::isReplacementObscured):
+        * rendering/RenderEmbeddedObject.h:
+
+2013-07-22  Tim Horton  &lt;timothy_horton@apple.com&gt;
+
</ins><span class="cx">         &lt;applet&gt; plugins are instantiated post-attach (instead of post-layout like for object and embed)
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=118994
</span><span class="cx">         &lt;rdar://problem/14511232&gt;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (153013 => 153014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp        2013-07-23 00:05:46 UTC (rev 153013)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp        2013-07-23 00:14:59 UTC (rev 153014)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-LayoutRect RenderEmbeddedObject::replacementTextRect(const LayoutPoint&amp; accumulatedOffset) const
</del><ins>+LayoutRect RenderEmbeddedObject::unavailablePluginIndicatorBounds(const LayoutPoint&amp; accumulatedOffset) const
</ins><span class="cx"> {
</span><span class="cx">     FloatRect contentRect;
</span><span class="cx">     Path path;
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">     TextRun run(&quot;&quot;, 0);
</span><span class="cx">     float textWidth;
</span><span class="cx">     if (getReplacementTextGeometry(accumulatedOffset, contentRect, path, replacementTextRect, arrowRect, font, run, textWidth))
</span><del>-        return LayoutRect(replacementTextRect);
</del><ins>+        return LayoutRect(path.boundingRect());
</ins><span class="cx"> 
</span><span class="cx">     return LayoutRect();
</span><span class="cx"> }
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx">     // Calculate the absolute rect for the blocked plugin replacement text.
</span><span class="cx">     IntRect absoluteBoundingBox = absoluteBoundingBoxRect();
</span><span class="cx">     LayoutPoint absoluteLocation(absoluteBoundingBox.location());
</span><del>-    LayoutRect rect = replacementTextRect(absoluteLocation);
</del><ins>+    LayoutRect rect = unavailablePluginIndicatorBounds(absoluteLocation);
</ins><span class="cx">     if (rect.isEmpty())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.h (153013 => 153014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.h        2013-07-23 00:05:46 UTC (rev 153013)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.h        2013-07-23 00:14:59 UTC (rev 153014)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">     bool isInUnavailablePluginIndicator(MouseEvent*) const;
</span><span class="cx">     bool isInUnavailablePluginIndicator(const LayoutPoint&amp;) const;
</span><span class="cx">     bool getReplacementTextGeometry(const LayoutPoint&amp; accumulatedOffset, FloatRect&amp; contentRect, Path&amp;, FloatRect&amp; replacementTextRect, FloatRect&amp; arrowRect, Font&amp;, TextRun&amp;, float&amp; textWidth) const;
</span><del>-    LayoutRect replacementTextRect(const LayoutPoint&amp;) const;
</del><ins>+    LayoutRect unavailablePluginIndicatorBounds(const LayoutPoint&amp;) const;
</ins><span class="cx"> 
</span><span class="cx">     virtual bool canHaveChildren() const;
</span><span class="cx">     virtual RenderObjectChildList* virtualChildren() { return children(); }
</span></span></pre>
</div>
</div>

</body>
</html>