<!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>[207063] releases/WebKitGTK/webkit-2.14/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/207063">207063</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-11 01:08:39 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205701">r205701</a> - v3: WebContent crash due to RELEASE_ASSERT in WebCore: WebCore::StyleResolver::styleForElement
https://bugs.webkit.org/show_bug.cgi?id=161689
Reviewed by Andreas Kling.
These crashes happen because synchronously triggered resource loads generate callbacks that may end up
deleting the resource loader.
Stop triggering resource loads from StyleResolver. Instead trigger them when applying style to render tree.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::~StyleResolver):
Replace the RELEASE_ASSERT against deletion during resource loads by a general isDeleted assert.
(WebCore::StyleResolver::styleForElement):
(WebCore::StyleResolver::styleForKeyframe):
(WebCore::StyleResolver::pseudoStyleForElement):
(WebCore::StyleResolver::styleForPage):
(WebCore::StyleResolver::applyMatchedProperties):
(WebCore::StyleResolver::loadPendingResources): Deleted.
* css/StyleResolver.h:
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::KeyframeAnimation):
(WebCore::KeyframeAnimation::resolveKeyframeStyles):
Ensure resource load for all animation frames.
* page/animation/KeyframeAnimation.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
(WebCore::RenderElement::initializeStyle):
Load resources when renderer initializes a style.
(WebCore::RenderElement::setStyle):
(WebCore::RenderElement::getUncachedPseudoStyle):
Load resources for pseudo styles.
* rendering/RenderImage.cpp:
(WebCore::RenderImage::RenderImage):
(WebCore::RenderImage::styleWillChange):
Shuffle image resource initialization out from constructor so initializeStyle gets called before.
* rendering/RenderImage.h:
* rendering/style/StyleCachedImage.cpp:
(WebCore::StyleCachedImage::StyleCachedImage):
Track pending status with a bit instead of implicitly by the existence of CachedResource.
This is useful for asserts.
(WebCore::StyleCachedImage::load):
(WebCore::StyleCachedImage::isPending):
(WebCore::StyleCachedImage::addClient):
(WebCore::StyleCachedImage::removeClient):
(WebCore::StyleCachedImage::image):
* rendering/style/StyleCachedImage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorecssStyleResolvercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorecssStyleResolverh">releases/WebKitGTK/webkit-2.14/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorepageanimationImplicitAnimationcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/ImplicitAnimation.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorepageanimationKeyframeAnimationcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorepageanimationKeyframeAnimationh">releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/KeyframeAnimation.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingRenderElementcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingRenderImagecpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingRenderImageh">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderImage.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingstyleStyleCachedImagecpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/StyleCachedImage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingstyleStyleCachedImageh">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/StyleCachedImage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2016-09-09 Antti Koivisto <antti@apple.com>
+
+ v3: WebContent crash due to RELEASE_ASSERT in WebCore: WebCore::StyleResolver::styleForElement
+ https://bugs.webkit.org/show_bug.cgi?id=161689
+
+ Reviewed by Andreas Kling.
+
+ These crashes happen because synchronously triggered resource loads generate callbacks that may end up
+ deleting the resource loader.
+
+ Stop triggering resource loads from StyleResolver. Instead trigger them when applying style to render tree.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::~StyleResolver):
+
+ Replace the RELEASE_ASSERT against deletion during resource loads by a general isDeleted assert.
+
+ (WebCore::StyleResolver::styleForElement):
+ (WebCore::StyleResolver::styleForKeyframe):
+ (WebCore::StyleResolver::pseudoStyleForElement):
+ (WebCore::StyleResolver::styleForPage):
+ (WebCore::StyleResolver::applyMatchedProperties):
+ (WebCore::StyleResolver::loadPendingResources): Deleted.
+ * css/StyleResolver.h:
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::KeyframeAnimation):
+ (WebCore::KeyframeAnimation::resolveKeyframeStyles):
+
+ Ensure resource load for all animation frames.
+
+ * page/animation/KeyframeAnimation.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::createFor):
+ (WebCore::RenderElement::initializeStyle):
+
+ Load resources when renderer initializes a style.
+
+ (WebCore::RenderElement::setStyle):
+ (WebCore::RenderElement::getUncachedPseudoStyle):
+
+ Load resources for pseudo styles.
+
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::RenderImage):
+ (WebCore::RenderImage::styleWillChange):
+
+ Shuffle image resource initialization out from constructor so initializeStyle gets called before.
+
+ * rendering/RenderImage.h:
+ * rendering/style/StyleCachedImage.cpp:
+ (WebCore::StyleCachedImage::StyleCachedImage):
+
+ Track pending status with a bit instead of implicitly by the existence of CachedResource.
+ This is useful for asserts.
+
+ (WebCore::StyleCachedImage::load):
+ (WebCore::StyleCachedImage::isPending):
+ (WebCore::StyleCachedImage::addClient):
+ (WebCore::StyleCachedImage::removeClient):
+ (WebCore::StyleCachedImage::image):
+ * rendering/style/StyleCachedImage.h:
+
</ins><span class="cx"> 2016-09-08 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [WTF] HashTable's rehash is not compatible to Ref<T> and ASan
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/StyleResolver.cpp (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/css/StyleResolver.cpp 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/css/StyleResolver.cpp 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -309,7 +309,8 @@
</span><span class="cx">
</span><span class="cx"> StyleResolver::~StyleResolver()
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(!m_inLoadPendingImages);
</del><ins>+ RELEASE_ASSERT(!m_isDeleted);
+ m_isDeleted = true;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> m_viewportStyleResolver->clearDocument();
</span><span class="lines">@@ -385,7 +386,7 @@
</span><span class="cx">
</span><span class="cx"> ElementStyle StyleResolver::styleForElement(const Element& element, const RenderStyle* parentStyle, RuleMatchingBehavior matchingBehavior, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(!m_inLoadPendingImages);
</del><ins>+ RELEASE_ASSERT(!m_isDeleted);
</ins><span class="cx">
</span><span class="cx"> m_state = State(element, parentStyle, m_overrideDocumentElementStyle, regionForStyling, selectorFilter);
</span><span class="cx"> State& state = m_state;
</span><span class="lines">@@ -446,7 +447,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<RenderStyle> StyleResolver::styleForKeyframe(const RenderStyle* elementStyle, const StyleKeyframe* keyframe, KeyframeValue& keyframeValue)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(!m_inLoadPendingImages);
</del><ins>+ RELEASE_ASSERT(!m_isDeleted);
</ins><span class="cx">
</span><span class="cx"> MatchResult result;
</span><span class="cx"> result.addMatchedProperties(keyframe->properties());
</span><span class="lines">@@ -486,9 +487,6 @@
</span><span class="cx">
</span><span class="cx"> adjustRenderStyle(*state.style(), *state.parentStyle(), nullptr);
</span><span class="cx">
</span><del>- // Start loading resources referenced by this style.
- loadPendingResources();
-
</del><span class="cx"> // Add all the animating properties to the keyframe.
</span><span class="cx"> unsigned propertyCount = keyframe->properties().propertyCount();
</span><span class="cx"> for (unsigned i = 0; i < propertyCount; ++i) {
</span><span class="lines">@@ -642,9 +640,6 @@
</span><span class="cx"> if (state.style()->hasViewportUnits())
</span><span class="cx"> document().setHasStyleWithViewportUnits();
</span><span class="cx">
</span><del>- // Start loading resources referenced by this style.
- loadPendingResources();
-
</del><span class="cx"> // Now return the style.
</span><span class="cx"> return state.takeStyle();
</span><span class="cx"> }
</span><span class="lines">@@ -651,7 +646,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<RenderStyle> StyleResolver::styleForPage(int pageIndex)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(!m_inLoadPendingImages);
</del><ins>+ RELEASE_ASSERT(!m_isDeleted);
</ins><span class="cx">
</span><span class="cx"> auto* documentElement = m_document.documentElement();
</span><span class="cx"> if (!documentElement)
</span><span class="lines">@@ -686,9 +681,6 @@
</span><span class="cx">
</span><span class="cx"> cascade.applyDeferredProperties(*this, &result);
</span><span class="cx">
</span><del>- // Start loading resources referenced by this style.
- loadPendingResources();
-
</del><span class="cx"> // Now return the style.
</span><span class="cx"> return m_state.takeStyle();
</span><span class="cx"> }
</span><span class="lines">@@ -1413,9 +1405,6 @@
</span><span class="cx"> // so to preserve behavior, we queue them up during cascade and flush here.
</span><span class="cx"> cascade.applyDeferredProperties(*this, &matchResult);
</span><span class="cx">
</span><del>- // Start loading resources referenced by this style.
- loadPendingResources();
-
</del><span class="cx"> ASSERT(!state.fontDirty());
</span><span class="cx">
</span><span class="cx"> if (cacheItem || !cacheHash)
</span><span class="lines">@@ -2043,18 +2032,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::loadPendingResources()
-{
- ASSERT(style());
- if (!style())
- return;
-
- RELEASE_ASSERT(!m_inLoadPendingImages);
- TemporaryChange<bool> changeInLoadPendingImages(m_inLoadPendingImages, true);
-
- Style::loadPendingResources(*style(), document(), m_state.element());
-}
-
</del><span class="cx"> inline StyleResolver::MatchedProperties::MatchedProperties()
</span><span class="cx"> : possiblyPaddedMember(nullptr)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/css/StyleResolver.h (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/css/StyleResolver.h 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/css/StyleResolver.h 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -220,10 +220,7 @@
</span><span class="cx"> void clearCachedPropertiesAffectedByViewportUnits();
</span><span class="cx">
</span><span class="cx"> bool createFilterOperations(const CSSValue& inValue, FilterOperations& outOperations);
</span><del>- void loadPendingSVGDocuments();
</del><span class="cx">
</span><del>- void loadPendingResources();
-
</del><span class="cx"> struct RuleRange {
</span><span class="cx"> RuleRange(int& firstRuleIndex, int& lastRuleIndex): firstRuleIndex(firstRuleIndex), lastRuleIndex(lastRuleIndex) { }
</span><span class="cx"> int& firstRuleIndex;
</span><span class="lines">@@ -482,8 +479,6 @@
</span><span class="cx">
</span><span class="cx"> void applySVGProperty(CSSPropertyID, CSSValue*);
</span><span class="cx">
</span><del>- void loadPendingImages();
-
</del><span class="cx"> static unsigned computeMatchedPropertiesHash(const MatchedProperties*, unsigned size);
</span><span class="cx"> struct MatchedPropertiesCacheItem {
</span><span class="cx"> Vector<MatchedProperties> matchedProperties;
</span><span class="lines">@@ -525,8 +520,8 @@
</span><span class="cx">
</span><span class="cx"> State m_state;
</span><span class="cx">
</span><del>- // Try to catch a crash. https://bugs.webkit.org/show_bug.cgi?id=141561.
- bool m_inLoadPendingImages { false };
</del><ins>+ // See if we still have crashes where StyleResolver gets deleted early.
+ bool m_isDeleted { false };
</ins><span class="cx">
</span><span class="cx"> friend bool operator==(const MatchedProperties&, const MatchedProperties&);
</span><span class="cx"> friend bool operator!=(const MatchedProperties&, const MatchedProperties&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorepageanimationImplicitAnimationcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/ImplicitAnimation.cpp (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/ImplicitAnimation.cpp 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/ImplicitAnimation.cpp 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "ImplicitAnimation.h"
</span><span class="cx"> #include "KeyframeAnimation.h"
</span><span class="cx"> #include "RenderBox.h"
</span><ins>+#include "StylePendingResources.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -212,6 +213,9 @@
</span><span class="cx">
</span><span class="cx"> m_toStyle = RenderStyle::clonePtr(*to);
</span><span class="cx">
</span><ins>+ if (m_object && m_object->element())
+ Style::loadPendingResources(*m_toStyle, m_object->element()->document(), m_object->element());
+
</ins><span class="cx"> // Restart the transition
</span><span class="cx"> if (m_fromStyle && m_toStyle)
</span><span class="cx"> updateStateMachine(AnimationStateInput::RestartAnimation, -1);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/KeyframeAnimation.cpp (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "GeometryUtilities.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><ins>+#include "StylePendingResources.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -46,9 +47,7 @@
</span><span class="cx"> , m_keyframes(animation.name())
</span><span class="cx"> , m_unanimatedStyle(RenderStyle::clonePtr(*unanimatedStyle))
</span><span class="cx"> {
</span><del>- // Get the keyframe RenderStyles
- if (m_object && m_object->element())
- m_object->element()->styleResolver().keyframeStylesForAnimation(*m_object->element(), unanimatedStyle, m_keyframes);
</del><ins>+ resolveKeyframeStyles();
</ins><span class="cx">
</span><span class="cx"> // Update the m_transformFunctionListValid flag based on whether the function lists in the keyframes match.
</span><span class="cx"> validateTransformFunctionList();
</span><span class="lines">@@ -350,6 +349,21 @@
</span><span class="cx"> return m_keyframes.containsProperty(property);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void KeyframeAnimation::resolveKeyframeStyles()
+{
+ if (!m_object || !m_object->element())
+ return;
+ auto& element = *m_object->element();
+
+ element.styleResolver().keyframeStylesForAnimation(*m_object->element(), m_unanimatedStyle.get(), m_keyframes);
+
+ // Ensure resource loads for all the frames.
+ for (auto& keyframe : m_keyframes.keyframes()) {
+ if (auto* style = const_cast<RenderStyle*>(keyframe.style()))
+ Style::loadPendingResources(*style, element.document(), &element);
+ }
+}
+
</ins><span class="cx"> void KeyframeAnimation::validateTransformFunctionList()
</span><span class="cx"> {
</span><span class="cx"> m_transformFunctionListsMatch = false;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorepageanimationKeyframeAnimationh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/KeyframeAnimation.h (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/KeyframeAnimation.h 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/page/animation/KeyframeAnimation.h 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx">
</span><span class="cx"> bool computeExtentOfAnimationForMatchingTransformLists(const FloatRect& rendererBox, LayoutRect&) const;
</span><span class="cx">
</span><ins>+ void resolveKeyframeStyles();
</ins><span class="cx"> void validateTransformFunctionList();
</span><span class="cx"> void checkForMatchingFilterFunctionLists();
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderElement.cpp (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderElement.cpp 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderElement.cpp 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> #include "SVGRenderSupport.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><ins>+#include "StylePendingResources.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/StackStats.h>
</span><span class="lines">@@ -150,6 +151,7 @@
</span><span class="cx"> // Otherwise acts as if we didn't support this feature.
</span><span class="cx"> const ContentData* contentData = style.contentData();
</span><span class="cx"> if (contentData && !contentData->next() && is<ImageContentData>(*contentData) && !element.isPseudoElement()) {
</span><ins>+ Style::loadPendingResources(style, element.document(), &element);
</ins><span class="cx"> auto& styleImage = downcast<ImageContentData>(*contentData).image();
</span><span class="cx"> auto image = createRenderer<RenderImage>(element, WTFMove(style), const_cast<StyleImage*>(&styleImage));
</span><span class="cx"> image->setIsGeneratedContent();
</span><span class="lines">@@ -363,6 +365,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::initializeStyle()
</span><span class="cx"> {
</span><ins>+ Style::loadPendingResources(m_style, document(), element());
+
</ins><span class="cx"> styleWillChange(StyleDifferenceNewStyle, style());
</span><span class="cx">
</span><span class="cx"> m_hasInitializedStyle = true;
</span><span class="lines">@@ -402,6 +406,8 @@
</span><span class="cx">
</span><span class="cx"> diff = adjustStyleDifference(diff, contextSensitiveProperties);
</span><span class="cx">
</span><ins>+ Style::loadPendingResources(style, document(), element());
+
</ins><span class="cx"> styleWillChange(diff, style);
</span><span class="cx">
</span><span class="cx"> auto oldStyle = WTFMove(m_style);
</span><span class="lines">@@ -1571,13 +1577,17 @@
</span><span class="cx">
</span><span class="cx"> auto& styleResolver = element()->styleResolver();
</span><span class="cx">
</span><ins>+ std::unique_ptr<RenderStyle> style;
</ins><span class="cx"> if (pseudoStyleRequest.pseudoId == FIRST_LINE_INHERITED) {
</span><del>- auto result = styleResolver.styleForElement(*element(), parentStyle).renderStyle;
- result->setStyleType(FIRST_LINE_INHERITED);
- return result;
- }
</del><ins>+ style = styleResolver.styleForElement(*element(), parentStyle).renderStyle;
+ style->setStyleType(FIRST_LINE_INHERITED);
+ } else
+ style = styleResolver.pseudoStyleForElement(*element(), pseudoStyleRequest, *parentStyle);
</ins><span class="cx">
</span><del>- return styleResolver.pseudoStyleForElement(*element(), pseudoStyleRequest, *parentStyle);
</del><ins>+ if (style)
+ Style::loadPendingResources(*style, document(), element());
+
+ return style;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color RenderElement::selectionColor(int colorProperty) const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderImage.cpp (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderImage.cpp 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderImage.cpp 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -131,7 +131,6 @@
</span><span class="cx"> , m_imageDevicePixelRatio(imageDevicePixelRatio)
</span><span class="cx"> {
</span><span class="cx"> updateAltText();
</span><del>- imageResource().initialize(this);
</del><span class="cx"> if (is<HTMLImageElement>(element))
</span><span class="cx"> m_hasShadowControls = downcast<HTMLImageElement>(element).hasShadowControls();
</span><span class="cx"> }
</span><span class="lines">@@ -140,7 +139,6 @@
</span><span class="cx"> : RenderReplaced(document, WTFMove(style), IntSize())
</span><span class="cx"> , m_imageResource(styleImage ? std::make_unique<RenderImageResourceStyleImage>(*styleImage) : std::make_unique<RenderImageResource>())
</span><span class="cx"> {
</span><del>- imageResource().initialize(this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderImage::~RenderImage()
</span><span class="lines">@@ -201,6 +199,13 @@
</span><span class="cx"> return ImageSizeChangeForAltText;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderImage::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
+{
+ if (!hasInitializedStyle())
+ imageResource().initialize(this);
+ RenderReplaced::styleWillChange(diff, newStyle);
+}
+
</ins><span class="cx"> void RenderImage::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><span class="cx"> RenderReplaced::styleDidChange(diff, oldStyle);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderImageh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderImage.h (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderImage.h 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderImage.h 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const final;
</span><span class="cx"> bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const override;
</span><span class="cx">
</span><ins>+ void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
</ins><span class="cx"> void styleDidChange(StyleDifference, const RenderStyle*) override;
</span><span class="cx">
</span><span class="cx"> void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingstyleStyleCachedImagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/StyleCachedImage.cpp (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/StyleCachedImage.cpp 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/StyleCachedImage.cpp 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -40,8 +40,11 @@
</span><span class="cx"> m_isCachedImage = true;
</span><span class="cx">
</span><span class="cx"> // CSSImageValue doesn't get invalidated so we can grab the CachedImage immediately if it exists.
</span><del>- if (is<CSSImageValue>(m_cssValue))
</del><ins>+ if (is<CSSImageValue>(m_cssValue)) {
</ins><span class="cx"> m_cachedImage = downcast<CSSImageValue>(m_cssValue.get()).cachedImage();
</span><ins>+ if (m_cachedImage)
+ m_isPending = false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StyleCachedImage::~StyleCachedImage()
</span><span class="lines">@@ -66,7 +69,8 @@
</span><span class="cx">
</span><span class="cx"> void StyleCachedImage::load(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
</span><span class="cx"> {
</span><del>- ASSERT(isPending());
</del><ins>+ ASSERT(m_isPending);
+ m_isPending = false;
</ins><span class="cx">
</span><span class="cx"> if (is<CSSImageValue>(m_cssValue)) {
</span><span class="cx"> auto& imageValue = downcast<CSSImageValue>(m_cssValue.get());
</span><span class="lines">@@ -106,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::isPending() const
</span><span class="cx"> {
</span><del>- return !m_cachedImage;
</del><ins>+ return m_isPending;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool StyleCachedImage::isLoaded() const
</span><span class="lines">@@ -169,6 +173,7 @@
</span><span class="cx">
</span><span class="cx"> void StyleCachedImage::addClient(RenderElement* renderer)
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_isPending);
</ins><span class="cx"> if (!m_cachedImage)
</span><span class="cx"> return;
</span><span class="cx"> m_cachedImage->addClient(renderer);
</span><span class="lines">@@ -176,6 +181,7 @@
</span><span class="cx">
</span><span class="cx"> void StyleCachedImage::removeClient(RenderElement* renderer)
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_isPending);
</ins><span class="cx"> if (!m_cachedImage)
</span><span class="cx"> return;
</span><span class="cx"> m_cachedImage->removeClient(renderer);
</span><span class="lines">@@ -183,6 +189,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Image> StyleCachedImage::image(RenderElement* renderer, const FloatSize&) const
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_isPending);
</ins><span class="cx"> if (!m_cachedImage)
</span><span class="cx"> return nullptr;
</span><span class="cx"> return m_cachedImage->imageForRenderer(renderer);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingstyleStyleCachedImageh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/StyleCachedImage.h (207062 => 207063)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/StyleCachedImage.h 2016-10-11 08:05:04 UTC (rev 207062)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/StyleCachedImage.h 2016-10-11 08:08:39 UTC (rev 207063)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> StyleCachedImage(CSSValue&);
</span><span class="cx">
</span><span class="cx"> Ref<CSSValue> m_cssValue;
</span><ins>+ bool m_isPending { true };
</ins><span class="cx"> mutable float m_scaleFactor { 1 };
</span><span class="cx"> mutable CachedResourceHandle<CachedImage> m_cachedImage;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>