Diff
Modified: trunk/LayoutTests/ChangeLog (208355 => 208356)
--- trunk/LayoutTests/ChangeLog 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/LayoutTests/ChangeLog 2016-11-03 23:18:01 UTC (rev 208356)
@@ -1,3 +1,16 @@
+2016-11-03 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r208302.
+
+ This change causes LayoutTest crashes under GuardMalloc.
+
+ Reverted changeset:
+
+ "Load stylesheets in link elements inside a connected shadow
+ tree"
+ https://bugs.webkit.org/show_bug.cgi?id=160683
+ http://trac.webkit.org/changeset/208302
+
2016-11-03 Yusuke Suzuki <[email protected]>
Unreviewed, rolling out due to crash in Amazon web site
Deleted: trunk/LayoutTests/fast/shadow-dom/link-element-in-shadow-tree-expected.txt (208355 => 208356)
--- trunk/LayoutTests/fast/shadow-dom/link-element-in-shadow-tree-expected.txt 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/LayoutTests/fast/shadow-dom/link-element-in-shadow-tree-expected.txt 2016-11-03 23:18:01 UTC (rev 208356)
@@ -1,12 +0,0 @@
-
-PASS Link elements should load stylesheets inside a connected shadow tree with closed mode
-PASS Link elements should load stylesheets inside a connected shadow tree with open mode
-PASS Link elements must not load stylesheets inside a disconnceted shadow tree with closed mode
-PASS Link elements must not load stylesheets inside a disconnceted shadow tree with open mode
-PASS Style rules loaded inside a shadow tree with closed mode must apply to a div in the shadow tree
-PASS Style rules loaded inside a shadow tree with open mode must apply to a div in the shadow tree
-PASS :host style rules loaded inside a shadow tree with closed mode must apply to the host element
-PASS :host style rules loaded inside a shadow tree with open mode must apply to the host element
-PASS Link elements should load stylesheets inside a connected shadow tree with closed mode
-PASS Link elements should load stylesheets inside a connected shadow tree with open mode
-
Deleted: trunk/LayoutTests/fast/shadow-dom/link-element-in-shadow-tree.html (208355 => 208356)
--- trunk/LayoutTests/fast/shadow-dom/link-element-in-shadow-tree.html 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/LayoutTests/fast/shadow-dom/link-element-in-shadow-tree.html 2016-11-03 23:18:01 UTC (rev 208356)
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Shadow DOM: Link elements should load stylesheets inside shadow trees</title>
-<meta name="author" title="Ryosuke Niwa" href=""
-<meta name="assert" content="Link elements should load inside shadow trees">
-<script src=''></script>
-<script src=''></script>
-</head>
-<body>
-<script>
-
-function wait_for_onload(element, callback = null) {
- return new Promise(function (resolve, reject) {
- element._onload_ = resolve;
- element._onerror_ = reject;
- setTimeout(() => reject('timeout'), 100);
- if (callback)
- return callback();
- });
-}
-
-let test_iframe;
-function create_iframe() {
- if (test_iframe)
- test_iframe.remove();
-
- test_iframe = document.createElement('iframe');
- return wait_for_onload().then(() => test_iframe.contentWindow, () => {
- document.body.appendChild(test_iframe);
- }).then(function () {
- const doc = test_iframe.contentWindow.document;
- doc.open();
- doc.write('<!DOCTYPE html><html><head><body>');
- doc.close();
- return test_iframe.contentWindow;
- });
-}
-
-add_result_callback(() => {
- if (test_iframe)
- test_iframe.remove();
-});
-
-function test_stylesheet_load_in_connected_shadow_tree(mode) {
- promise_test(() => {
- return create_iframe().then(contentWindow => {
- const doc = contentWindow.document;
- const host = doc.createElement('div');
- const link = doc.createElement('link');
- return wait_for_onload(link, () => {
- link.rel = 'stylesheet';
- link.href = '';
- host.attachShadow({mode: mode}).appendChild(link);
- contentWindow.document.body.appendChild(host);
- });
- });
- }, `Link elements should load stylesheets inside a connected shadow tree with ${mode} mode`);
-}
-
-test_stylesheet_load_in_connected_shadow_tree('closed');
-test_stylesheet_load_in_connected_shadow_tree('open');
-
-function test_stylesheet_do_not_load_in_disconnected_shadow_tree(mode) {
- promise_test(() => {
- return create_iframe().then((contentWindow) => {
- const doc = contentWindow.document;
- const host = doc.createElement('div');
- const link = doc.createElement('link');
- return wait_for_onload(link, () => {
- link.rel = 'stylesheet';
- link.href = '';
- host.attachShadow({mode: mode}).appendChild(link);
- });
- }).then(() => {
- assert_true(false, 'stylesheet must not load inside a disconnected shadow tree');
- }, (error) => {
- assert_equals(error, 'timeout');
- });
- }, `Link elements must not load stylesheets inside a disconnceted shadow tree with ${mode} mode`);
-}
-
-test_stylesheet_do_not_load_in_disconnected_shadow_tree('closed');
-test_stylesheet_do_not_load_in_disconnected_shadow_tree('open');
-
-function test_loaded_stylesheet_rule_in_shadow_tree_applies_to_div(mode) {
- promise_test(() => {
- let div;
- return create_iframe().then(function (contentWindow) {
- const doc = contentWindow.document;
- const host = doc.createElement('div');
- const shadowRoot = host.attachShadow({mode: mode});
- shadowRoot.innerHTML = '<link rel="stylesheet" href=""
- div = shadowRoot.querySelector('div');
- return wait_for_onload(shadowRoot.querySelector('link'), () => { doc.body.appendChild(host) });
- }).then(() => {
- assert_equals(getComputedStyle(div).color, 'rgb(0, 128, 0)');
- });
- }, `Style rules loaded inside a shadow tree with ${mode} mode must apply to a div in the shadow tree`);
-}
-
-test_loaded_stylesheet_rule_in_shadow_tree_applies_to_div('closed');
-test_loaded_stylesheet_rule_in_shadow_tree_applies_to_div('open');
-
-function test_loaded_stylesheet_rule_in_shadow_tree_applies_to_host(mode) {
- promise_test(() => {
- let host;
- return create_iframe().then(function (contentWindow) {
- const doc = contentWindow.document;
- host = doc.createElement('div');
- const shadowRoot = host.attachShadow({mode: mode});
- shadowRoot.innerHTML = '<link rel="stylesheet" href=""
- return wait_for_onload(shadowRoot.querySelector('link'), () => { doc.body.appendChild(host) });
- }).then(() => {
- assert_equals(getComputedStyle(host).color, 'rgb(0, 128, 0)');
- });
- }, `:host style rules loaded inside a shadow tree with ${mode} mode must apply to the host element`);
-}
-
-test_loaded_stylesheet_rule_in_shadow_tree_applies_to_host('closed');
-test_loaded_stylesheet_rule_in_shadow_tree_applies_to_host('open');
-
-function test_title_is_ignored_in_shadow_tree(mode) {
- promise_test(() => {
- let doc;
- return create_iframe().then((contentWindow) => {
- doc = contentWindow.document;
- const host = doc.createElement('div');
- const shadowRoot = host.attachShadow({mode: mode});
- shadowRoot.innerHTML = `<style title="foo"></style>`;
- doc.body.appendChild(host);
- }).then(() => {
- assert_equals(doc.selectedStylesheetSet, null);
- });
- }, `Link elements should load stylesheets inside a connected shadow tree with ${mode} mode`);
-}
-
-test_title_is_ignored_in_shadow_tree('closed');
-test_title_is_ignored_in_shadow_tree('open');
-
-</script>
-</html>
-</body>
Deleted: trunk/LayoutTests/fast/shadow-dom/resources/green-host.css (208355 => 208356)
--- trunk/LayoutTests/fast/shadow-dom/resources/green-host.css 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/LayoutTests/fast/shadow-dom/resources/green-host.css 2016-11-03 23:18:01 UTC (rev 208356)
@@ -1,9 +0,0 @@
-:host, div {
- /* For the ease of debugging. */
- display: inline-block;
- width: 100px;
- height: 100px;
-
- color: green;
- background: green;
-}
Deleted: trunk/LayoutTests/fast/shadow-dom/selected-stylesheet-in-shadow-tree-expected.txt (208355 => 208356)
--- trunk/LayoutTests/fast/shadow-dom/selected-stylesheet-in-shadow-tree-expected.txt 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/LayoutTests/fast/shadow-dom/selected-stylesheet-in-shadow-tree-expected.txt 2016-11-03 23:18:01 UTC (rev 208356)
@@ -1,8 +0,0 @@
-
-PASS The title attribute on the style element in a document must set the preferred stylesheet.
-PASS The title attribute on the style element inside a closed shadow tree must not set the preferred stylesheet.
-PASS The title attribute on the style element inside an open shadow tree must not set the preferred stylesheet.
-PASS The title attribute on the link element in a document must set the preferred stylesheet.
-PASS The title attribute on the link element inside a closed shadow tree must not set the preferred stylesheet.
-PASS The title attribute on the link element inside an open shadow tree must not set the preferred stylesheet.
-
Deleted: trunk/LayoutTests/fast/shadow-dom/selected-stylesheet-in-shadow-tree.html (208355 => 208356)
--- trunk/LayoutTests/fast/shadow-dom/selected-stylesheet-in-shadow-tree.html 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/LayoutTests/fast/shadow-dom/selected-stylesheet-in-shadow-tree.html 2016-11-03 23:18:01 UTC (rev 208356)
@@ -1,99 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Shadow DOM: Link and style elements inside a shadow tree should not affect the preferred stylesheet</title>
-<meta name="author" title="Ryosuke Niwa" href=""
-<meta name="assert" content="Link and style elements inside a shadow tree should not affect the preferred stylesheet">
-<script src=''></script>
-<script src=''></script>
-</head>
-<body>
-<script>
-
-function make_iframe(markup, testFunction) {
- return () => {
- const iframe = document.createElement('iframe');
- return new Promise(function (resolve) {
- iframe._onload_ = () => { resolve(iframe.contentDocument); };
- document.body.appendChild(iframe);
- }).then(function (doc) {
- doc.open();
- doc.write(markup);
- doc.close();
- return testFunction(doc, doc.querySelector('div'));
- }).then(() => iframe.remove(), error => {
- iframe.remove();
- return Promise.reject(error);
- });
- };
-}
-
-// Some browsers don't synchronously update the selected stylesheet.
-function wait_for_stylesheet_to_be_selected() {
- return new Promise(function (resolve) {
- setTimeout(resolve, 0);
- });
-}
-
-promise_test(make_iframe(`<!DOCTYPE html><body>`, (doc) => {
- doc.body.innerHTML = `<style title="foo">div { color: red; }</style>`;
- return wait_for_stylesheet_to_be_selected().then(() => {
- assert_equals(doc.preferredStylesheetSet, 'foo');
- assert_equals(doc.selectedStylesheetSet, 'foo');
- });
-}), 'The title attribute on the style element in a document must set the preferred stylesheet.');
-
-promise_test(make_iframe(`<!DOCTYPE html><body><div>`, (doc) => {
- doc.querySelector('div').attachShadow({mode: 'closed'}).innerHTML = `<style title="foo"></style>`;
- return wait_for_stylesheet_to_be_selected().then(() => {
- assert_equals(doc.preferredStylesheetSet, null);
- assert_equals(doc.selectedStylesheetSet, null);
- });
-}), 'The title attribute on the style element inside a closed shadow tree must not set the preferred stylesheet.');
-
-promise_test(make_iframe(`<!DOCTYPE html><body><div>`, (doc) => {
- doc.querySelector('div').attachShadow({mode: 'open'}).innerHTML = `<style title="foo"></style>`;
- return wait_for_stylesheet_to_be_selected().then(() => {
- assert_equals(doc.preferredStylesheetSet, null);
- assert_equals(doc.selectedStylesheetSet, null);
- });
-}), 'The title attribute on the style element inside an open shadow tree must not set the preferred stylesheet.');
-
-function insert_link_and_wait(parent, title) {
- return new Promise((resolve, reject) => {
- const link = parent.ownerDocument.createElement('link');
- link.rel = 'stylesheet';
- link.title = title;
- link.href = '';
- link._onload_ = resolve;
- parent.appendChild(link);
- setTimeout(() => reject('Failed to load the stylesheet'), 1000);
- }).then(() => wait_for_stylesheet_to_be_selected());
-}
-
-promise_test(make_iframe(`<!DOCTYPE html><body>`, (doc) => {
- return insert_link_and_wait(doc.body, 'foo').then(() => {
- assert_equals(doc.preferredStylesheetSet, 'foo');
- assert_equals(doc.selectedStylesheetSet, 'foo');
- });
-}), 'The title attribute on the link element in a document must set the preferred stylesheet.');
-
-promise_test(make_iframe(`<!DOCTYPE html><body><div>`, (doc) => {
- const root = doc.querySelector('div').attachShadow({mode: 'closed'});
- return insert_link_and_wait(root, 'foo').then(() => {
- assert_equals(doc.preferredStylesheetSet, null);
- assert_equals(doc.selectedStylesheetSet, null);
- });
-}), 'The title attribute on the link element inside a closed shadow tree must not set the preferred stylesheet.');
-
-promise_test(make_iframe(`<!DOCTYPE html><body><div>`, (doc) => {
- const root = doc.querySelector('div').attachShadow({mode: 'open'});
- return insert_link_and_wait(root, 'foo').then(() => {
- assert_equals(doc.preferredStylesheetSet, null);
- assert_equals(doc.selectedStylesheetSet, null);
- });
-}), 'The title attribute on the link element inside an open shadow tree must not set the preferred stylesheet.');
-
-</script>
-</html>
-</body>
Modified: trunk/Source/WebCore/ChangeLog (208355 => 208356)
--- trunk/Source/WebCore/ChangeLog 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/Source/WebCore/ChangeLog 2016-11-03 23:18:01 UTC (rev 208356)
@@ -1,3 +1,16 @@
+2016-11-03 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r208302.
+
+ This change causes LayoutTest crashes under GuardMalloc.
+
+ Reverted changeset:
+
+ "Load stylesheets in link elements inside a connected shadow
+ tree"
+ https://bugs.webkit.org/show_bug.cgi?id=160683
+ http://trac.webkit.org/changeset/208302
+
2016-11-03 Chris Dumez <[email protected]>
Unreviewed, add HTML5 specification for HTML Interactive Form Validation feature.
Modified: trunk/Source/WebCore/dom/Document.cpp (208355 => 208356)
--- trunk/Source/WebCore/dom/Document.cpp 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-11-03 23:18:01 UTC (rev 208356)
@@ -6980,13 +6980,11 @@
void Document::didInsertInDocumentShadowRoot(ShadowRoot& shadowRoot)
{
ASSERT(shadowRoot.inDocument());
- ASSERT(!m_inDocumentShadowRoots.contains(&shadowRoot));
m_inDocumentShadowRoots.add(&shadowRoot);
}
void Document::didRemoveInDocumentShadowRoot(ShadowRoot& shadowRoot)
{
- ASSERT(!shadowRoot.inDocument());
ASSERT(m_inDocumentShadowRoots.contains(&shadowRoot));
m_inDocumentShadowRoots.remove(&shadowRoot);
}
Modified: trunk/Source/WebCore/dom/Element.cpp (208355 => 208356)
--- trunk/Source/WebCore/dom/Element.cpp 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-11-03 23:18:01 UTC (rev 208356)
@@ -1784,6 +1784,8 @@
oldRoot->setHost(nullptr);
oldRoot->setParentTreeScope(&document());
+
+ notifyChildNodeRemoved(*this, *oldRoot);
}
static bool canAttachAuthorShadowRoot(const Element& element)
Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (208355 => 208356)
--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2016-11-03 23:18:01 UTC (rev 208356)
@@ -84,18 +84,17 @@
Node::InsertionNotificationRequest ShadowRoot::insertedInto(ContainerNode& insertionPoint)
{
- bool wasInDocument = inDocument();
- DocumentFragment::insertedInto(insertionPoint);
- if (insertionPoint.inDocument() && !wasInDocument)
+ auto result = DocumentFragment::insertedInto(insertionPoint);
+ if (inDocument())
document().didInsertInDocumentShadowRoot(*this);
- return InsertionDone;
+ return result;
}
void ShadowRoot::removedFrom(ContainerNode& insertionPoint)
{
+ if (inDocument())
+ document().didRemoveInDocumentShadowRoot(*this);
DocumentFragment::removedFrom(insertionPoint);
- if (insertionPoint.inDocument() && !inDocument())
- document().didRemoveInDocumentShadowRoot(*this);
}
Style::Scope& ShadowRoot::styleScope()
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (208355 => 208356)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-11-03 23:18:01 UTC (rev 208356)
@@ -80,6 +80,7 @@
, m_disabledState(Unset)
, m_loading(false)
, m_createdByParser(createdByParser)
+ , m_isInShadowTree(false)
, m_firedLoad(false)
, m_loadedResource(false)
, m_pendingSheetType(Unknown)
@@ -100,8 +101,8 @@
if (m_cachedSheet)
m_cachedSheet->removeClient(*this);
- if (m_styleScope)
- m_styleScope->removeStyleSheetCandidateNode(*this);
+ if (inDocument())
+ document().styleScope().removeStyleSheetCandidateNode(*this);
linkLoadEventSender().cancelEvent(*this);
linkErrorEventSender().cancelEvent(*this);
@@ -111,43 +112,36 @@
{
DisabledState oldDisabledState = m_disabledState;
m_disabledState = disabled ? Disabled : EnabledViaScript;
- if (oldDisabledState == m_disabledState)
- return;
+ if (oldDisabledState != m_disabledState) {
+ // If we change the disabled state while the sheet is still loading, then we have to
+ // perform three checks:
+ if (styleSheetIsLoading()) {
+ // Check #1: The sheet becomes disabled while loading.
+ if (m_disabledState == Disabled)
+ removePendingSheet();
- ASSERT(inDocument() || !styleSheetIsLoading());
- if (!inDocument())
- return;
+ // Check #2: An alternate sheet becomes enabled while it is still loading.
+ if (m_relAttribute.isAlternate && m_disabledState == EnabledViaScript)
+ addPendingSheet(ActiveSheet);
- // If we change the disabled state while the sheet is still loading, then we have to
- // perform three checks:
- if (styleSheetIsLoading()) {
- // Check #1: The sheet becomes disabled while loading.
- if (m_disabledState == Disabled)
- removePendingSheet();
+ // Check #3: A main sheet becomes enabled while it was still loading and
+ // after it was disabled via script. It takes really terrible code to make this
+ // happen (a double toggle for no reason essentially). This happens on
+ // virtualplastic.net, which manages to do about 12 enable/disables on only 3
+ // sheets. :)
+ if (!m_relAttribute.isAlternate && m_disabledState == EnabledViaScript && oldDisabledState == Disabled)
+ addPendingSheet(ActiveSheet);
- // Check #2: An alternate sheet becomes enabled while it is still loading.
- if (m_relAttribute.isAlternate && m_disabledState == EnabledViaScript)
- addPendingSheet(ActiveSheet);
+ // If the sheet is already loading just bail.
+ return;
+ }
- // Check #3: A main sheet becomes enabled while it was still loading and
- // after it was disabled via script. It takes really terrible code to make this
- // happen (a double toggle for no reason essentially). This happens on
- // virtualplastic.net, which manages to do about 12 enable/disables on only 3
- // sheets. :)
- if (!m_relAttribute.isAlternate && m_disabledState == EnabledViaScript && oldDisabledState == Disabled)
- addPendingSheet(ActiveSheet);
-
- // If the sheet is already loading just bail.
- return;
+ // Load the sheet, since it's never been loaded before.
+ if (!m_sheet && m_disabledState == EnabledViaScript)
+ process();
+ else
+ document().styleScope().didChangeActiveStyleSheetCandidates();
}
-
- // Load the sheet, since it's never been loaded before.
- if (!m_sheet && m_disabledState == EnabledViaScript)
- process();
- else {
- ASSERT(m_styleScope);
- m_styleScope->didChangeActiveStyleSheetCandidates();
- }
}
void HTMLLinkElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
@@ -182,7 +176,7 @@
m_media = value.string().convertToASCIILowercase();
process();
if (m_sheet && !isDisabled())
- m_styleScope->didChangeActiveStyleSheetCandidates();
+ document().styleScope().didChangeActiveStyleSheetCandidates();
return;
}
if (name == disabledAttr) {
@@ -220,7 +214,7 @@
void HTMLLinkElement::process()
{
- if (!inDocument()) {
+ if (!inDocument() || m_isInShadowTree) {
ASSERT(!m_sheet);
return;
}
@@ -289,7 +283,7 @@
} else if (m_sheet) {
// we no longer contain a stylesheet, e.g. perhaps rel or type was changed
clearSheet();
- m_styleScope->didChangeActiveStyleSheetCandidates();
+ document().styleScope().didChangeActiveStyleSheetCandidates();
}
}
@@ -303,14 +297,16 @@
Node::InsertionNotificationRequest HTMLLinkElement::insertedInto(ContainerNode& insertionPoint)
{
- bool wasInDocument = inDocument();
HTMLElement::insertedInto(insertionPoint);
- if (!insertionPoint.inDocument() || wasInDocument)
+ if (!insertionPoint.inDocument())
return InsertionDone;
- m_styleScope = &Style::Scope::forNode(*this);
- m_styleScope->addStyleSheetCandidateNode(*this, m_createdByParser);
+ m_isInShadowTree = isInShadowTree();
+ if (m_isInShadowTree)
+ return InsertionDone;
+ document().styleScope().addStyleSheetCandidateNode(*this, m_createdByParser);
+
process();
return InsertionDone;
}
@@ -318,20 +314,20 @@
void HTMLLinkElement::removedFrom(ContainerNode& insertionPoint)
{
HTMLElement::removedFrom(insertionPoint);
- if (!insertionPoint.inDocument() || inDocument())
+ if (!insertionPoint.inDocument())
return;
+ if (m_isInShadowTree) {
+ ASSERT(!m_sheet);
+ return;
+ }
+ document().styleScope().removeStyleSheetCandidateNode(*this);
+
if (m_sheet)
clearSheet();
if (styleSheetIsLoading())
removePendingSheet(RemovePendingSheetNotifyLater);
-
- if (m_styleScope) {
- m_styleScope->removeStyleSheetCandidateNode(*this);
- m_styleScope = nullptr;
- }
-
}
void HTMLLinkElement::finishParsingChildren()
@@ -548,8 +544,7 @@
if (m_pendingSheetType == InactiveSheet)
return;
- ASSERT(m_styleScope);
- m_styleScope->addPendingSheet();
+ document().styleScope().addPendingSheet();
}
void HTMLLinkElement::removePendingSheet(RemovePendingSheetNotificationType notification)
@@ -560,14 +555,13 @@
if (type == Unknown)
return;
- ASSERT(m_styleScope);
if (type == InactiveSheet) {
// Document just needs to know about the sheet for exposure through document.styleSheets
- m_styleScope->didChangeActiveStyleSheetCandidates();
+ document().styleScope().didChangeActiveStyleSheetCandidates();
return;
}
- m_styleScope->removePendingSheet(
+ document().styleScope().removePendingSheet(
notification == RemovePendingSheetNotifyImmediately
? Style::Scope::RemovePendingSheetNotifyImmediately
: Style::Scope::RemovePendingSheetNotifyLater);
Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (208355 => 208356)
--- trunk/Source/WebCore/html/HTMLLinkElement.h 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2016-11-03 23:18:01 UTC (rev 208356)
@@ -119,7 +119,6 @@
void removePendingSheet(RemovePendingSheetNotificationType = RemovePendingSheetNotifyImmediately);
LinkLoader m_linkLoader;
- Style::Scope* m_styleScope { nullptr };
CachedResourceHandle<CachedCSSStyleSheet> m_cachedSheet;
RefPtr<CSSStyleSheet> m_sheet;
enum DisabledState {
@@ -135,6 +134,7 @@
LinkRelAttribute m_relAttribute;
bool m_loading;
bool m_createdByParser;
+ bool m_isInShadowTree;
bool m_firedLoad;
bool m_loadedResource;
Modified: trunk/Source/WebCore/html/HTMLStyleElement.cpp (208355 => 208356)
--- trunk/Source/WebCore/html/HTMLStyleElement.cpp 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/Source/WebCore/html/HTMLStyleElement.cpp 2016-11-03 23:18:01 UTC (rev 208356)
@@ -94,17 +94,18 @@
Node::InsertionNotificationRequest HTMLStyleElement::insertedInto(ContainerNode& insertionPoint)
{
- bool wasInDocument = inDocument();
- auto result = HTMLElement::insertedInto(insertionPoint);
- if (insertionPoint.inDocument() && !wasInDocument)
+ HTMLElement::insertedInto(insertionPoint);
+ if (insertionPoint.inDocument())
m_styleSheetOwner.insertedIntoDocument(*this);
- return result;
+
+ return InsertionDone;
}
void HTMLStyleElement::removedFrom(ContainerNode& insertionPoint)
{
HTMLElement::removedFrom(insertionPoint);
- if (insertionPoint.inDocument() && !inDocument())
+
+ if (insertionPoint.inDocument())
m_styleSheetOwner.removedFromDocument(*this);
}
Modified: trunk/Source/WebCore/svg/SVGStyleElement.cpp (208355 => 208356)
--- trunk/Source/WebCore/svg/SVGStyleElement.cpp 2016-11-03 23:10:53 UTC (rev 208355)
+++ trunk/Source/WebCore/svg/SVGStyleElement.cpp 2016-11-03 23:18:01 UTC (rev 208356)
@@ -116,17 +116,16 @@
Node::InsertionNotificationRequest SVGStyleElement::insertedInto(ContainerNode& rootParent)
{
- bool wasInDocument = inDocument();
- auto result = SVGElement::insertedInto(rootParent);
- if (rootParent.inDocument() && !wasInDocument)
+ SVGElement::insertedInto(rootParent);
+ if (rootParent.inDocument())
m_styleSheetOwner.insertedIntoDocument(*this);
- return result;
+ return InsertionDone;
}
void SVGStyleElement::removedFrom(ContainerNode& rootParent)
{
SVGElement::removedFrom(rootParent);
- if (rootParent.inDocument() && !inDocument())
+ if (rootParent.inDocument())
m_styleSheetOwner.removedFromDocument(*this);
}
