<!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>[193135] branches/safari-601-branch</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/193135">193135</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:49:59 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188631">r188631</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreinspectorprotocolCSSjson">branches/safari-601-branch/Source/JavaScriptCore/inspector/protocol/CSS.json</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSStyleSheetcpp">branches/safari-601-branch/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSStyleSheeth">branches/safari-601-branch/Source/WebCore/css/CSSStyleSheet.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomInlineStyleSheetOwnercpp">branches/safari-601-branch/Source/WebCore/dom/InlineStyleSheetOwner.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorStyleSheetcpp">branches/safari-601-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSRulejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSRule.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSStyleSheetjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsinspectorcssgetAllStyleSheetsexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/css/getAllStyleSheets-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectorcssgetAllStyleSheetshtml">branches/safari-601-branch/LayoutTests/inspector/css/getAllStyleSheets.html</a></li>
<li>branches/safari-601-branch/LayoutTests/inspector/css/resources/</li>
<li><a href="#branchessafari601branchLayoutTestsinspectorcssresourcesexternalcss">branches/safari-601-branch/LayoutTests/inspector/css/resources/external.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188631. rdar://problem/23221163
+
+ 2015-08-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Links for rules in <style> are incorrect, do not account for <style> offset in the document
+ https://bugs.webkit.org/show_bug.cgi?id=148141
+
+ Reviewed by Brian Burg.
+
+ * inspector/css/getAllStyleSheets-expected.txt: Added.
+ * inspector/css/getAllStyleSheets.html: Added.
+ * inspector/css/resources/external.css: Added.
+ (body):
+ Test for style sheet header information for external and inline stylesheets.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188407. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-13 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectorcssgetAllStyleSheetsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/css/getAllStyleSheets-expected.txt (0 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/css/getAllStyleSheets-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/css/getAllStyleSheets-expected.txt 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Test CSS.getAllStyleSheets returns expected information for different style sheet sources.
+
+PASS: There should be three stylesheets.
+
+URL: inspector/css/resources/external.css
+OFFSET: (0, 0)
+PASS: Stylesheet should have a frame.
+
+URL: <style> on inspector/css/getAllStyleSheets.html
+OFFSET: (5, 7)
+PASS: Stylesheet should have a frame.
+
+URL: inspector/css/getAllStyleSheets.html
+OFFSET: (0, 0)
+PASS: Stylesheet should have a frame.
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectorcssgetAllStyleSheetshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/css/getAllStyleSheets.html (0 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/css/getAllStyleSheets.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/css/getAllStyleSheets.html 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<link rel="stylesheet" href="resources/external.css">
+<style>body { color: blue; }</style>
+<script>
+var style = document.createElement("style");
+style.textContent = "body { color: gray; }";
+document.head.appendChild(style);
+</script>
+</script>
+<script>
+function test()
+{
+ function sanitizeURL(url) {
+ return url.replace(/^.*?LayoutTests\//, "");
+ }
+
+ WebInspector.cssStyleManager.fetchStyleSheetsIfNeeded();
+ InspectorBackend.runAfterPendingDispatches(function() {
+ let styleSheets = WebInspector.cssStyleManager.styleSheets;
+ InspectorTest.expectThat(styleSheets.length === 3, "There should be three stylesheets.");
+
+ for (let styleSheet of styleSheets) {
+ InspectorTest.log("");
+ InspectorTest.log(`URL: ${styleSheet.isInlineStyleTag() ? "<style> on " : ""}${sanitizeURL(styleSheet.url)}`);
+ InspectorTest.log(`OFFSET: (${styleSheet.startLineNumber}, ${styleSheet.startColumnNumber})`);
+ InspectorTest.expectThat(styleSheet.parentFrame, "Stylesheet should have a frame.");
+ }
+
+ InspectorTest.completeTest();
+ });
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Test CSS.getAllStyleSheets returns expected information for different style sheet sources.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectorcssresourcesexternalcss"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/css/resources/external.css (0 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/css/resources/external.css (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/css/resources/external.css 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+body { color: red; }
</ins></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ChangeLog (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188631. rdar://problem/23221163
+
+ 2015-08-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Links for rules in <style> are incorrect, do not account for <style> offset in the document
+ https://bugs.webkit.org/show_bug.cgi?id=148141
+
+ Reviewed by Brian Burg.
+
+ * inspector/protocol/CSS.json:
+ Extend StyleSheetHeader to include start offset information and a bit
+ for whether or not this was an inline style tag created by the parser.
+ These match additions to Blink's protocol.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188549. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-17 Saam barati <sbarati@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreinspectorprotocolCSSjson"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/inspector/protocol/CSS.json (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/inspector/protocol/CSS.json 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/JavaScriptCore/inspector/protocol/CSS.json 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -96,7 +96,10 @@
</span><span class="cx"> { "name": "sourceURL", "type": "string", "description": "Stylesheet resource URL."},
</span><span class="cx"> { "name": "origin", "$ref": "StyleSheetOrigin", "description": "Stylesheet origin."},
</span><span class="cx"> { "name": "title", "type": "string", "description": "Stylesheet title."},
</span><del>- { "name": "disabled", "type": "boolean", "description": "Denotes whether the stylesheet is disabled."}
</del><ins>+ { "name": "disabled", "type": "boolean", "description": "Denotes whether the stylesheet is disabled."},
+ { "name": "isInline", "type": "boolean", "description": "Whether this stylesheet is a <style> tag created by the parser. This is not set for document.written <style> tags." },
+ { "name": "startLine", "type": "number", "description": "Line offset of the stylesheet within the resource (zero based)." },
+ { "name": "startColumn", "type": "number", "description": "Column offset of the stylesheet within the resource (zero based)." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "CSS stylesheet metainformation."
</span><span class="cx"> },
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
+ Merge r188631. rdar://problem/23221163
+
+ 2015-08-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Links for rules in <style> are incorrect, do not account for <style> offset in the document
+ https://bugs.webkit.org/show_bug.cgi?id=148141
+
+ Reviewed by Brian Burg.
+
+ Test: inspector/css/getAllStyleSheets.html
+
+ * css/CSSStyleSheet.h:
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::create):
+ (WebCore::CSSStyleSheet::createInline):
+ (WebCore::CSSStyleSheet::CSSStyleSheet):
+ Include the starting position when created by the Parser.
+ Default to the minimum position, which should never be
+ possible for an inline <style> because the "<style>" characters
+ themselves require at least some offset.
+
+ * dom/InlineStyleSheetOwner.cpp:
+ (WebCore::InlineStyleSheetOwner::createSheet):
+ Provide the start position offset for this stylesheet if it was inline.
+
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::buildObjectForStyleSheetInfo):
+ Include new protocol values for the style sheet.
+
</ins><span class="cx"> 2015-12-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187496. rdar://problem/23221163
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSStyleSheet.cpp (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSStyleSheet.cpp 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebCore/css/CSSStyleSheet.cpp 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -82,13 +82,13 @@
</span><span class="cx">
</span><span class="cx"> Ref<CSSStyleSheet> CSSStyleSheet::create(Ref<StyleSheetContents>&& sheet, Node* ownerNode)
</span><span class="cx"> {
</span><del>- return adoptRef(*new CSSStyleSheet(WTF::move(sheet), ownerNode, false));
</del><ins>+ return adoptRef(*new CSSStyleSheet(WTF::move(sheet), ownerNode, TextPosition::minimumPosition(), false));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<CSSStyleSheet> CSSStyleSheet::createInline(Node& ownerNode, const URL& baseURL, const String& encoding)
</del><ins>+Ref<CSSStyleSheet> CSSStyleSheet::createInline(Node& ownerNode, const URL& baseURL, const TextPosition& startPosition, const String& encoding)
</ins><span class="cx"> {
</span><span class="cx"> CSSParserContext parserContext(ownerNode.document(), baseURL, encoding);
</span><del>- return adoptRef(*new CSSStyleSheet(StyleSheetContents::create(baseURL.string(), parserContext), &ownerNode, true));
</del><ins>+ return adoptRef(*new CSSStyleSheet(StyleSheetContents::create(baseURL.string(), parserContext), &ownerNode, startPosition, true));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSStyleSheet::CSSStyleSheet(Ref<StyleSheetContents>&& contents, CSSImportRule* ownerRule)
</span><span class="lines">@@ -98,17 +98,19 @@
</span><span class="cx"> , m_mutatedRules(false)
</span><span class="cx"> , m_ownerNode(0)
</span><span class="cx"> , m_ownerRule(ownerRule)
</span><ins>+ , m_startPosition()
</ins><span class="cx"> {
</span><span class="cx"> m_contents->registerClient(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSStyleSheet::CSSStyleSheet(Ref<StyleSheetContents>&& contents, Node* ownerNode, bool isInlineStylesheet)
</del><ins>+CSSStyleSheet::CSSStyleSheet(Ref<StyleSheetContents>&& contents, Node* ownerNode, const TextPosition& startPosition, bool isInlineStylesheet)
</ins><span class="cx"> : m_contents(WTF::move(contents))
</span><span class="cx"> , m_isInlineStylesheet(isInlineStylesheet)
</span><span class="cx"> , m_isDisabled(false)
</span><span class="cx"> , m_mutatedRules(false)
</span><span class="cx"> , m_ownerNode(ownerNode)
</span><span class="cx"> , m_ownerRule(0)
</span><ins>+ , m_startPosition(startPosition)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isAcceptableCSSStyleSheetParent(ownerNode));
</span><span class="cx"> m_contents->registerClient(this);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSStyleSheet.h (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSStyleSheet.h 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebCore/css/CSSStyleSheet.h 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/TypeCasts.h>
</span><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><ins>+#include <wtf/text/TextPosition.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<CSSStyleSheet> create(Ref<StyleSheetContents>&&, CSSImportRule* ownerRule = 0);
</span><span class="cx"> static Ref<CSSStyleSheet> create(Ref<StyleSheetContents>&&, Node* ownerNode);
</span><del>- static Ref<CSSStyleSheet> createInline(Node&, const URL&, const String& encoding = String());
</del><ins>+ static Ref<CSSStyleSheet> createInline(Node&, const URL&, const TextPosition& startPosition = TextPosition::minimumPosition(), const String& encoding = String());
</ins><span class="cx">
</span><span class="cx"> virtual ~CSSStyleSheet();
</span><span class="cx">
</span><span class="lines">@@ -118,11 +119,14 @@
</span><span class="cx">
</span><span class="cx"> StyleSheetContents& contents() { return m_contents; }
</span><span class="cx">
</span><ins>+ bool isInline() const { return m_isInlineStylesheet; }
+ TextPosition startPosition() const { return m_startPosition; }
+
</ins><span class="cx"> void detachFromDocument() { m_ownerNode = nullptr; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CSSStyleSheet(Ref<StyleSheetContents>&&, CSSImportRule* ownerRule);
</span><del>- CSSStyleSheet(Ref<StyleSheetContents>&&, Node* ownerNode, bool isInlineStylesheet);
</del><ins>+ CSSStyleSheet(Ref<StyleSheetContents>&&, Node* ownerNode, const TextPosition& startPosition, bool isInlineStylesheet);
</ins><span class="cx">
</span><span class="cx"> virtual bool isCSSStyleSheet() const override { return true; }
</span><span class="cx"> virtual String type() const override { return ASCIILiteral("text/css"); }
</span><span class="lines">@@ -139,6 +143,8 @@
</span><span class="cx"> Node* m_ownerNode;
</span><span class="cx"> CSSImportRule* m_ownerRule;
</span><span class="cx">
</span><ins>+ TextPosition m_startPosition;
+
</ins><span class="cx"> mutable RefPtr<MediaList> m_mediaCSSOMWrapper;
</span><span class="cx"> mutable Vector<RefPtr<CSSRule>> m_childRuleCSSOMWrappers;
</span><span class="cx"> mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomInlineStyleSheetOwnercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/InlineStyleSheetOwner.cpp (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> m_loading = true;
</span><span class="cx">
</span><del>- m_sheet = CSSStyleSheet::createInline(element, URL(), document.inputEncoding());
</del><ins>+ m_sheet = CSSStyleSheet::createInline(element, URL(), m_startTextPosition, document.inputEncoding());
</ins><span class="cx"> m_sheet->setMediaQueries(mediaQueries.release());
</span><span class="cx"> m_sheet->setTitle(element.title());
</span><span class="cx"> m_sheet->contents().parseStringAtPosition(text, m_startTextPosition, m_isParsingChildren);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -806,6 +806,9 @@
</span><span class="cx"> .setSourceURL(finalURL())
</span><span class="cx"> .setTitle(styleSheet->title())
</span><span class="cx"> .setFrameId(m_pageAgent->frameId(frame))
</span><ins>+ .setIsInline(styleSheet->isInline() && styleSheet->startPosition() != TextPosition::minimumPosition())
+ .setStartLine(styleSheet->startPosition().m_line.zeroBasedInt())
+ .setStartColumn(styleSheet->startPosition().m_column.zeroBasedInt())
</ins><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -1,5 +1,59 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188631. rdar://problem/23221163
+
+ 2015-08-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Links for rules in <style> are incorrect, do not account for <style> offset in the document
+ https://bugs.webkit.org/show_bug.cgi?id=148141
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Controllers/CSSStyleManager.js:
+ (WebInspector.CSSStyleManager):
+ (WebInspector.CSSStyleManager.prototype.get styleSheets):
+ (WebInspector.CSSStyleManager.prototype.fetchStyleSheetsIfNeeded):
+ (WebInspector.CSSStyleManager.prototype.styleSheetForIdentifier):
+ (WebInspector.CSSStyleManager.prototype._mainResourceDidChange):
+ Update more information about a StyleSheet when fetched.
+
+ * UserInterface/Models/CSSRule.js:
+ (WebInspector.CSSRule.prototype.update):
+ Eliminate usage of `delete`.
+
+ * UserInterface/Models/CSSStyleSheet.js:
+ (WebInspector.CSSStyleSheet):
+ (WebInspector.CSSStyleSheet.prototype.get startLineNumber):
+ (WebInspector.CSSStyleSheet.prototype.get startColumnNumber):
+ (WebInspector.CSSStyleSheet.prototype.hasInfo):
+ (WebInspector.CSSStyleSheet.prototype.isInlineStyleTag):
+ (WebInspector.CSSStyleSheet.prototype.updateInfo):
+ Include more information about this stylesheet.
+
+ (WebInspector.CSSStyleSheet.prototype.offsetSourceCodeLocation):
+ Include helper API to offset a source code location by the startLine/Column
+ of this stylesheet itself, if it was an inline style.
+
+ (WebInspector.CSSStyleSheet.prototype.isInlineStyleAttributeStyleSheet):
+ (WebInspector.CSSStyleSheet.prototype.markAsInlineStyleAttributeStyleSheet):
+ (WebInspector.CSSStyleSheet.isInlineStyle): Deleted.
+ (WebInspector.CSSStyleSheet.prototype.markAsInlineStyle): Deleted.
+ Rename for clarity.
+
+ * UserInterface/Models/DOMNodeStyles.js:
+ (WebInspector.DOMNodeStyles.prototype.refresh):
+ Fetch stylesheet header information eagerly, so we have them early on.
+
+ (WebInspector.DOMNodeStyles.prototype._parseStyleDeclarationPayload):
+ (WebInspector.DOMNodeStyles.prototype._parseRulePayload):
+ Offset sourceCodeLocations for CSSRules based on the StyleSheet offset.
+
+ * UserInterface/Models/SourceCodeLocation.js:
+ (WebInspector.SourceCodeLocation.prototype.update):
+ Improve coding style.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188630. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-18 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx">
</span><span class="cx"> this._colorFormatSetting = new WebInspector.Setting("default-color-format", WebInspector.Color.Format.Original);
</span><span class="cx">
</span><ins>+ this._fetchedInitialStyleSheets = false;
</ins><span class="cx"> this._styleSheetIdentifierMap = new Map;
</span><span class="cx"> this._styleSheetFrameURLMap = new Map;
</span><span class="cx"> this._nodeStylesMap = {};
</span><span class="lines">@@ -55,6 +56,11 @@
</span><span class="cx"> return this._colorFormatSetting.value;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get styleSheets()
+ {
+ return [...this._styleSheetIdentifierMap.values()];
+ }
+
</ins><span class="cx"> canForcePseudoClasses()
</span><span class="cx"> {
</span><span class="cx"> return window.CSSAgent && !!CSSAgent.forcePseudoState;
</span><span class="lines">@@ -93,6 +99,14 @@
</span><span class="cx"> return match[1];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ fetchStyleSheetsIfNeeded()
+ {
+ if (this._fetchedInitialStyleSheets)
+ return;
+
+ this._fetchInfoForAllStyleSheets(function() {});
+ }
+
</ins><span class="cx"> styleSheetForIdentifier(id)
</span><span class="cx"> {
</span><span class="cx"> var styleSheet = this._styleSheetIdentifierMap.get(id);
</span><span class="lines">@@ -131,7 +145,7 @@
</span><span class="cx"> console.assert(styleSheet);
</span><span class="cx">
</span><span class="cx"> // Do not observe inline styles
</span><del>- if (styleSheet.isInlineStyle())
</del><ins>+ if (styleSheet.isInlineStyleAttributeStyleSheet())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> styleSheet.noteContentDidChange();
</span><span class="lines">@@ -173,6 +187,7 @@
</span><span class="cx">
</span><span class="cx"> // Clear our maps when the main frame navigates.
</span><span class="cx">
</span><ins>+ this._fetchedInitialStyleSheets = false;
</ins><span class="cx"> this._styleSheetIdentifierMap.clear();
</span><span class="cx"> this._styleSheetFrameURLMap.clear();
</span><span class="cx"> this._nodeStylesMap = {};
</span><span class="lines">@@ -253,12 +268,17 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (var styleSheetInfo of styleSheets) {
</del><ins>+ for (let styleSheetInfo of styleSheets) {
</ins><span class="cx"> // COMPATIBILITY (iOS 6): The info did not have 'frameId', so make parentFrame null in that case.
</span><span class="cx"> var parentFrame = "frameId" in styleSheetInfo ? WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId) : null;
</span><span class="cx">
</span><ins>+ // COMPATIBILITY (iOS 9): The info did not have 'isInline', 'startLine', and 'startColumn', so make false and 0 in these cases.
+ var isInline = styleSheetInfo.isInline || false;
+ var startLine = styleSheetInfo.startLine || 0;
+ var startColumn = styleSheetInfo.startColumn || 0;
+
</ins><span class="cx"> var styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
</span><del>- styleSheet.updateInfo(styleSheetInfo.sourceURL, parentFrame);
</del><ins>+ styleSheet.updateInfo(styleSheetInfo.sourceURL, parentFrame, isInline, startLine, startColumn);
</ins><span class="cx">
</span><span class="cx"> var key = this._frameURLMapKey(parentFrame, styleSheetInfo.sourceURL);
</span><span class="cx"> this._styleSheetFrameURLMap.set(key, styleSheet);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSRulejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSRule.js (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> this._style = style;
</span><span class="cx"> this._mediaList = mediaList;
</span><span class="cx">
</span><del>- delete this._matchedSelectors;
- delete this._matchedSelectorText;
</del><ins>+ this._matchedSelectors = null;
+ this._matchedSelectorText = null;
</ins><span class="cx">
</span><span class="cx"> if (this._style)
</span><span class="cx"> this._style.ownerRule = this;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSStyleSheetjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -34,6 +34,13 @@
</span><span class="cx"> this._id = id || null;
</span><span class="cx"> this._url = null;
</span><span class="cx"> this._parentFrame = null;
</span><ins>+ this._startLineNumber = 0;
+ this._startColumnNumber = 0;
+
+ this._inlineStyleAttribute = false;
+ this._inlineStyleTag = false;
+
+ this._hasInfo = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Static
</span><span class="lines">@@ -84,24 +91,64 @@
</span><span class="cx"> return WebInspector.UIString("Anonymous StyleSheet %d").format(this._uniqueDisplayNameNumber);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- isInlineStyle()
</del><ins>+ get startLineNumber()
</ins><span class="cx"> {
</span><del>- return !!this._inlineStyle;
</del><ins>+ return this._startLineNumber;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- markAsInlineStyle()
</del><ins>+ get startColumnNumber()
</ins><span class="cx"> {
</span><del>- this._inlineStyle = true;
</del><ins>+ return this._startColumnNumber;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ hasInfo()
+ {
+ return this._hasInfo;
+ }
+
+ isInlineStyleTag()
+ {
+ return this._inlineStyleTag;
+ }
+
+ isInlineStyleAttributeStyleSheet()
+ {
+ return this._inlineStyleAttribute;
+ }
+
+ markAsInlineStyleAttributeStyleSheet()
+ {
+ this._inlineStyleAttribute = true;
+ }
+
+ offsetSourceCodeLocation(sourceCodeLocation)
+ {
+ if (!sourceCodeLocation)
+ return null;
+
+ if (!this._hasInfo)
+ return sourceCodeLocation;
+
+ var sourceCode = sourceCodeLocation.sourceCode;
+ var lineNumber = this._startLineNumber + sourceCodeLocation.lineNumber;
+ var columnNumber = this._startColumnNumber + sourceCodeLocation.columnNumber;
+ return sourceCode.createSourceCodeLocation(lineNumber, columnNumber);
+ }
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><del>- updateInfo(url, parentFrame)
</del><ins>+ updateInfo(url, parentFrame, inlineStyle, startLineNumber, startColumnNumber)
</ins><span class="cx"> {
</span><ins>+ this._hasInfo = true;
+
</ins><span class="cx"> this._url = url || null;
</span><del>- delete this._urlComponents;
</del><ins>+ this._urlComponents = undefined;
</ins><span class="cx">
</span><span class="cx"> this._parentFrame = parentFrame || null;
</span><ins>+
+ this._inlineStyleTag = inlineStyle;
+ this._startLineNumber = startLineNumber;
+ this._startColumnNumber = startColumnNumber;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get revisionForRequestedContent()
</span><span class="lines">@@ -143,7 +190,7 @@
</span><span class="cx"> noteContentDidChange()
</span><span class="cx"> {
</span><span class="cx"> if (this._ignoreNextContentDidChangeNotification) {
</span><del>- delete this._ignoreNextContentDidChangeNotification;
</del><ins>+ this._ignoreNextContentDidChangeNotification = false;
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -235,6 +235,9 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMNodeStyles.Event.Refreshed, {significantChange});
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // FIXME: Convert to pushing StyleSheet information to the frontend. <rdar://problem/13213680>
+ WebInspector.cssStyleManager.fetchStyleSheetsIfNeeded();
+
</ins><span class="cx"> CSSAgent.getMatchedStylesForNode.invoke({nodeId: this._node.id, includePseudo: true, includeInherited: true}, fetchedMatchedStyles.bind(this));
</span><span class="cx"> CSSAgent.getInlineStylesForNode.invoke({nodeId: this._node.id}, fetchedInlineStyles.bind(this));
</span><span class="cx"> CSSAgent.getComputedStyleForNode.invoke({nodeId: this._node.id}, fetchedComputedStyle.bind(this));
</span><span class="lines">@@ -727,7 +730,7 @@
</span><span class="cx"> var styleSheet = id ? WebInspector.cssStyleManager.styleSheetForIdentifier(id.styleSheetId) : null;
</span><span class="cx"> if (styleSheet) {
</span><span class="cx"> if (type === WebInspector.CSSStyleDeclaration.Type.Inline)
</span><del>- styleSheet.markAsInlineStyle();
</del><ins>+ styleSheet.markAsInlineStyleAttributeStyleSheet();
</ins><span class="cx"> styleSheet.addEventListener(WebInspector.CSSStyleSheet.Event.ContentDidChange, this._styleSheetContentDidChange, this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -810,6 +813,8 @@
</span><span class="cx"> if (!style)
</span><span class="cx"> return null;
</span><span class="cx">
</span><ins>+ var styleSheet = id ? WebInspector.cssStyleManager.styleSheetForIdentifier(id.styleSheetId) : null;
+
</ins><span class="cx"> // COMPATIBILITY (iOS 6): The payload had 'selectorText' as a property,
</span><span class="cx"> // now it has 'selectorList' with a 'text' property. Support both here.
</span><span class="cx"> var selectorText = payload.selectorList ? payload.selectorList.text : payload.selectorText;
</span><span class="lines">@@ -822,6 +827,8 @@
</span><span class="cx"> var sourceCodeLocation = this._createSourceCodeLocation(payload.sourceURL, sourceRange.startLine, sourceRange.startColumn);
</span><span class="cx"> } else
</span><span class="cx"> var sourceCodeLocation = this._createSourceCodeLocation(payload.sourceURL, payload.sourceLine);
</span><ins>+ if (styleSheet)
+ sourceCodeLocation = styleSheet.offsetSourceCodeLocation(sourceCodeLocation);
</ins><span class="cx">
</span><span class="cx"> var type;
</span><span class="cx"> switch (payload.origin) {
</span><span class="lines">@@ -861,6 +868,8 @@
</span><span class="cx">
</span><span class="cx"> var mediaText = mediaItem.text;
</span><span class="cx"> var mediaSourceCodeLocation = this._createSourceCodeLocation(mediaItem.sourceURL, mediaItem.sourceLine);
</span><ins>+ if (styleSheet)
+ mediaSourceCodeLocation = styleSheet.offsetSourceCodeLocation(mediaSourceCodeLocation);
</ins><span class="cx">
</span><span class="cx"> mediaList.push(new WebInspector.CSSMedia(mediaType, mediaText, mediaSourceCodeLocation));
</span><span class="cx"> }
</span><span class="lines">@@ -870,7 +879,6 @@
</span><span class="cx"> return rule;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var styleSheet = id ? WebInspector.cssStyleManager.styleSheetForIdentifier(id.styleSheetId) : null;
</del><span class="cx"> if (styleSheet)
</span><span class="cx"> styleSheet.addEventListener(WebInspector.CSSStyleSheet.Event.ContentDidChange, this._styleSheetContentDidChange, this);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js (193134 => 193135)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2015-12-03 18:49:50 UTC (rev 193134)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2015-12-03 18:49:59 UTC (rev 193135)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> if (sourceCode === this._sourceCode && lineNumber === this._lineNumber && columnNumber === this._columnNumber)
</span><span class="cx"> return;
</span><del>- else if (this._mappedResource && sourceCode === this._mappedResource && lineNumber === this._mappedLineNumber && columnNumber === this._mappedColumnNumber)
</del><ins>+ if (this._mappedResource && sourceCode === this._mappedResource && lineNumber === this._mappedLineNumber && columnNumber === this._mappedColumnNumber)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var newSourceCodeLocation = sourceCode.createSourceCodeLocation(lineNumber, columnNumber);
</span></span></pre>
</div>
</div>
</body>
</html>