<!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>[172487] 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/172487">172487</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 13:37:37 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove isInCanvasSubtree bit
https://bugs.webkit.org/show_bug.cgi?id=135837
Reviewed by Andreas Kling.
The logic to update this bit is in a wrong place and it is not clear it does
the right thing in all cases. Also the optimization doesn't seem necessary,
the focus code is not that hot.
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::getOrCreate):
* dom/Element.cpp:
(WebCore::Element::isFocusable):
(WebCore::Element::clearStyleDerivedDataBeforeDetachingRenderer):
(WebCore::Element::setIsInCanvasSubtree): Deleted.
(WebCore::Element::isInCanvasSubtree): Deleted.
* dom/Element.h:
* dom/ElementRareData.h:
(WebCore::ElementRareData::ElementRareData):
(WebCore::ElementRareData::isInCanvasSubtree): Deleted.
(WebCore::ElementRareData::setIsInCanvasSubtree): Deleted.
* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::isKeyboardFocusable):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::HTMLCanvasElement):
(WebCore::HTMLCanvasElement::willAttachRenderers): Deleted.
* html/HTMLCanvasElement.h:
* style/StyleResolveTree.cpp:
(WebCore::Style::attachRenderTree):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementRareDatah">trunk/Source/WebCore/dom/ElementRareData.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementh">trunk/Source/WebCore/html/HTMLCanvasElement.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-08-12 Antti Koivisto <antti@apple.com>
+
+ Remove isInCanvasSubtree bit
+ https://bugs.webkit.org/show_bug.cgi?id=135837
+
+ Reviewed by Andreas Kling.
+
+ The logic to update this bit is in a wrong place and it is not clear it does
+ the right thing in all cases. Also the optimization doesn't seem necessary,
+ the focus code is not that hot.
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::getOrCreate):
+ * dom/Element.cpp:
+ (WebCore::Element::isFocusable):
+ (WebCore::Element::clearStyleDerivedDataBeforeDetachingRenderer):
+ (WebCore::Element::setIsInCanvasSubtree): Deleted.
+ (WebCore::Element::isInCanvasSubtree): Deleted.
+ * dom/Element.h:
+ * dom/ElementRareData.h:
+ (WebCore::ElementRareData::ElementRareData):
+ (WebCore::ElementRareData::isInCanvasSubtree): Deleted.
+ (WebCore::ElementRareData::setIsInCanvasSubtree): Deleted.
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::isKeyboardFocusable):
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::HTMLCanvasElement):
+ (WebCore::HTMLCanvasElement::willAttachRenderers): Deleted.
+ * html/HTMLCanvasElement.h:
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::attachRenderTree):
+
</ins><span class="cx"> 2014-08-11 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Get rid of iOS.xcconfig
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -58,9 +58,11 @@
</span><span class="cx"> #include "AccessibilityTableRow.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Editor.h"
</span><ins>+#include "ElementIterator.h"
</ins><span class="cx"> #include "FocusController.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLAreaElement.h"
</span><ins>+#include "HTMLCanvasElement.h"
</ins><span class="cx"> #include "HTMLImageElement.h"
</span><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include "HTMLLabelElement.h"
</span><span class="lines">@@ -379,8 +381,8 @@
</span><span class="cx">
</span><span class="cx"> // It's only allowed to create an AccessibilityObject from a Node if it's in a canvas subtree.
</span><span class="cx"> // Or if it's a hidden element, but we still want to expose it because of other ARIA attributes.
</span><del>- bool inCanvasSubtree = node->parentElement()->isInCanvasSubtree();
- bool isHidden = !node->renderer() && isNodeAriaVisible(node);
</del><ins>+ bool inCanvasSubtree = lineageOfType<HTMLCanvasElement>(*node->parentElement()).first();
+ bool isHidden = isNodeAriaVisible(node);
</ins><span class="cx">
</span><span class="cx"> bool insideMeterElement = false;
</span><span class="cx"> #if ENABLE(METER_ELEMENT)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -434,18 +434,15 @@
</span><span class="cx"> if (!inDocument() || !supportsFocus())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Elements in canvas fallback content are not rendered, but they are allowed to be
- // focusable as long as their canvas is displayed and visible.
- if (isInCanvasSubtree()) {
- ASSERT(lineageOfType<HTMLCanvasElement>(*this).first());
- auto& canvas = *lineageOfType<HTMLCanvasElement>(*this).first();
- return canvas.renderer() && canvas.renderer()->style().visibility() == VISIBLE;
- }
-
</del><span class="cx"> if (!renderer()) {
</span><span class="cx"> // If the node is in a display:none tree it might say it needs style recalc but
</span><span class="cx"> // the whole document is actually up to date.
</span><span class="cx"> ASSERT(!needsStyleRecalc() || !document().childNeedsStyleRecalc());
</span><ins>+
+ // Elements in canvas fallback content are not rendered, but they are allowed to be
+ // focusable as long as their canvas is displayed and visible.
+ if (auto* canvas = ancestorsOfType<HTMLCanvasElement>(*this).first())
+ return canvas->renderer() && canvas->renderer()->style().visibility() == VISIBLE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Even if we are not visible, we might have a child that is visible.
</span><span class="lines">@@ -2212,16 +2209,6 @@
</span><span class="cx"> return elementRareData()->childIndex();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::setIsInCanvasSubtree(bool isInCanvasSubtree)
-{
- ensureElementRareData().setIsInCanvasSubtree(isInCanvasSubtree);
-}
-
-bool Element::isInCanvasSubtree() const
-{
- return hasRareData() && elementRareData()->isInCanvasSubtree();
-}
-
</del><span class="cx"> void Element::setRegionOversetState(RegionOversetState state)
</span><span class="cx"> {
</span><span class="cx"> ensureElementRareData().setRegionOversetState(state);
</span><span class="lines">@@ -2890,7 +2877,6 @@
</span><span class="cx"> if (!hasRareData())
</span><span class="cx"> return;
</span><span class="cx"> ElementRareData* data = elementRareData();
</span><del>- data->setIsInCanvasSubtree(false);
</del><span class="cx"> data->resetComputedStyle();
</span><span class="cx"> data->resetDynamicRestyleObservations();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/dom/Element.h 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -382,9 +382,6 @@
</span><span class="cx"> void setChildrenAffectedByBackwardPositionalRules();
</span><span class="cx"> void setChildIndex(unsigned);
</span><span class="cx">
</span><del>- void setIsInCanvasSubtree(bool);
- bool isInCanvasSubtree() const;
-
</del><span class="cx"> void setRegionOversetState(RegionOversetState);
</span><span class="cx"> RegionOversetState regionOversetState() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementRareData.h (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementRareData.h 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -60,9 +60,6 @@
</span><span class="cx"> bool styleAffectedByEmpty() const { return m_styleAffectedByEmpty; }
</span><span class="cx"> void setStyleAffectedByEmpty(bool value) { m_styleAffectedByEmpty = value; }
</span><span class="cx">
</span><del>- bool isInCanvasSubtree() const { return m_isInCanvasSubtree; }
- void setIsInCanvasSubtree(bool value) { m_isInCanvasSubtree = value; }
-
</del><span class="cx"> RegionOversetState regionOversetState() const { return m_regionOversetState; }
</span><span class="cx"> void setRegionOversetState(RegionOversetState state) { m_regionOversetState = state; }
</span><span class="cx">
</span><span class="lines">@@ -124,7 +121,6 @@
</span><span class="cx"> unsigned m_tabIndexWasSetExplicitly : 1;
</span><span class="cx"> unsigned m_needsFocusAppearanceUpdateSoonAfterAttach : 1;
</span><span class="cx"> unsigned m_styleAffectedByEmpty : 1;
</span><del>- unsigned m_isInCanvasSubtree : 1;
</del><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> unsigned m_containsFullScreenElement : 1;
</span><span class="cx"> #endif
</span><span class="lines">@@ -169,7 +165,6 @@
</span><span class="cx"> , m_tabIndexWasSetExplicitly(false)
</span><span class="cx"> , m_needsFocusAppearanceUpdateSoonAfterAttach(false)
</span><span class="cx"> , m_styleAffectedByEmpty(false)
</span><del>- , m_isInCanvasSubtree(false)
</del><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> , m_containsFullScreenElement(false)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Attribute.h"
</span><span class="cx"> #include "DNS.h"
</span><ins>+#include "ElementIterator.h"
</ins><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -33,6 +34,7 @@
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><ins>+#include "HTMLCanvasElement.h"
</ins><span class="cx"> #include "HTMLImageElement.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx"> #include "KeyboardEvent.h"
</span><span class="lines">@@ -142,7 +144,7 @@
</span><span class="cx"> if (!document().frame()->eventHandler().tabsToLinks(event))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (isInCanvasSubtree())
</del><ins>+ if (!renderer() && ancestorsOfType<HTMLCanvasElement>(*this).first())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return hasNonEmptyBox(renderBoxModelObject());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -85,7 +85,6 @@
</span><span class="cx"> , m_didClearImageBuffer(false)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(canvasTag));
</span><del>- setHasCustomStyleResolveCallbacks();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<HTMLCanvasElement> HTMLCanvasElement::create(Document& document)
</span><span class="lines">@@ -125,11 +124,6 @@
</span><span class="cx"> return HTMLElement::createElementRenderer(WTF::move(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLCanvasElement::willAttachRenderers()
-{
- setIsInCanvasSubtree(true);
-}
-
</del><span class="cx"> bool HTMLCanvasElement::canContainRangeEndPoint() const
</span><span class="cx"> {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.h 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -142,7 +142,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
</span><del>- virtual void willAttachRenderers() override;
</del><span class="cx">
</span><span class="cx"> virtual bool canContainRangeEndPoint() const override;
</span><span class="cx"> virtual bool canStartSelection() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (172486 => 172487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-08-12 20:29:09 UTC (rev 172486)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-08-12 20:37:37 UTC (rev 172487)
</span><span class="lines">@@ -587,9 +587,6 @@
</span><span class="cx">
</span><span class="cx"> createRendererIfNeeded(current, inheritedStyle, renderTreePosition, resolvedStyle);
</span><span class="cx">
</span><del>- if (current.parentElement() && current.parentElement()->isInCanvasSubtree())
- current.setIsInCanvasSubtree(true);
-
</del><span class="cx"> StyleResolverParentPusher parentPusher(&current);
</span><span class="cx">
</span><span class="cx"> RenderTreePosition childRenderTreePosition(current.renderer());
</span></span></pre>
</div>
</div>
</body>
</html>