<!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>[180454] 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/180454">180454</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 14:23:53 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow <attachment> elements to be focused
https://bugs.webkit.org/show_bug.cgi?id=141847
Reviewed by Enrica Casucci.
* css/html.css:
(attachment:focus):
Disable focus rings for <attachment>.
* html/HTMLAttachmentElement.cpp:
(WebCore::HTMLAttachmentElement::setFocus):
* html/HTMLAttachmentElement.h:
Allow HTMLAttachmentElement to get editing focus.
Let RenderAttachment know when focus changes.
* rendering/RenderAttachment.cpp:
(WebCore::RenderAttachment::paintReplaced):
Paint the background in cyan when we are inside the selection or have focus.
Otherwise, it will be gray.
(WebCore::RenderAttachment::focusChanged):
When focus changes, repaint.
* rendering/RenderAttachment.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttachmentElementcpp">trunk/Source/WebCore/html/HTMLAttachmentElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttachmentElementh">trunk/Source/WebCore/html/HTMLAttachmentElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderAttachmentcpp">trunk/Source/WebCore/rendering/RenderAttachment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderAttachmenth">trunk/Source/WebCore/rendering/RenderAttachment.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180453 => 180454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-20 22:21:47 UTC (rev 180453)
+++ trunk/Source/WebCore/ChangeLog 2015-02-20 22:23:53 UTC (rev 180454)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-02-20 Tim Horton <timothy_horton@apple.com>
+
+ Allow <attachment> elements to be focused
+ https://bugs.webkit.org/show_bug.cgi?id=141847
+
+ Reviewed by Enrica Casucci.
+
+ * css/html.css:
+ (attachment:focus):
+ Disable focus rings for <attachment>.
+
+ * html/HTMLAttachmentElement.cpp:
+ (WebCore::HTMLAttachmentElement::setFocus):
+ * html/HTMLAttachmentElement.h:
+ Allow HTMLAttachmentElement to get editing focus.
+ Let RenderAttachment know when focus changes.
+
+ * rendering/RenderAttachment.cpp:
+ (WebCore::RenderAttachment::paintReplaced):
+ Paint the background in cyan when we are inside the selection or have focus.
+ Otherwise, it will be gray.
+
+ (WebCore::RenderAttachment::focusChanged):
+ When focus changes, repaint.
+
+ * rendering/RenderAttachment.h:
+
</ins><span class="cx"> 2015-02-20 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename ScrollElasticityController to ScrollController
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (180453 => 180454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2015-02-20 22:21:47 UTC (rev 180453)
+++ trunk/Source/WebCore/css/html.css 2015-02-20 22:23:53 UTC (rev 180454)
</span><span class="lines">@@ -1184,6 +1184,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(ENABLE_ATTACHMENT_ELEMENT) && ENABLE_ATTACHMENT_ELEMENT
+attachment:focus {
+ outline: none;
+}
+#endif
+
</ins><span class="cx"> /* page */
</span><span class="cx">
</span><span class="cx"> @page {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.cpp (180453 => 180454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2015-02-20 22:21:47 UTC (rev 180453)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2015-02-20 22:23:53 UTC (rev 180454)
</span><span class="lines">@@ -50,6 +50,20 @@
</span><span class="cx"> {
</span><span class="cx"> return createRenderer<RenderAttachment>(*this, WTF::move(style));
</span><span class="cx"> }
</span><ins>+
+void HTMLAttachmentElement::setFocus(bool shouldBeFocused)
+{
+ if (focused() == shouldBeFocused)
+ return;
+
+ HTMLElement::setFocus(shouldBeFocused);
+
+ auto* renderer = this->renderer();
+ if (!is<RenderAttachment>(renderer))
+ return;
+
+ downcast<RenderAttachment>(*renderer).focusChanged();
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.h (180453 => 180454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.h 2015-02-20 22:21:47 UTC (rev 180453)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.h 2015-02-20 22:23:53 UTC (rev 180454)
</span><span class="lines">@@ -40,6 +40,9 @@
</span><span class="cx"> HTMLAttachmentElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&) override;
</span><ins>+
+ virtual bool isFocusable() const override { return true; }
+ virtual void setFocus(bool shouldBeFocused) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderAttachmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderAttachment.cpp (180453 => 180454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderAttachment.cpp 2015-02-20 22:21:47 UTC (rev 180453)
+++ trunk/Source/WebCore/rendering/RenderAttachment.cpp 2015-02-20 22:23:53 UTC (rev 180454)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx">
</span><span class="cx"> #include "FloatRect.h"
</span><ins>+#include "FrameSelection.h"
</ins><span class="cx"> #include "HTMLAttachmentElement.h"
</span><span class="cx"> #include "PaintInfo.h"
</span><span class="cx">
</span><span class="lines">@@ -50,11 +51,20 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Implement
</span><span class="cx">
</span><ins>+ RefPtr<Range> selectionRange = frame().selection().selection().firstRange();
+ bool selected = selectionRange && selectionRange->intersectsNode(&nodeForNonAnonymous(), ASSERT_NO_EXCEPTION);
+ bool focused = frame().selection().isFocusedAndActive() && document().focusedElement() == &attachmentElement();
+
</ins><span class="cx"> paintInfo.context->save();
</span><del>- paintInfo.context->fillRect(FloatRect(paintOffset.x(), paintOffset.y(), 200, 200), Color::cyan, ColorSpaceSRGB);
</del><ins>+ paintInfo.context->fillRect(FloatRect(paintOffset.x(), paintOffset.y(), 200, 200), selected || focused ? Color::cyan : Color::lightGray, ColorSpaceSRGB);
</ins><span class="cx"> paintInfo.context->restore();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderAttachment::focusChanged()
+{
+ repaint();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderAttachmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderAttachment.h (180453 => 180454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderAttachment.h 2015-02-20 22:21:47 UTC (rev 180453)
+++ trunk/Source/WebCore/rendering/RenderAttachment.h 2015-02-20 22:23:53 UTC (rev 180454)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx">
</span><span class="cx"> HTMLAttachmentElement& attachmentElement() const;
</span><span class="cx">
</span><ins>+ void focusChanged();
+
</ins><span class="cx"> private:
</span><span class="cx"> void element() const = delete;
</span><span class="cx"> virtual bool isAttachment() const override { return true; }
</span></span></pre>
</div>
</div>
</body>
</html>