Title: [176748] trunk/Source
- Revision
- 176748
- Author
- [email protected]
- Date
- 2014-12-03 12:37:54 -0800 (Wed, 03 Dec 2014)
Log Message
[TexMap] Redundant method in GraphicsLayerTextureMapper.
https://bugs.webkit.org/show_bug.cgi?id=138005
Patch by [email protected] <[email protected]> on 2014-12-03
Reviewed by Alex Christensen.
The TextureMapperLayer method descendantsOrSelfHaveRunningAnimations() can be used
instead of the GraphicsLayerTextureMapper method startedAnimation().
Source/WebCore:
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::GraphicsLayerTextureMapper):
(WebCore::GraphicsLayerTextureMapper::addAnimation):
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
Source/WebKit/win:
* WebCoreSupport/AcceleratedCompositingContext.cpp:
(AcceleratedCompositingContext::startedAnimation):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (176747 => 176748)
--- trunk/Source/WebCore/ChangeLog 2014-12-03 20:36:54 UTC (rev 176747)
+++ trunk/Source/WebCore/ChangeLog 2014-12-03 20:37:54 UTC (rev 176748)
@@ -1,3 +1,18 @@
+2014-12-03 [email protected] <[email protected]>
+
+ [TexMap] Redundant method in GraphicsLayerTextureMapper.
+ https://bugs.webkit.org/show_bug.cgi?id=138005
+
+ Reviewed by Alex Christensen.
+
+ The TextureMapperLayer method descendantsOrSelfHaveRunningAnimations() can be used
+ instead of the GraphicsLayerTextureMapper method startedAnimation().
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::GraphicsLayerTextureMapper):
+ (WebCore::GraphicsLayerTextureMapper::addAnimation):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+
2014-12-03 Jeremy Jones <[email protected]>
Subtitle menu should only appear when useful.
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (176747 => 176748)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-12-03 20:36:54 UTC (rev 176747)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-12-03 20:37:54 UTC (rev 176748)
@@ -49,7 +49,6 @@
, m_contentsLayer(0)
, m_animationStartTime(0)
, m_isScrollable(false)
- , m_startedAnimation(false)
{
}
@@ -577,7 +576,6 @@
m_animationStartTime = currentTime - timeOffset;
notifyChange(AnimationChange);
notifyChange(AnimationStarted);
- m_startedAnimation = true;
return true;
}
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (176747 => 176748)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-12-03 20:36:54 UTC (rev 176747)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-12-03 20:37:54 UTC (rev 176748)
@@ -100,7 +100,6 @@
void setRepaintCount(int);
void setAnimations(const GraphicsLayerAnimations&);
- bool startedAnimation() const { return m_startedAnimation; }
private:
// GraphicsLayer
@@ -181,7 +180,6 @@
IntSize m_committedScrollOffset;
bool m_isScrollable;
- bool m_startedAnimation;
};
} // namespace WebCore
Modified: trunk/Source/WebKit/win/ChangeLog (176747 => 176748)
--- trunk/Source/WebKit/win/ChangeLog 2014-12-03 20:36:54 UTC (rev 176747)
+++ trunk/Source/WebKit/win/ChangeLog 2014-12-03 20:37:54 UTC (rev 176748)
@@ -1,3 +1,16 @@
+2014-12-03 [email protected] <[email protected]>
+
+ [TexMap] Redundant method in GraphicsLayerTextureMapper.
+ https://bugs.webkit.org/show_bug.cgi?id=138005
+
+ Reviewed by Alex Christensen.
+
+ The TextureMapperLayer method descendantsOrSelfHaveRunningAnimations() can be used
+ instead of the GraphicsLayerTextureMapper method startedAnimation().
+
+ * WebCoreSupport/AcceleratedCompositingContext.cpp:
+ (AcceleratedCompositingContext::startedAnimation):
+
2014-12-02 Anders Carlsson <[email protected]>
Remove more Windows cruft
Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp (176747 => 176748)
--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2014-12-03 20:36:54 UTC (rev 176747)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2014-12-03 20:37:54 UTC (rev 176748)
@@ -139,18 +139,10 @@
bool AcceleratedCompositingContext::startedAnimation(WebCore::GraphicsLayer* layer)
{
- if (!layer)
+ if (!layer || !downcast<GraphicsLayerTextureMapper>(*layer).layer())
return false;
- if (downcast<GraphicsLayerTextureMapper>(layer)->startedAnimation())
- return true;
-
- for (auto childLayer : layer->children()) {
- if (startedAnimation(childLayer))
- return true;
- }
-
- return false;
+ return downcast<GraphicsLayerTextureMapper>(*layer).layer()->descendantsOrSelfHaveRunningAnimations();
}
void AcceleratedCompositingContext::compositeLayersToContext(CompositePurpose purpose)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
