<!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>[169904] 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/169904">169904</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-12 11:50:18 -0700 (Thu, 12 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ShapeValue.cpp and move ShapeValue::isImageValid() there
https://bugs.webkit.org/show_bug.cgi?id=133809
Reviewed by Antti Koivisto.
This gets rid of CachedImage.h (and ResourceRequest and friends) from RenderStyle.h.
* CMakeLists.txt:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::shapePropertyValue):
* css/CSSCrossfadeValue.cpp:
* css/CSSFilterImageValue.cpp:
* css/StyleResolver.h:
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc):
* rendering/ShapeValue.cpp: Added.
(WebCore::ShapeValue::isImageValid):
* rendering/shapes/ShapeOutsideInfo.cpp:
(WebCore::referenceBox):
(WebCore::ShapeOutsideInfo::computedShape):
(WebCore::ShapeOutsideInfo::isEnabledFor):
* rendering/style/ShapeValue.h:
(WebCore::ShapeValue::type):
(WebCore::ShapeValue::setImage):
(WebCore::ShapeValue::ShapeValue):
(WebCore::ShapeValue::isImageValid): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCrossfadeValuecpp">trunk/Source/WebCore/css/CSSCrossfadeValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleShapeValueh">trunk/Source/WebCore/rendering/style/ShapeValue.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorerenderingstyleShapeValuecpp">trunk/Source/WebCore/rendering/style/ShapeValue.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -2394,6 +2394,7 @@
</span><span class="cx"> rendering/style/SVGRenderStyle.cpp
</span><span class="cx"> rendering/style/SVGRenderStyleDefs.cpp
</span><span class="cx"> rendering/style/ShadowData.cpp
</span><ins>+ rendering/style/ShapeValue.cpp
</ins><span class="cx"> rendering/style/StyleBackgroundData.cpp
</span><span class="cx"> rendering/style/StyleBoxData.cpp
</span><span class="cx"> rendering/style/StyleCachedImage.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/ChangeLog 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-06-12 Anders Carlsson <andersca@apple.com>
+
+ Add ShapeValue.cpp and move ShapeValue::isImageValid() there
+ https://bugs.webkit.org/show_bug.cgi?id=133809
+
+ Reviewed by Antti Koivisto.
+
+ This gets rid of CachedImage.h (and ResourceRequest and friends) from RenderStyle.h.
+
+ * CMakeLists.txt:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::shapePropertyValue):
+ * css/CSSCrossfadeValue.cpp:
+ * css/CSSFilterImageValue.cpp:
+ * css/StyleResolver.h:
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc):
+ * rendering/ShapeValue.cpp: Added.
+ (WebCore::ShapeValue::isImageValid):
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ (WebCore::referenceBox):
+ (WebCore::ShapeOutsideInfo::computedShape):
+ (WebCore::ShapeOutsideInfo::isEnabledFor):
+ * rendering/style/ShapeValue.h:
+ (WebCore::ShapeValue::type):
+ (WebCore::ShapeValue::setImage):
+ (WebCore::ShapeValue::ShapeValue):
+ (WebCore::ShapeValue::isImageValid): Deleted.
+
</ins><span class="cx"> 2014-06-12 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Make <select> element's decoration subpixel aware.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -11542,6 +11542,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\rendering\style\ShapeValue.cpp" />
</ins><span class="cx"> <ClCompile Include="..\rendering\style\StyleAllInOne.cpp" />
</span><span class="cx"> <ClCompile Include="..\rendering\style\StyleBackgroundData.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -2790,6 +2790,9 @@
</span><span class="cx"> <ClCompile Include="..\rendering\style\ShadowData.cpp">
</span><span class="cx"> <Filter>rendering\style</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\rendering\style\ShapeValue.cpp">
+ <Filter>rendering\style</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\rendering\style\StyleAllInOne.cpp">
</span><span class="cx"> <Filter>rendering\style</Filter>
</span><span class="cx"> </ClCompile>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -791,6 +791,7 @@
</span><span class="cx"> 1AB1AE7A0C051FDE00139F4F /* zoomInCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */; };
</span><span class="cx"> 1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */; };
</span><span class="cx"> 1AB33DA512551E320024457A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AB33DA412551E320024457A /* IOKit.framework */; };
</span><ins>+ 1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */; };
</ins><span class="cx"> 1AB7FC680A8B92EC00D9D37B /* XPathEvaluator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */; };
</span><span class="cx"> 1AB7FC690A8B92EC00D9D37B /* XPathEvaluator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7FC480A8B92EC00D9D37B /* XPathEvaluator.h */; };
</span><span class="cx"> 1AB7FC6B0A8B92EC00D9D37B /* XPathExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7FC4A0A8B92EC00D9D37B /* XPathExpression.cpp */; };
</span><span class="lines">@@ -7717,6 +7718,7 @@
</span><span class="cx"> 1AB1AE780C051FDE00139F4F /* zoomInCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomInCursor.png; sourceTree = "<group>"; };
</span><span class="cx"> 1AB1AE790C051FDE00139F4F /* zoomOutCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoomOutCursor.png; sourceTree = "<group>"; };
</span><span class="cx"> 1AB33DA412551E320024457A /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
</span><ins>+ 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShapeValue.cpp; path = style/ShapeValue.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XPathEvaluator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AB7FC480A8B92EC00D9D37B /* XPathEvaluator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XPathEvaluator.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB7FC490A8B92EC00D9D37B /* XPathEvaluator.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = XPathEvaluator.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -20868,6 +20870,7 @@
</span><span class="cx"> BC5EB6670E81CB7100B25965 /* RenderStyleConstants.h */,
</span><span class="cx"> BC5EB8C10E82031B00B25965 /* ShadowData.cpp */,
</span><span class="cx"> BC5EB8C20E82031B00B25965 /* ShadowData.h */,
</span><ins>+ 1AB5EBCF194A1D170059AC70 /* ShapeValue.cpp */,
</ins><span class="cx"> FD1AF14E1656F12100C6D4F7 /* ShapeValue.h */,
</span><span class="cx"> BC5EB6A00E81DC4F00B25965 /* StyleBackgroundData.cpp */,
</span><span class="cx"> BC5EB6A10E81DC4F00B25965 /* StyleBackgroundData.h */,
</span><span class="lines">@@ -29702,6 +29705,7 @@
</span><span class="cx"> B10B6981140C174000BC1C26 /* WebVTTTokenizer.cpp in Sources */,
</span><span class="cx"> CD8203111395ACE700F956C6 /* WebWindowAnimation.mm in Sources */,
</span><span class="cx"> F55B3DDF1251F12D003EF269 /* WeekInputType.cpp in Sources */,
</span><ins>+ 1AB5EBD0194A1D170059AC70 /* ShapeValue.cpp in Sources */,
</ins><span class="cx"> 85031B500A44EFC700F992E0 /* WheelEvent.cpp in Sources */,
</span><span class="cx"> 93EC44A1188F4BB800661DF1 /* WheelEventDeltaTracker.cpp in Sources */,
</span><span class="cx"> 9380F47309A11AB4001FDB34 /* Widget.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -1622,13 +1622,13 @@
</span><span class="cx"> if (!shapeValue)
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx">
</span><del>- if (shapeValue->type() == ShapeValue::Box)
</del><ins>+ if (shapeValue->type() == ShapeValue::Type::Box)
</ins><span class="cx"> return cssValuePool().createValue(shapeValue->cssBox());
</span><span class="cx">
</span><del>- if (shapeValue->type() == ShapeValue::Image)
</del><ins>+ if (shapeValue->type() == ShapeValue::Type::Image)
</ins><span class="cx"> return shapeValue->image() ? shapeValue->image()->cssValue() : cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx">
</span><del>- ASSERT(shapeValue->type() == ShapeValue::Shape);
</del><ins>+ ASSERT(shapeValue->type() == ShapeValue::Type::Shape);
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
</span><span class="cx"> list->append(valueForBasicShape(style, shapeValue->shape()));
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCrossfadeValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCrossfadeValue.cpp (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCrossfadeValue.cpp 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/css/CSSCrossfadeValue.cpp 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AnimationUtilities.h"
</span><span class="cx"> #include "CSSImageValue.h"
</span><ins>+#include "CachedImage.h"
</ins><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "CrossfadeGeneratedImage.h"
</span><span class="cx"> #include "ImageBuffer.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx">
</span><span class="cx"> #include "CSSImageValue.h"
</span><ins>+#include "CachedImage.h"
</ins><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "CrossfadeGeneratedImage.h"
</span><span class="cx"> #include "FilterEffectRenderer.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/css/StyleResolver.h 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> class StyledElement;
</span><span class="cx"> class ViewportStyleResolver;
</span><span class="cx"> class WebKitCSSFilterValue;
</span><ins>+struct ResourceLoaderOptions;
</ins><span class="cx">
</span><span class="cx"> class MediaQueryResult {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(MediaQueryResult); WTF_MAKE_FAST_ALLOCATED;
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> if (!from || !to)
</span><span class="cx"> return to;
</span><span class="cx">
</span><del>- if (from->type() != ShapeValue::Shape || to->type() != ShapeValue::Shape)
</del><ins>+ if (from->type() != ShapeValue::Type::Shape || to->type() != ShapeValue::Type::Shape)
</ins><span class="cx"> return to;
</span><span class="cx">
</span><span class="cx"> if (from->cssBox() != to->cssBox())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> static inline CSSBoxType referenceBox(const ShapeValue& shapeValue)
</span><span class="cx"> {
</span><span class="cx"> if (shapeValue.cssBox() == BoxMissing) {
</span><del>- if (shapeValue.type() == ShapeValue::Image)
</del><ins>+ if (shapeValue.type() == ShapeValue::Type::Image)
</ins><span class="cx"> return ContentBox;
</span><span class="cx"> return MarginBox;
</span><span class="cx"> }
</span><span class="lines">@@ -175,15 +175,15 @@
</span><span class="cx"> const ShapeValue& shapeValue = *style.shapeOutside();
</span><span class="cx">
</span><span class="cx"> switch (shapeValue.type()) {
</span><del>- case ShapeValue::Shape:
</del><ins>+ case ShapeValue::Type::Shape:
</ins><span class="cx"> ASSERT(shapeValue.shape());
</span><span class="cx"> m_shape = Shape::createShape(shapeValue.shape(), m_referenceBoxLogicalSize, writingMode, margin);
</span><span class="cx"> break;
</span><del>- case ShapeValue::Image:
</del><ins>+ case ShapeValue::Type::Image:
</ins><span class="cx"> ASSERT(shapeValue.isImageValid());
</span><span class="cx"> m_shape = createShapeForImage(shapeValue.image(), shapeImageThreshold, writingMode, margin);
</span><span class="cx"> break;
</span><del>- case ShapeValue::Box: {
</del><ins>+ case ShapeValue::Type::Box: {
</ins><span class="cx"> RoundedRect shapeRect = computeRoundedRectForBoxShape(referenceBox(shapeValue), m_renderer);
</span><span class="cx"> if (!containingBlockStyle.isHorizontalWritingMode())
</span><span class="cx"> shapeRect = shapeRect.transposedRect();
</span><span class="lines">@@ -294,9 +294,9 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> switch (shapeValue->type()) {
</span><del>- case ShapeValue::Shape: return shapeValue->shape();
- case ShapeValue::Image: return shapeValue->isImageValid() && checkShapeImageOrigin(box.document(), *(shapeValue->image()));
- case ShapeValue::Box: return true;
</del><ins>+ case ShapeValue::Type::Shape: return shapeValue->shape();
+ case ShapeValue::Type::Image: return shapeValue->isImageValid() && checkShapeImageOrigin(box.document(), *(shapeValue->image()));
+ case ShapeValue::Type::Box: return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleShapeValuecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/rendering/style/ShapeValue.cpp (0 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ShapeValue.cpp (rev 0)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.cpp 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ShapeValue.h"
+
+#include "CachedImage.h"
+
+namespace WebCore {
+
+bool ShapeValue::isImageValid() const
+{
+ if (!image())
+ return false;
+ if (image()->isCachedImage() || image()->isCachedImageSet())
+ return image()->cachedImage() && image()->cachedImage()->hasImage();
+ return image()->isGeneratedImage();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleShapeValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ShapeValue.h (169903 => 169904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ShapeValue.h 2014-06-12 18:22:46 UTC (rev 169903)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.h 2014-06-12 18:50:18 UTC (rev 169904)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx">
</span><span class="cx"> #include "BasicShapes.h"
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><del>-#include "CachedImage.h"
</del><span class="cx"> #include "StyleImage.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -40,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> class ShapeValue : public RefCounted<ShapeValue> {
</span><span class="cx"> public:
</span><del>- enum ShapeValueType {
</del><ins>+ enum class Type {
</ins><span class="cx"> // The None value is defined by a null ShapeValue*
</span><span class="cx"> Shape,
</span><span class="cx"> Box,
</span><span class="lines">@@ -62,24 +61,17 @@
</span><span class="cx"> return adoptRef(new ShapeValue(image));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ShapeValueType type() const { return m_type; }
</del><ins>+ Type type() const { return m_type; }
</ins><span class="cx"> BasicShape* shape() const { return m_shape.get(); }
</span><span class="cx"> CSSBoxType cssBox() const { return m_cssBox; }
</span><span class="cx">
</span><span class="cx"> StyleImage* image() const { return m_image.get(); }
</span><span class="cx">
</span><del>- bool isImageValid() const
- {
- if (!image())
- return false;
- if (image()->isCachedImage() || image()->isCachedImageSet())
- return image()->cachedImage() && image()->cachedImage()->hasImage();
- return image()->isGeneratedImage();
- }
</del><ins>+ bool isImageValid() const;
</ins><span class="cx">
</span><span class="cx"> void setImage(PassRefPtr<StyleImage> image)
</span><span class="cx"> {
</span><del>- ASSERT(type() == Image);
</del><ins>+ ASSERT(type() == Type::Image);
</ins><span class="cx"> if (m_image != image)
</span><span class="cx"> m_image = image;
</span><span class="cx"> }
</span><span class="lines">@@ -88,29 +80,30 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ShapeValue(PassRefPtr<BasicShape> shape, CSSBoxType cssBox)
</span><del>- : m_type(Shape)
</del><ins>+ : m_type(Type::Shape)
</ins><span class="cx"> , m_shape(shape)
</span><span class="cx"> , m_cssBox(cssBox)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>- ShapeValue(ShapeValueType type)
</del><ins>+ ShapeValue(Type type)
</ins><span class="cx"> : m_type(type)
</span><span class="cx"> , m_cssBox(BoxMissing)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> ShapeValue(PassRefPtr<StyleImage> image)
</span><del>- : m_type(Image)
</del><ins>+ : m_type(Type::Image)
</ins><span class="cx"> , m_image(image)
</span><span class="cx"> , m_cssBox(BoxMissing)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> ShapeValue(CSSBoxType cssBox)
</span><del>- : m_type(Box)
</del><ins>+ : m_type(Type::Box)
</ins><span class="cx"> , m_cssBox(cssBox)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ShapeValueType m_type;
</del><ins>+ Type m_type;
</ins><span class="cx"> RefPtr<BasicShape> m_shape;
</span><span class="cx"> RefPtr<StyleImage> m_image;
</span><span class="cx"> CSSBoxType m_cssBox;
</span></span></pre>
</div>
</div>
</body>
</html>