<!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>[210316] 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/210316">210316</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-04 20:37:43 -0800 (Wed, 04 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: forced pseudo classes aren't cleared from inspected page when Inspector closes
https://bugs.webkit.org/show_bug.cgi?id=108823
<rdar://problem/13143550>
Reviewed by Timothy Hatcher.
* inspector/InspectorCSSAgent.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::documentDetached):
Clear the document from all of the different Document sets.
(WebCore::InspectorCSSAgent::didRemoveDocument): Deleted.
Use documentDetached, which is more direct.
(WebCore::InspectorCSSAgent::forcePseudoState):
Update the set of Documents with psuedo element changes. So when we
reset forced styles we know which documents to refresh styles.
(WebCore::InspectorCSSAgent::resetPseudoStates):
Use the list of documents we've already computed.
(WebCore::InspectorCSSAgent::didRemoveDOMNode):
(WebCore::InspectorCSSAgent::didModifyDOMAttr):
Change to take a reference and more data to avoid extra work.
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::unbind):
Eliminated didRemoveDocument.
(WebCore::InspectorDOMAgent::didModifyDOMAttr):
(WebCore::InspectorDOMAgent::didRemoveDOMAttr):
(WebCore::InspectorDOMAgent::styleAttributeInvalidated):
Pass a references to the DOM listener client, these are never null.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgenth">trunk/Source/WebCore/inspector/InspectorCSSAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgenth">trunk/Source/WebCore/inspector/InspectorDOMAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210315 => 210316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-05 04:35:48 UTC (rev 210315)
+++ trunk/Source/WebCore/ChangeLog 2017-01-05 04:37:43 UTC (rev 210316)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2017-01-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: forced pseudo classes aren't cleared from inspected page when Inspector closes
+ https://bugs.webkit.org/show_bug.cgi?id=108823
+ <rdar://problem/13143550>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::documentDetached):
+ Clear the document from all of the different Document sets.
+
+ (WebCore::InspectorCSSAgent::didRemoveDocument): Deleted.
+ Use documentDetached, which is more direct.
+
+ (WebCore::InspectorCSSAgent::forcePseudoState):
+ Update the set of Documents with psuedo element changes. So when we
+ reset forced styles we know which documents to refresh styles.
+
+ (WebCore::InspectorCSSAgent::resetPseudoStates):
+ Use the list of documents we've already computed.
+
+ (WebCore::InspectorCSSAgent::didRemoveDOMNode):
+ (WebCore::InspectorCSSAgent::didModifyDOMAttr):
+ Change to take a reference and more data to avoid extra work.
+
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::unbind):
+ Eliminated didRemoveDocument.
+
+ (WebCore::InspectorDOMAgent::didModifyDOMAttr):
+ (WebCore::InspectorDOMAgent::didRemoveDOMAttr):
+ (WebCore::InspectorDOMAgent::styleAttributeInvalidated):
+ Pass a references to the DOM listener client, these are never null.
+
</ins><span class="cx"> 2017-01-04 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove runtime flag for variation fonts
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (210315 => 210316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2017-01-05 04:35:48 UTC (rev 210315)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2017-01-05 04:37:43 UTC (rev 210316)
</span><span class="lines">@@ -410,6 +410,8 @@
</span><span class="cx"> setActiveStyleSheetsForDocument(document, emptyList);
</span><span class="cx">
</span><span class="cx"> m_documentToKnownCSSStyleSheets.remove(&document);
</span><ins>+ m_documentToInspectorStyleSheet.remove(&document);
+ m_documentsWithForcedPseudoStates.remove(&document);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::mediaQueryResultChanged()
</span><span class="lines">@@ -536,7 +538,7 @@
</span><span class="cx"> if (!nodeId)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- NodeIdToForcedPseudoState::iterator it = m_nodeIdToForcedPseudoState.find(nodeId);
</del><ins>+ auto it = m_nodeIdToForcedPseudoState.find(nodeId);
</ins><span class="cx"> if (it == m_nodeIdToForcedPseudoState.end())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -880,17 +882,21 @@
</span><span class="cx"> if (!element)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ auto it = m_nodeIdToForcedPseudoState.find(nodeId);
</ins><span class="cx"> unsigned forcedPseudoState = computePseudoClassMask(forcedPseudoClasses);
</span><del>- NodeIdToForcedPseudoState::iterator it = m_nodeIdToForcedPseudoState.find(nodeId);
</del><span class="cx"> unsigned currentForcedPseudoState = it == m_nodeIdToForcedPseudoState.end() ? 0 : it->value;
</span><del>- bool needStyleRecalc = forcedPseudoState != currentForcedPseudoState;
- if (!needStyleRecalc)
</del><ins>+ if (forcedPseudoState == currentForcedPseudoState)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (forcedPseudoState)
</del><ins>+ if (forcedPseudoState) {
</ins><span class="cx"> m_nodeIdToForcedPseudoState.set(nodeId, forcedPseudoState);
</span><del>- else
</del><ins>+ m_documentsWithForcedPseudoStates.add(&element->document());
+ } else {
</ins><span class="cx"> m_nodeIdToForcedPseudoState.remove(nodeId);
</span><ins>+ if (m_nodeIdToForcedPseudoState.isEmpty())
+ m_documentsWithForcedPseudoStates.clear();
+ }
+
</ins><span class="cx"> element->document().styleScope().didChangeStyleSheetEnvironment();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1042,12 +1048,12 @@
</span><span class="cx"> return inspectorStyleSheet ? inspectorStyleSheet->buildObjectForRule(rule, nullptr) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> InspectorCSSAgent::buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>& matchedRules, StyleResolver& styleResolver, Element& element, PseudoId psuedoId)
</del><ins>+RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> InspectorCSSAgent::buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>& matchedRules, StyleResolver& styleResolver, Element& element, PseudoId pseudoId)
</ins><span class="cx"> {
</span><span class="cx"> auto result = Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>::create();
</span><span class="cx">
</span><span class="cx"> SelectorChecker::CheckingContext context(SelectorChecker::Mode::CollectingRules);
</span><del>- context.pseudoId = psuedoId ? psuedoId : element.pseudoId();
</del><ins>+ context.pseudoId = pseudoId ? pseudoId : element.pseudoId();
</ins><span class="cx"> SelectorChecker selectorChecker(element.document());
</span><span class="cx">
</span><span class="cx"> for (auto& matchedRule : matchedRules) {
</span><span class="lines">@@ -1149,35 +1155,21 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::didRemoveDocument(Document* document)
</del><ins>+void InspectorCSSAgent::didRemoveDOMNode(Node& node, int nodeId)
</ins><span class="cx"> {
</span><del>- if (document)
- m_documentToInspectorStyleSheet.remove(document);
-}
</del><ins>+ m_nodeIdToForcedPseudoState.remove(nodeId);
</ins><span class="cx">
</span><del>-void InspectorCSSAgent::didRemoveDOMNode(Node* node)
-{
- if (!node)
- return;
-
- int nodeId = m_domAgent->boundNodeId(node);
- if (nodeId)
- m_nodeIdToForcedPseudoState.remove(nodeId);
-
- NodeToInspectorStyleSheet::iterator it = m_nodeToInspectorStyleSheet.find(node);
</del><ins>+ auto it = m_nodeToInspectorStyleSheet.find(&node);
</ins><span class="cx"> if (it == m_nodeToInspectorStyleSheet.end())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_idToInspectorStyleSheet.remove(it->value->id());
</span><del>- m_nodeToInspectorStyleSheet.remove(node);
</del><ins>+ m_nodeToInspectorStyleSheet.remove(&node);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::didModifyDOMAttr(Element* element)
</del><ins>+void InspectorCSSAgent::didModifyDOMAttr(Element& element)
</ins><span class="cx"> {
</span><del>- if (!element)
- return;
-
- NodeToInspectorStyleSheet::iterator it = m_nodeToInspectorStyleSheet.find(element);
</del><ins>+ auto it = m_nodeToInspectorStyleSheet.find(&element);
</ins><span class="cx"> if (it == m_nodeToInspectorStyleSheet.end())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1191,15 +1183,11 @@
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::resetPseudoStates()
</span><span class="cx"> {
</span><del>- HashSet<Document*> documentsToChange;
- for (auto& nodeId : m_nodeIdToForcedPseudoState) {
- if (Element* element = downcast<Element>(m_domAgent->nodeForId(nodeId.key)))
- documentsToChange.add(&element->document());
- }
</del><ins>+ for (auto& document : m_documentsWithForcedPseudoStates)
+ document->styleScope().didChangeStyleSheetEnvironment();
</ins><span class="cx">
</span><span class="cx"> m_nodeIdToForcedPseudoState.clear();
</span><del>- for (auto& document : documentsToChange)
- document->styleScope().didChangeStyleSheetEnvironment();
</del><ins>+ m_documentsWithForcedPseudoStates.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (210315 => 210316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2017-01-05 04:35:48 UTC (rev 210315)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2017-01-05 04:37:43 UTC (rev 210316)
</span><span class="lines">@@ -158,9 +158,8 @@
</span><span class="cx"> RefPtr<Inspector::Protocol::CSS::NamedFlow> buildObjectForNamedFlow(ErrorString&, WebKitNamedFlow*, int documentNodeId);
</span><span class="cx">
</span><span class="cx"> // InspectorDOMAgent::DOMListener implementation
</span><del>- void didRemoveDocument(Document*) override;
- void didRemoveDOMNode(Node*) override;
- void didModifyDOMAttr(Element*) override;
</del><ins>+ void didRemoveDOMNode(Node&, int nodeId) override;
+ void didModifyDOMAttr(Element&) override;
</ins><span class="cx">
</span><span class="cx"> // InspectorCSSAgent::Listener implementation
</span><span class="cx"> void styleSheetChanged(InspectorStyleSheet*) override;
</span><span class="lines">@@ -177,6 +176,7 @@
</span><span class="cx"> DocumentToViaInspectorStyleSheet m_documentToInspectorStyleSheet;
</span><span class="cx"> HashMap<Document*, HashSet<CSSStyleSheet*>> m_documentToKnownCSSStyleSheets;
</span><span class="cx"> NodeIdToForcedPseudoState m_nodeIdToForcedPseudoState;
</span><ins>+ HashSet<Document*> m_documentsWithForcedPseudoStates;
</ins><span class="cx"> HashSet<int> m_namedFlowCollectionsRequested;
</span><span class="cx"> std::unique_ptr<ChangeRegionOversetTask> m_changeRegionOversetTask;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (210315 => 210316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2017-01-05 04:35:48 UTC (rev 210315)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2017-01-05 04:37:43 UTC (rev 210316)
</span><span class="lines">@@ -328,10 +328,7 @@
</span><span class="cx">
</span><span class="cx"> if (node->isFrameOwnerElement()) {
</span><span class="cx"> const HTMLFrameOwnerElement* frameOwner = static_cast<const HTMLFrameOwnerElement*>(node);
</span><del>- Document* contentDocument = frameOwner->contentDocument();
- if (m_domListener)
- m_domListener->didRemoveDocument(contentDocument);
- if (contentDocument)
</del><ins>+ if (Document* contentDocument = frameOwner->contentDocument())
</ins><span class="cx"> unbind(contentDocument, nodesMap);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -347,7 +344,7 @@
</span><span class="cx">
</span><span class="cx"> nodesMap->remove(node);
</span><span class="cx"> if (m_domListener)
</span><del>- m_domListener->didRemoveDOMNode(node);
</del><ins>+ m_domListener->didRemoveDOMNode(*node, id);
</ins><span class="cx">
</span><span class="cx"> bool childrenRequested = m_childrenRequested.contains(id);
</span><span class="cx"> if (childrenRequested) {
</span><span class="lines">@@ -2021,7 +2018,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_domListener)
</span><del>- m_domListener->didModifyDOMAttr(&element);
</del><ins>+ m_domListener->didModifyDOMAttr(element);
</ins><span class="cx">
</span><span class="cx"> m_frontendDispatcher->attributeModified(id, name, value);
</span><span class="cx"> }
</span><span class="lines">@@ -2034,7 +2031,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_domListener)
</span><del>- m_domListener->didModifyDOMAttr(&element);
</del><ins>+ m_domListener->didModifyDOMAttr(element);
</ins><span class="cx">
</span><span class="cx"> m_frontendDispatcher->attributeRemoved(id, name);
</span><span class="cx"> }
</span><span class="lines">@@ -2049,7 +2046,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (m_domListener)
</span><del>- m_domListener->didModifyDOMAttr(element);
</del><ins>+ m_domListener->didModifyDOMAttr(*element);
</ins><span class="cx"> nodeIds->addItem(id);
</span><span class="cx"> }
</span><span class="cx"> m_frontendDispatcher->inlineStyleInvalidated(WTFMove(nodeIds));
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (210315 => 210316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2017-01-05 04:35:48 UTC (rev 210315)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2017-01-05 04:37:43 UTC (rev 210316)
</span><span class="lines">@@ -92,12 +92,9 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> struct DOMListener {
</span><del>- virtual ~DOMListener()
- {
- }
- virtual void didRemoveDocument(Document*) = 0;
- virtual void didRemoveDOMNode(Node*) = 0;
- virtual void didModifyDOMAttr(Element*) = 0;
</del><ins>+ virtual ~DOMListener() { }
+ virtual void didRemoveDOMNode(Node&, int nodeId) = 0;
+ virtual void didModifyDOMAttr(Element&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> InspectorDOMAgent(WebAgentContext&, InspectorPageAgent*, InspectorOverlay*);
</span></span></pre>
</div>
</div>
</body>
</html>