<!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>[164489] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164489">164489</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-02-21 11:38:31 -0800 (Fri, 21 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>StyleResolver::loadPendingImage() should take a reference to StylePendingImage
<http://webkit.org/b/129021>
Reviewed by Brent Fulgham.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::loadPendingImage): Change pendingImage
parameter to a reference.
(WebCore::StyleResolver::loadPendingShapeImage): Update to use
references.
(WebCore::StyleResolver::loadPendingImages): Ditto.
* css/StyleResolver.h:
(WebCore::StyleResolver::loadPendingImage): Change pendingImage
parameter to a reference.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164488 => 164489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-21 19:28:15 UTC (rev 164488)
+++ trunk/Source/WebCore/ChangeLog 2014-02-21 19:38:31 UTC (rev 164489)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-21 David Kilzer <ddkilzer@apple.com>
+
+ StyleResolver::loadPendingImage() should take a reference to StylePendingImage
+ <http://webkit.org/b/129021>
+
+ Reviewed by Brent Fulgham.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::loadPendingImage): Change pendingImage
+ parameter to a reference.
+ (WebCore::StyleResolver::loadPendingShapeImage): Update to use
+ references.
+ (WebCore::StyleResolver::loadPendingImages): Ditto.
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::loadPendingImage): Change pendingImage
+ parameter to a reference.
+
</ins><span class="cx"> 2014-02-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: JSContext inspection should report exceptions in the console
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (164488 => 164489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-21 19:28:15 UTC (rev 164488)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-21 19:38:31 UTC (rev 164489)
</span><span class="lines">@@ -3482,28 +3482,28 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-PassRefPtr<StyleImage> StyleResolver::loadPendingImage(StylePendingImage* pendingImage, const ResourceLoaderOptions& options)
</del><ins>+PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><del>- if (auto imageValue = pendingImage->cssImageValue())
</del><ins>+ if (auto imageValue = pendingImage.cssImageValue())
</ins><span class="cx"> return imageValue->cachedImage(m_state.document().cachedResourceLoader(), options);
</span><span class="cx">
</span><del>- if (auto imageGeneratorValue = pendingImage->cssImageGeneratorValue()) {
</del><ins>+ if (auto imageGeneratorValue = pendingImage.cssImageGeneratorValue()) {
</ins><span class="cx"> imageGeneratorValue->loadSubimages(m_state.document().cachedResourceLoader());
</span><span class="cx"> return StyleGeneratedImage::create(*imageGeneratorValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (auto cursorImageValue = pendingImage->cssCursorImageValue())
</del><ins>+ if (auto cursorImageValue = pendingImage.cssCursorImageValue())
</ins><span class="cx"> return cursorImageValue->cachedImage(m_state.document().cachedResourceLoader());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span><del>- if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
</del><ins>+ if (auto imageSetValue = pendingImage.cssImageSetValue())
</ins><span class="cx"> return imageSetValue->cachedImageSet(m_state.document().cachedResourceLoader(), options);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StyleImage> StyleResolver::loadPendingImage(StylePendingImage* pendingImage)
</del><ins>+PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage)
</ins><span class="cx"> {
</span><span class="cx"> return loadPendingImage(pendingImage, CachedResourceLoader::defaultCachedResourceOptions());
</span><span class="cx"> }
</span><span class="lines">@@ -3518,7 +3518,7 @@
</span><span class="cx"> if (!image || !image->isPendingImage())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- StylePendingImage* pendingImage = toStylePendingImage(image);
</del><ins>+ auto& pendingImage = toStylePendingImage(*image);
</ins><span class="cx">
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><span class="cx"> options.requestOriginPolicy = PotentiallyCrossOriginEnabled;
</span><span class="lines">@@ -3540,8 +3540,9 @@
</span><span class="cx"> switch (currentProperty) {
</span><span class="cx"> case CSSPropertyBackgroundImage: {
</span><span class="cx"> for (FillLayer* backgroundLayer = m_state.style()->accessBackgroundLayers(); backgroundLayer; backgroundLayer = backgroundLayer->next()) {
</span><del>- if (backgroundLayer->image() && backgroundLayer->image()->isPendingImage())
- backgroundLayer->setImage(loadPendingImage(toStylePendingImage(backgroundLayer->image())));
</del><ins>+ auto styleImage = backgroundLayer->image();
+ if (styleImage && styleImage->isPendingImage())
+ backgroundLayer->setImage(loadPendingImage(toStylePendingImage(*styleImage)));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -3550,7 +3551,7 @@
</span><span class="cx"> if (contentData->isImage()) {
</span><span class="cx"> auto& styleImage = toImageContentData(contentData)->image();
</span><span class="cx"> if (styleImage.isPendingImage()) {
</span><del>- RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(const_cast<StyleImage*>(&styleImage)));
</del><ins>+ RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(styleImage));
</ins><span class="cx"> if (loadedImage)
</span><span class="cx"> toImageContentData(contentData)->setImage(loadedImage.release());
</span><span class="cx"> }
</span><span class="lines">@@ -3562,43 +3563,47 @@
</span><span class="cx"> if (CursorList* cursorList = m_state.style()->cursors()) {
</span><span class="cx"> for (size_t i = 0; i < cursorList->size(); ++i) {
</span><span class="cx"> CursorData& currentCursor = cursorList->at(i);
</span><del>- if (StyleImage* image = currentCursor.image()) {
- if (image->isPendingImage())
- currentCursor.setImage(loadPendingImage(toStylePendingImage(image)));
- }
</del><ins>+ auto styleImage = currentCursor.image();
+ if (styleImage && styleImage->isPendingImage())
+ currentCursor.setImage(loadPendingImage(toStylePendingImage(*styleImage)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyListStyleImage: {
</span><del>- if (m_state.style()->listStyleImage() && m_state.style()->listStyleImage()->isPendingImage())
- m_state.style()->setListStyleImage(loadPendingImage(toStylePendingImage(m_state.style()->listStyleImage())));
</del><ins>+ auto styleImage = m_state.style()->listStyleImage();
+ if (styleImage && styleImage->isPendingImage())
+ m_state.style()->setListStyleImage(loadPendingImage(toStylePendingImage(*styleImage)));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyBorderImageSource: {
</span><del>- if (m_state.style()->borderImageSource() && m_state.style()->borderImageSource()->isPendingImage())
- m_state.style()->setBorderImageSource(loadPendingImage(toStylePendingImage(m_state.style()->borderImageSource())));
</del><ins>+ auto styleImage = m_state.style()->borderImageSource();
+ if (styleImage && styleImage->isPendingImage())
+ m_state.style()->setBorderImageSource(loadPendingImage(toStylePendingImage(*styleImage)));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitBoxReflect: {
</span><span class="cx"> if (StyleReflection* reflection = m_state.style()->boxReflect()) {
</span><span class="cx"> const NinePieceImage& maskImage = reflection->mask();
</span><del>- if (maskImage.image() && maskImage.image()->isPendingImage()) {
- RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(maskImage.image()));
</del><ins>+ auto styleImage = maskImage.image();
+ if (styleImage && styleImage->isPendingImage()) {
+ RefPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(*styleImage));
</ins><span class="cx"> reflection->setMask(NinePieceImage(loadedImage.release(), maskImage.imageSlices(), maskImage.fill(), maskImage.borderSlices(), maskImage.outset(), maskImage.horizontalRule(), maskImage.verticalRule()));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitMaskBoxImageSource: {
</span><del>- if (m_state.style()->maskBoxImageSource() && m_state.style()->maskBoxImageSource()->isPendingImage())
- m_state.style()->setMaskBoxImageSource(loadPendingImage(toStylePendingImage(m_state.style()->maskBoxImageSource())));
</del><ins>+ auto styleImage = m_state.style()->maskBoxImageSource();
+ if (styleImage && styleImage->isPendingImage())
+ m_state.style()->setMaskBoxImageSource(loadPendingImage(toStylePendingImage(*styleImage)));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSPropertyWebkitMaskImage: {
</span><span class="cx"> for (FillLayer* maskLayer = m_state.style()->accessMaskLayers(); maskLayer; maskLayer = maskLayer->next()) {
</span><del>- if (maskLayer->image() && maskLayer->image()->isPendingImage())
- maskLayer->setImage(loadPendingImage(toStylePendingImage(maskLayer->image())));
</del><ins>+ auto styleImage = maskLayer->image();
+ if (styleImage && styleImage->isPendingImage())
+ maskLayer->setImage(loadPendingImage(toStylePendingImage(*styleImage)));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (164488 => 164489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2014-02-21 19:28:15 UTC (rev 164488)
+++ trunk/Source/WebCore/css/StyleResolver.h 2014-02-21 19:38:31 UTC (rev 164489)
</span><span class="lines">@@ -472,8 +472,8 @@
</span><span class="cx">
</span><span class="cx"> void applySVGProperty(CSSPropertyID, CSSValue*);
</span><span class="cx">
</span><del>- PassRefPtr<StyleImage> loadPendingImage(StylePendingImage*, const ResourceLoaderOptions&);
- PassRefPtr<StyleImage> loadPendingImage(StylePendingImage*);
</del><ins>+ PassRefPtr<StyleImage> loadPendingImage(const StylePendingImage&, const ResourceLoaderOptions&);
+ PassRefPtr<StyleImage> loadPendingImage(const StylePendingImage&);
</ins><span class="cx"> void loadPendingImages();
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> void loadPendingShapeImage(ShapeValue*);
</span></span></pre>
</div>
</div>
</body>
</html>