diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/rendering/style')
11 files changed, 17 insertions, 24 deletions
diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/KeyframeList.cpp b/chromium/third_party/WebKit/Source/core/rendering/style/KeyframeList.cpp index 093d796b6e7..9d20a1c666a 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/KeyframeList.cpp +++ b/chromium/third_party/WebKit/Source/core/rendering/style/KeyframeList.cpp @@ -36,7 +36,7 @@ void KeyframeValue::addProperties(const StylePropertySet* propertySet) CSSPropertyID property = propertySet->propertyAt(i).id(); // Timing-function within keyframes is special, because it is not animated; it just // describes the timing function between this keyframe and the next. - if (property != CSSPropertyWebkitAnimationTimingFunction && property != CSSPropertyAnimationTimingFunction) + if (property != CSSPropertyWebkitAnimationTimingFunction) addProperty(property); } } diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/KeyframeList.h b/chromium/third_party/WebKit/Source/core/rendering/style/KeyframeList.h index 4d5e207317b..5a5cf92ec04 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/KeyframeList.h +++ b/chromium/third_party/WebKit/Source/core/rendering/style/KeyframeList.h @@ -40,7 +40,7 @@ class StylePropertySet; class KeyframeValue { public: - KeyframeValue(double key, PassRefPtr<RenderStyle> style) + KeyframeValue(float key, PassRefPtr<RenderStyle> style) : m_key(key) , m_style(style) { @@ -51,14 +51,14 @@ public: bool containsProperty(CSSPropertyID prop) const { return m_properties.contains(prop); } const HashSet<CSSPropertyID>& properties() const { return m_properties; } - double key() const { return m_key; } - void setKey(double key) { m_key = key; } + float key() const { return m_key; } + void setKey(float key) { m_key = key; } const RenderStyle* style() const { return m_style.get(); } void setStyle(PassRefPtr<RenderStyle> style) { m_style = style; } private: - double m_key; + float m_key; HashSet<CSSPropertyID> m_properties; // The properties specified in this keyframe. RefPtr<RenderStyle> m_style; }; diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/SVGRenderStyle.cpp b/chromium/third_party/WebKit/Source/core/rendering/style/SVGRenderStyle.cpp index bc5c3399257..4ec55815a8f 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/SVGRenderStyle.cpp +++ b/chromium/third_party/WebKit/Source/core/rendering/style/SVGRenderStyle.cpp @@ -169,10 +169,7 @@ StyleDifference SVGRenderStyle::diff(const SVGRenderStyle* other) const || stroke->paintUri != other->stroke->paintUri || stroke->miterLimit != other->stroke->miterLimit || stroke->dashArray != other->stroke->dashArray - || stroke->dashOffset != other->stroke->dashOffset - || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintColor - || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri - || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintType) + || stroke->dashOffset != other->stroke->dashOffset) return StyleDifferenceLayout; // Only the stroke-opacity case remains, where we only need a repaint. diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/ShapeValue.h b/chromium/third_party/WebKit/Source/core/rendering/style/ShapeValue.h index bb71dab440a..b72d2518665 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/ShapeValue.h +++ b/chromium/third_party/WebKit/Source/core/rendering/style/ShapeValue.h @@ -30,7 +30,6 @@ #ifndef ShapeValue_h #define ShapeValue_h -#include "core/fetch/ImageResource.h" #include "core/rendering/style/BasicShapes.h" #include "core/rendering/style/StyleImage.h" #include "wtf/PassRefPtr.h" @@ -63,12 +62,9 @@ public: ShapeValueType type() const { return m_type; } BasicShape* shape() const { return m_shape.get(); } - StyleImage* image() const { return m_image.get(); } - bool isImageValid() const { return image() && image()->cachedImage() && image()->cachedImage()->hasImage(); } void setImage(PassRefPtr<StyleImage> image) { - ASSERT(type() == Image); if (m_image != image) m_image = image; } diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/StyleCustomFilterProgram.h b/chromium/third_party/WebKit/Source/core/rendering/style/StyleCustomFilterProgram.h index 18be011b566..167821769ac 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/StyleCustomFilterProgram.h +++ b/chromium/third_party/WebKit/Source/core/rendering/style/StyleCustomFilterProgram.h @@ -30,9 +30,9 @@ #ifndef StyleCustomFilterProgram_h #define StyleCustomFilterProgram_h -#include "core/fetch/ResourceClient.h" -#include "core/fetch/ResourcePtr.h" -#include "core/fetch/ShaderResource.h" +#include "core/loader/cache/ResourceClient.h" +#include "core/loader/cache/ResourcePtr.h" +#include "core/loader/cache/ShaderResource.h" #include "core/platform/graphics/filters/custom/CustomFilterProgram.h" #include "core/rendering/style/StyleShader.h" #include "weborigin/KURL.h" diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImage.cpp b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImage.cpp index 31dc65a0452..e09447510e2 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImage.cpp +++ b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImage.cpp @@ -24,7 +24,7 @@ #include "config.h" #include "core/rendering/style/StyleFetchedImage.h" -#include "core/fetch/ImageResource.h" +#include "core/loader/cache/ImageResource.h" #include "core/rendering/RenderObject.h" namespace WebCore { diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImage.h b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImage.h index 9ea82f51778..b9effd9c2cd 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImage.h +++ b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImage.h @@ -24,8 +24,8 @@ #ifndef StyleFetchedImage_h #define StyleFetchedImage_h -#include "core/fetch/ImageResourceClient.h" -#include "core/fetch/ResourcePtr.h" +#include "core/loader/cache/ImageResourceClient.h" +#include "core/loader/cache/ResourcePtr.h" #include "core/rendering/style/StyleImage.h" namespace WebCore { diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.cpp b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.cpp index 04a8d9d5961..b9e9d52c190 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.cpp +++ b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.cpp @@ -27,7 +27,7 @@ #include "core/rendering/style/StyleFetchedImageSet.h" #include "core/css/CSSImageSetValue.h" -#include "core/fetch/ImageResource.h" +#include "core/loader/cache/ImageResource.h" #include "core/rendering/RenderObject.h" namespace WebCore { diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.h b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.h index 178ec3c87b0..3e431e23388 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.h +++ b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedImageSet.h @@ -26,8 +26,8 @@ #ifndef StyleFetchedImageSet_h #define StyleFetchedImageSet_h -#include "core/fetch/ImageResourceClient.h" -#include "core/fetch/ResourcePtr.h" +#include "core/loader/cache/ImageResourceClient.h" +#include "core/loader/cache/ResourcePtr.h" #include "core/platform/graphics/LayoutSize.h" #include "core/rendering/style/StyleImage.h" diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedShader.cpp b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedShader.cpp index 13a8b98c36a..2b6c6c24e4e 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedShader.cpp +++ b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedShader.cpp @@ -32,7 +32,7 @@ #include "core/rendering/style/StyleFetchedShader.h" #include "core/css/CSSPrimitiveValue.h" -#include "core/fetch/ShaderResource.h" +#include "core/loader/cache/ShaderResource.h" namespace WebCore { diff --git a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedShader.h b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedShader.h index 104a90cc871..88e54112d14 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedShader.h +++ b/chromium/third_party/WebKit/Source/core/rendering/style/StyleFetchedShader.h @@ -30,7 +30,7 @@ #ifndef StyleFetchedShader_h #define StyleFetchedShader_h -#include "core/fetch/ResourcePtr.h" +#include "core/loader/cache/ResourcePtr.h" #include "core/rendering/style/StyleShader.h" namespace WebCore { |