Skip to content

GitLab

T
tangled
Commit cabd8000 authored by morrita@chromium.org's avatar morrita@chromium.org
Browse files
Options

Revert 169577 "[HTML Import] Let script block by pending resourc..." 

This is a speculative revert to address reported crashes in the wild.

> [HTML Import] Let script block by pending resources created by lifecycle callback
> 
> This change tells the HTML parser know that lifecycle callbacks,
> that is triggered through Microtask checkpoint, can create resources that
> blocks scripts.
> 
> It also streamlines the unblock notification from Document to the parser
> into didLoadAllScriptBlockingResources(). Now both didRemoveAllPendingStylesheets()
> and didLoadAllImports() checks resource readiness and invokes the unified notification.
> 
> TEST=custom-element-style-block.html
> BUG=346408
> R=dglazkov@chromium.org, dominicc@chromium.org
> 
> Review URL: https://codereview.chromium.org/202813002

TBR=morrita@chromium.org

Review URL: https://codereview.chromium.org/201673005

git-svn-id: svn://svn.chromium.org/blink/trunk@169769 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 98a5b69e
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 61 deletions
third_party/WebKit/LayoutTests/fast/html/imports/custom-element-style-block.html deleted 100644 → 0
View file @ 98a5b69e
<!DOCTYPE html>
<html>
<head>
<script src="../../../resources/testharness.js"></script>
<script src="../../../resources/testharnessreport.js"></script>
<link rel="import" href="resources/custom-element-style.html">
</head>
<body>
<x-test></x-test>
<script>
test(function(){
var x = document.querySelector('x-test');
var port = x.shadowRoot.querySelector('style').sheet.cssRules[0];
assert_true(port.styleSheet instanceof StyleSheet);
}, "The @import sytle in custom element shadow DOM blocks following script element.");
</script>
</body>
</html>
third_party/WebKit/LayoutTests/fast/html/imports/resources/custom-element-style.html deleted 100644 → 0
View file @ 98a5b69e
<!DOCTYPE html>
<template>
<style>
@import url(hello.css);
</style>
<h1>Hello</h1>
</template>
<script>
var t = document.currentScript.ownerDocument.querySelector('template');
var proto = Object.create(HTMLElement.prototype);
proto.createdCallback = function() {
var root = this.createShadowRoot();
root.appendChild(document.importNode(t.content));
};
document.registerElement('x-test', {prototype: proto});
</script>
third_party/WebKit/Source/core/dom/Document.cpp
View file @ cabd8000
...@@ -816,6 +816,11 @@ void Document::setImport(HTMLImport* import) ...@@ -816,6 +816,11 @@ void Document::setImport(HTMLImport* import)
m_import = import; m_import = import;
} }
void Document::didLoadAllImports()
{
executeScriptsWaitingForResourcesIfNeeded();
}
bool Document::haveImportsLoaded() const bool Document::haveImportsLoaded() const
{ {
return !m_import || !m_import->state().shouldBlockScriptExecution(); return !m_import || !m_import->state().shouldBlockScriptExecution();
...@@ -2840,36 +2845,19 @@ LocalFrame* Document::findUnsafeParentScrollPropagationBoundary() ...@@ -2840,36 +2845,19 @@ LocalFrame* Document::findUnsafeParentScrollPropagationBoundary()
return 0; return 0;
} }
void Document::didLoadAllImports()
{
if (!haveStylesheetsLoaded())
return;
didLoadAllScriptBlockingResources();
}
void Document::didRemoveAllPendingStylesheet() void Document::didRemoveAllPendingStylesheet()
{ {
m_needsNotifyRemoveAllPendingStylesheet = false; m_needsNotifyRemoveAllPendingStylesheet = false;
styleResolverChanged(RecalcStyleDeferred, hasNodesWithPlaceholderStyle() ? FullStyleUpdate : AnalyzedStyleUpdate); styleResolverChanged(RecalcStyleDeferred, hasNodesWithPlaceholderStyle() ? FullStyleUpdate : AnalyzedStyleUpdate);
if (m_import)
m_import->didRemoveAllPendingStylesheet();
if (!haveImportsLoaded())
return;
didLoadAllScriptBlockingResources();
}
void Document::didLoadAllScriptBlockingResources()
{
executeScriptsWaitingForResourcesIfNeeded(); executeScriptsWaitingForResourcesIfNeeded();
if (m_gotoAnchorNeededAfterStylesheetsLoad && view()) if (m_gotoAnchorNeededAfterStylesheetsLoad && view())
view()->scrollToFragment(m_url); view()->scrollToFragment(m_url);
}
if (m_import)
m_import->didRemoveAllPendingStylesheet();
}
void Document::executeScriptsWaitingForResourcesIfNeeded() void Document::executeScriptsWaitingForResourcesIfNeeded()
{ {
......
third_party/WebKit/Source/core/dom/Document.h
View file @ cabd8000
...@@ -993,7 +993,6 @@ public: ...@@ -993,7 +993,6 @@ public:
ElementDataCache* elementDataCache() { return m_elementDataCache.get(); } ElementDataCache* elementDataCache() { return m_elementDataCache.get(); }
void didLoadAllScriptBlockingResources();
void didRemoveAllPendingStylesheet(); void didRemoveAllPendingStylesheet();
void setNeedsNotifyRemoveAllPendingStylesheet() { m_needsNotifyRemoveAllPendingStylesheet = true; } void setNeedsNotifyRemoveAllPendingStylesheet() { m_needsNotifyRemoveAllPendingStylesheet = true; }
void clearStyleResolver(); void clearStyleResolver();
......
third_party/WebKit/Source/core/html/imports/HTMLImportsController.cpp
View file @ cabd8000
...@@ -151,7 +151,7 @@ bool HTMLImportsController::hasLoader() const ...@@ -151,7 +151,7 @@ bool HTMLImportsController::hasLoader() const
bool HTMLImportsController::isDone() const bool HTMLImportsController::isDone() const
{ {
return !m_master->parsing() && m_master->haveStylesheetsLoaded(); return !m_master->parsing();
} }
void HTMLImportsController::stateDidChange() void HTMLImportsController::stateDidChange()
......
third_party/WebKit/Source/core/html/parser/HTMLScriptRunner.cpp
View file @ cabd8000
...@@ -125,12 +125,8 @@ void HTMLScriptRunner::executePendingScriptAndDispatchEvent(PendingScript& pendi ...@@ -125,12 +125,8 @@ void HTMLScriptRunner::executePendingScriptAndDispatchEvent(PendingScript& pendi
if (pendingScript.resource() && pendingScript.watchingForLoad()) if (pendingScript.resource() && pendingScript.watchingForLoad())
stopWatchingForLoad(pendingScript); stopWatchingForLoad(pendingScript);
if (!isExecutingScript()) { if (!isExecutingScript())
Microtask::performCheckpoint(); Microtask::performCheckpoint();
m_hasScriptsWaitingForResources = !m_document->haveStylesheetsAndImportsLoaded();
if (m_hasScriptsWaitingForResources)
return;
}
// Clear the pending script before possible rentrancy from executeScript() // Clear the pending script before possible rentrancy from executeScript()
RefPtr<Element> element = pendingScript.releaseElementAndClear(); RefPtr<Element> element = pendingScript.releaseElementAndClear();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment