<!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>[180794] 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/180794">180794</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 16:09:09 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre><attachment> should be selected immediately upon click, and be drag/copyable upon click
https://bugs.webkit.org/show_bug.cgi?id=142114
<rdar://problem/19982520>
Reviewed by Enrica Casucci.
* css/html.css:
(attachment):
Make attachment use 'user-select: all' to act as a single click-to-select unit.
* html/HTMLAttachmentElement.cpp:
(WebCore::HTMLAttachmentElement::setFocus): Deleted.
* html/HTMLAttachmentElement.h:
* rendering/RenderAttachment.cpp:
(WebCore::RenderAttachment::isFocused): Deleted.
(WebCore::RenderAttachment::focusChanged): Deleted.
* rendering/RenderAttachment.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintAttachment):
Remove focus-related code; instead of focusing the element upon click,
we get a selection including just the <attachment>, and everything
behaves much more consistently (copy works, drag works, etc.).</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>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180793 => 180794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-28 00:06:48 UTC (rev 180793)
+++ trunk/Source/WebCore/ChangeLog 2015-02-28 00:09:09 UTC (rev 180794)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-02-27 Timothy Horton <timothy_horton@apple.com>
+
+ <attachment> should be selected immediately upon click, and be drag/copyable upon click
+ https://bugs.webkit.org/show_bug.cgi?id=142114
+ <rdar://problem/19982520>
+
+ Reviewed by Enrica Casucci.
+
+ * css/html.css:
+ (attachment):
+ Make attachment use 'user-select: all' to act as a single click-to-select unit.
+
+ * html/HTMLAttachmentElement.cpp:
+ (WebCore::HTMLAttachmentElement::setFocus): Deleted.
+ * html/HTMLAttachmentElement.h:
+ * rendering/RenderAttachment.cpp:
+ (WebCore::RenderAttachment::isFocused): Deleted.
+ (WebCore::RenderAttachment::focusChanged): Deleted.
+ * rendering/RenderAttachment.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintAttachment):
+ Remove focus-related code; instead of focusing the element upon click,
+ we get a selection including just the <attachment>, and everything
+ behaves much more consistently (copy works, drag works, etc.).
+
</ins><span class="cx"> 2015-02-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Some MathML tests crash in RenderMathMLOperator::advanceForGlyph() or boundsForGlyph()
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (180793 => 180794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2015-02-28 00:06:48 UTC (rev 180793)
+++ trunk/Source/WebCore/css/html.css 2015-02-28 00:09:09 UTC (rev 180794)
</span><span class="lines">@@ -1195,6 +1195,7 @@
</span><span class="cx"> #if defined(ENABLE_ATTACHMENT_ELEMENT) && ENABLE_ATTACHMENT_ELEMENT
</span><span class="cx"> attachment {
</span><span class="cx"> -webkit-appearance: attachment;
</span><ins>+ -webkit-user-select: all;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> attachment:focus {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.cpp (180793 => 180794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2015-02-28 00:06:48 UTC (rev 180793)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2015-02-28 00:09:09 UTC (rev 180794)
</span><span class="lines">@@ -72,20 +72,6 @@
</span><span class="cx"> downcast<RenderAttachment>(*renderer).representedFileChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(ATTACHMENT_ELEMENT)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.h (180793 => 180794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.h 2015-02-28 00:06:48 UTC (rev 180793)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.h 2015-02-28 00:09:09 UTC (rev 180794)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> class HTMLAttachmentElement final : public HTMLElement {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLAttachmentElement> create(const QualifiedName&, Document&);
</span><del>- virtual bool canContainRangeEndPoint() const override { return false; }
</del><span class="cx"> File* file() const;
</span><span class="cx"> void setFile(File*);
</span><span class="cx">
</span><span class="lines">@@ -47,8 +46,7 @@
</span><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&) override;
</span><span class="cx">
</span><del>- virtual bool isFocusable() const override { return true; }
- virtual void setFocus(bool shouldBeFocused) override;
</del><ins>+ virtual bool canContainRangeEndPoint() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> RefPtr<File> m_file;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderAttachmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderAttachment.cpp (180793 => 180794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderAttachment.cpp 2015-02-28 00:06:48 UTC (rev 180793)
+++ trunk/Source/WebCore/rendering/RenderAttachment.cpp 2015-02-28 00:09:09 UTC (rev 180794)
</span><span class="lines">@@ -57,11 +57,6 @@
</span><span class="cx"> return selectionRange && selectionRange->intersectsNode(&nodeForNonAnonymous(), ASSERT_NO_EXCEPTION);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderAttachment::isFocused() const
-{
- return frame().selection().isFocusedAndActive() && document().focusedElement() == &attachmentElement();
-}
-
</del><span class="cx"> void RenderAttachment::layout()
</span><span class="cx"> {
</span><span class="cx"> setIntrinsicSize(document().page()->theme().attachmentIntrinsicSize(*this));
</span><span class="lines">@@ -69,11 +64,6 @@
</span><span class="cx"> RenderReplaced::layout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderAttachment::focusChanged()
-{
- repaint();
-}
-
</del><span class="cx"> void RenderAttachment::representedFileChanged()
</span><span class="cx"> {
</span><span class="cx"> setNeedsLayout();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderAttachmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderAttachment.h (180793 => 180794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderAttachment.h 2015-02-28 00:06:48 UTC (rev 180793)
+++ trunk/Source/WebCore/rendering/RenderAttachment.h 2015-02-28 00:09:09 UTC (rev 180794)
</span><span class="lines">@@ -40,10 +40,9 @@
</span><span class="cx">
</span><span class="cx"> HTMLAttachmentElement& attachmentElement() const;
</span><span class="cx">
</span><del>- void focusChanged();
</del><span class="cx"> void representedFileChanged();
</span><span class="cx">
</span><del>- bool isSelectedOrFocused() const { return isSelected() || isFocused(); }
</del><ins>+ bool isSelected() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void element() const = delete;
</span><span class="lines">@@ -54,9 +53,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void layout() override;
</span><span class="cx">
</span><del>- bool isSelected() const;
- bool isFocused() const;
-
</del><span class="cx"> virtual int baselinePosition(FontBaseline, bool, LineDirectionMode, LinePositionMode) const;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (180793 => 180794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-02-28 00:06:48 UTC (rev 180793)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-02-28 00:09:09 UTC (rev 180794)
</span><span class="lines">@@ -2251,7 +2251,7 @@
</span><span class="cx"> context.translate(toFloatSize(paintRect.location()));
</span><span class="cx"> context.translate(FloatSize((layout.attachmentRect.width() - attachmentIconBackgroundSize) / 2, 0));
</span><span class="cx">
</span><del>- bool useSelectedStyle = attachment.isSelectedOrFocused();
</del><ins>+ bool useSelectedStyle = attachment.isSelected();
</ins><span class="cx">
</span><span class="cx"> if (useSelectedStyle)
</span><span class="cx"> paintAttachmentIconBackground(attachment, context, layout);
</span></span></pre>
</div>
</div>
</body>
</html>