Diff
Modified: trunk/Source/WebCore/ChangeLog (100858 => 100859)
--- trunk/Source/WebCore/ChangeLog 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebCore/ChangeLog 2011-11-19 20:15:12 UTC (rev 100859)
@@ -1,3 +1,15 @@
+2011-11-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r100834.
+ http://trac.webkit.org/changeset/100834
+ https://bugs.webkit.org/show_bug.cgi?id=72806
+
+ this patch makes Qt run-webkit-test exit before finishing
+ (Requested by igoroliveira on #webkit).
+
+ * platform/graphics/texmap/TextureMapperNode.cpp:
+ * platform/graphics/texmap/TextureMapperNode.h:
+
2011-11-19 Huang Dongsung <[email protected]>
Remove WebCore/ForwardingHeaders/runtime/JSObjectWithGlobalObject.h because
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp (100858 => 100859)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp 2011-11-19 20:15:12 UTC (rev 100859)
@@ -984,16 +984,6 @@
}
}
-void TextureMapperNode::syncAnimationsRecursively()
-{
- syncAnimations(0);
-
- computeAllTransforms();
-
- for (int i = m_children.size() - 1; i >= 0; --i)
- m_children[i]->syncAnimationsRecursively();
-}
-
void TextureMapperNode::syncCompositingState(GraphicsLayerTextureMapper* graphicsLayer, TextureMapper* textureMapper, int options)
{
if (graphicsLayer && !(options & ComputationsOnly)) {
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h (100858 => 100859)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h 2011-11-19 20:15:12 UTC (rev 100859)
@@ -141,7 +141,6 @@
void syncCompositingState(GraphicsLayerTextureMapper*, int syncOptions = 0);
void syncCompositingState(GraphicsLayerTextureMapper*, TextureMapper*, int syncOptions = 0);
- void syncAnimationsRecursively();
IntSize size() const { return IntSize(m_size.width(), m_size.height()); }
void setTransform(const TransformationMatrix&);
void setOpacity(float value) { m_opacity = value; }
Modified: trunk/Source/WebKit2/ChangeLog (100858 => 100859)
--- trunk/Source/WebKit2/ChangeLog 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-19 20:15:12 UTC (rev 100859)
@@ -1,3 +1,31 @@
+2011-11-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r100834.
+ http://trac.webkit.org/changeset/100834
+ https://bugs.webkit.org/show_bug.cgi?id=72806
+
+ this patch makes Qt run-webkit-test exit before finishing
+ (Requested by igoroliveira on #webkit).
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (CoreIPC::::encode):
+ (CoreIPC::::decode):
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebLayerTreeInfo.cpp:
+ (WebKit::WebLayerInfo::encode):
+ (WebKit::WebLayerInfo::decode):
+ * Shared/WebLayerTreeInfo.h:
+ * UIProcess/LayerTreeHostProxy.h:
+ * UIProcess/qt/LayerTreeHostProxyQt.cpp:
+ (WebKit::LayerTreeHostProxy::LayerTreeHostProxy):
+ (WebKit::LayerTreeHostProxy::paintToCurrentGLContext):
+ (WebKit::LayerTreeHostProxy::syncLayerParameters):
+ * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+ (WebCore::WebGraphicsLayer::addAnimation):
+ (WebCore::WebGraphicsLayer::pauseAnimation):
+ (WebCore::WebGraphicsLayer::removeAnimation):
+ (WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
+
2011-11-18 Sheriff Bot <[email protected]>
Unreviewed, rolling out r100826.
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (100858 => 100859)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2011-11-19 20:15:12 UTC (rev 100859)
@@ -647,6 +647,7 @@
return SimpleArgumentCoder<Length>::decode(decoder, length);
}
+
void ArgumentCoder<TransformationMatrix>::encode(ArgumentEncoder* encoder, const TransformationMatrix& transformationMatrix)
{
SimpleArgumentCoder<TransformationMatrix>::encode(encoder, transformationMatrix);
@@ -1061,18 +1062,18 @@
encoder->encodeEnum(value);
}
-void ArgumentCoder<RefPtr<Animation> >::encode(ArgumentEncoder* encoder, const RefPtr<Animation>& animation)
+void ArgumentCoder<Animation>::encode(ArgumentEncoder* encoder, const Animation& animation)
{
- encodeBoolAndValue(encoder, animation->isDelaySet(), animation->delay());
- encodeBoolAndEnumValue(encoder, animation->isDirectionSet(), animation->direction());
- encodeBoolAndValue(encoder, animation->isDurationSet(), animation->duration());
- encodeBoolAndValue(encoder, animation->isFillModeSet(), animation->fillMode());
- encodeBoolAndValue(encoder, animation->isIterationCountSet(), animation->iterationCount());
- encodeBoolAndValue(encoder, animation->isNameSet(), animation->name());
- encodeBoolAndEnumValue(encoder, animation->isPlayStateSet(), animation->playState());
- encodeBoolAndValue(encoder, animation->isPropertySet(), animation->property());
- encodeBoolAndValue<RefPtr<TimingFunction> >(encoder, animation->isTimingFunctionSet(), animation->timingFunction());
- encoder->encodeBool(animation->isNoneAnimation());
+ encodeBoolAndValue(encoder, animation.isDelaySet(), animation.delay());
+ encodeBoolAndEnumValue(encoder, animation.isDirectionSet(), animation.direction());
+ encodeBoolAndValue(encoder, animation.isDurationSet(), animation.duration());
+ encodeBoolAndValue(encoder, animation.isFillModeSet(), animation.fillMode());
+ encodeBoolAndValue(encoder, animation.isIterationCountSet(), animation.iterationCount());
+ encodeBoolAndValue(encoder, animation.isNameSet(), animation.name());
+ encodeBoolAndEnumValue(encoder, animation.isPlayStateSet(), animation.playState());
+ encodeBoolAndValue(encoder, animation.isPropertySet(), animation.property());
+ encodeBoolAndValue<RefPtr<TimingFunction> >(encoder, animation.isTimingFunctionSet(), animation.timingFunction());
+ encoder->encodeBool(animation.isNoneAnimation());
}
@@ -1098,7 +1099,7 @@
return decoder->decodeEnum(value);
}
-bool ArgumentCoder<RefPtr<Animation> >::decode(ArgumentDecoder* decoder, RefPtr<Animation>& animation)
+bool ArgumentCoder<Animation>::decode(ArgumentDecoder* decoder, Animation& animation)
{
bool isDelaySet, isDirectionSet, isDurationSet, isFillModeSet, isIterationCountSet, isNameSet, isPlayStateSet, isPropertySet, isTimingFunctionSet;
int property, iterationCount, fillMode;
@@ -1106,6 +1107,8 @@
RefPtr<TimingFunction> timingFunction;
String name;
+ animation.clearAll();
+
double delay;
if (!decodeBoolAndValue(decoder, isDelaySet, delay))
return false;
@@ -1130,27 +1133,24 @@
if (!decodeBoolAndValue<RefPtr<TimingFunction> >(decoder, isTimingFunctionSet, timingFunction))
return false;
- animation = Animation::create();
- animation->clearAll();
-
if (isDelaySet)
- animation->setDelay(delay);
+ animation.setDelay(delay);
if (isDirectionSet)
- animation->setDirection(direction);
+ animation.setDirection(direction);
if (isDurationSet)
- animation->setDuration(duration);
+ animation.setDuration(duration);
if (isFillModeSet)
- animation->setFillMode(fillMode);
+ animation.setFillMode(fillMode);
if (isIterationCountSet)
- animation->setIterationCount(iterationCount);
+ animation.setIterationCount(iterationCount);
if (isNameSet)
- animation->setName(name);
+ animation.setName(name);
if (isPlayStateSet)
- animation->setPlayState(playState);
+ animation.setPlayState(playState);
if (isPropertySet)
- animation->setProperty(property);
+ animation.setProperty(property);
if (isTimingFunctionSet)
- animation->setTimingFunction(timingFunction);
+ animation.setTimingFunction(timingFunction);
return true;
}
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (100858 => 100859)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2011-11-19 20:15:12 UTC (rev 100859)
@@ -288,9 +288,9 @@
static bool decode(ArgumentDecoder*, WebCore::TransformOperations&);
};
-template<> struct ArgumentCoder<RefPtr<WebCore::Animation> > {
- static void encode(ArgumentEncoder*, const RefPtr<WebCore::Animation>&);
- static bool decode(ArgumentDecoder*, RefPtr<WebCore::Animation>&);
+template<> struct ArgumentCoder<WebCore::Animation> {
+ static void encode(ArgumentEncoder*, const WebCore::Animation&);
+ static bool decode(ArgumentDecoder*, WebCore::Animation&);
};
#endif
Modified: trunk/Source/WebKit2/Shared/WebLayerTreeInfo.cpp (100858 => 100859)
--- trunk/Source/WebKit2/Shared/WebLayerTreeInfo.cpp 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebKit2/Shared/WebLayerTreeInfo.cpp 2011-11-19 20:15:12 UTC (rev 100859)
@@ -35,7 +35,7 @@
{
// We have to divide it to several lines, because CoreIPC::In/Out takes a maximum of 10 arguments.
encoder->encode(CoreIPC::In(id, name, parent, children, flags, replica, mask, imageBackingStoreID));
- encoder->encode(CoreIPC::In(pos, size, transform, opacity, anchorPoint, childrenTransform, contentsRect, animations));
+ encoder->encode(CoreIPC::In(pos, size, transform, opacity, anchorPoint, childrenTransform, contentsRect));
}
bool WebLayerInfo::decode(CoreIPC::ArgumentDecoder* decoder, WebLayerInfo& info)
@@ -43,9 +43,8 @@
// We have to divide it to several lines, because CoreIPC::In/Out takes a maximum of 10 arguments.
if (!decoder->decode(CoreIPC::Out(info.id, info.name, info.parent, info.children, info.flags, info.replica, info.mask, info.imageBackingStoreID)))
return false;
- if (!decoder->decode(CoreIPC::Out(info.pos, info.size, info.transform, info.opacity, info.anchorPoint, info.childrenTransform, info.contentsRect, info.animations)))
+ if (!decoder->decode(CoreIPC::Out(info.pos, info.size, info.transform, info.opacity, info.anchorPoint, info.childrenTransform, info.contentsRect)))
return false;
-
return true;
}
@@ -69,24 +68,5 @@
return decoder->decode(CoreIPC::Out(info.layerID, info.rect, info.bitmapHandle));
}
-void WebLayerAnimation::encode(CoreIPC::ArgumentEncoder* encoder) const
-{
- encoder->encodeEnum(operation);
- encoder->encode(keyframeList);
- encoder->encode(CoreIPC::In(name, startTime, boxSize, animation, keyframeList));
}
-
-bool WebLayerAnimation::decode(CoreIPC::ArgumentDecoder* decoder, WebLayerAnimation& info)
-{
- if (!decoder->decodeEnum(info.operation))
- return false;
- if (!decoder->decode(info.keyframeList))
- return false;
- if (!decoder->decode(CoreIPC::Out(info.name, info.startTime, info.boxSize, info.animation)))
- return false;
-
- return true;
-}
-
-}
#endif
Modified: trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h (100858 => 100859)
--- trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h 2011-11-19 20:15:12 UTC (rev 100859)
@@ -49,25 +49,6 @@
static bool decode(CoreIPC::ArgumentDecoder*, WebLayerUpdateInfo&);
};
-struct WebLayerAnimation {
- WebLayerAnimation() : keyframeList(AnimatedPropertyInvalid) { }
- WebLayerAnimation(const KeyframeValueList& valueList)
- : keyframeList(valueList) { }
- String name;
- enum Operation {
- AddAnimation,
- RemoveAnimation,
- PauseAnimation
- } operation;
- IntSize boxSize;
- RefPtr<Animation> animation;
- KeyframeValueList keyframeList;
- double startTime;
-
- void encode(CoreIPC::ArgumentEncoder*) const;
- static bool decode(CoreIPC::ArgumentDecoder*, WebLayerAnimation&);
-};
-
struct WebLayerInfo {
String name;
WebLayerID id;
@@ -98,7 +79,6 @@
unsigned int flags;
};
Vector<WebLayerID> children;
- Vector<WebLayerAnimation> animations;
RefPtr<ShareableBitmap> imageBackingStore;
void encode(CoreIPC::ArgumentEncoder*) const;
Modified: trunk/Source/WebKit2/UIProcess/LayerTreeHostProxy.h (100858 => 100859)
--- trunk/Source/WebKit2/UIProcess/LayerTreeHostProxy.h 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebKit2/UIProcess/LayerTreeHostProxy.h 2011-11-19 20:15:12 UTC (rev 100859)
@@ -125,11 +125,6 @@
OwnPtr<GraphicsLayer> m_rootLayer;
Vector<WebLayerID> m_layersToDelete;
-#if PLATFORM(QT)
- void didFireViewportUpdateTimer(Timer<LayerTreeHostProxy>*);
- Timer<LayerTreeHostProxy> m_viewportUpdateTimer;
-#endif
-
LayerMap m_layers;
WebLayerID m_rootLayerID;
int m_id;
Modified: trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp (100858 => 100859)
--- trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp 2011-11-19 20:15:12 UTC (rev 100859)
@@ -154,7 +154,6 @@
LayerTreeHostProxy::LayerTreeHostProxy(DrawingAreaProxy* drawingAreaProxy)
: m_animationTimer(RunLoop::main(), this, &LayerTreeHostProxy::updateViewport)
, m_drawingAreaProxy(drawingAreaProxy)
- , m_viewportUpdateTimer(this, &LayerTreeHostProxy::didFireViewportUpdateTimer)
, m_rootLayerID(0)
{
}
@@ -209,17 +208,10 @@
m_textureMapper->endPainting();
- if (node->descendantsOrSelfHaveRunningAnimations()) {
- node->syncAnimationsRecursively();
- m_viewportUpdateTimer.startOneShot(0);
- }
+ if (node->descendantsOrSelfHaveRunningAnimations())
+ updateViewport();
}
-void LayerTreeHostProxy::didFireViewportUpdateTimer(Timer<LayerTreeHostProxy>*)
-{
- updateViewport();
-}
-
void LayerTreeHostProxy::updateViewport()
{
m_drawingAreaProxy->updateViewport();
@@ -280,26 +272,6 @@
}
layer->setChildren(children);
- for (size_t i = 0; i < layerInfo.animations.size(); ++i) {
- const WebKit::WebLayerAnimation anim = layerInfo.animations[i];
-
- switch (anim.operation) {
- case WebKit::WebLayerAnimation::AddAnimation: {
- const IntSize boxSize = anim.boxSize;
- double offset = WTF::currentTime() - anim.startTime;
- layer->addAnimation(anim.keyframeList, boxSize, anim.animation.get(), anim.name, offset);
- break;
- }
- case WebKit::WebLayerAnimation::RemoveAnimation:
- layer->removeAnimation(anim.name);
- break;
- case WebKit::WebLayerAnimation::PauseAnimation:
- double offset = WTF::currentTime() - anim.startTime;
- layer->pauseAnimation(anim.name, offset);
- break;
- }
- }
-
if (layerInfo.isRootLayer && m_rootLayerID != id)
setRootLayerID(id);
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (100858 => 100859)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2011-11-19 20:08:06 UTC (rev 100858)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2011-11-19 20:15:12 UTC (rev 100859)
@@ -280,40 +280,15 @@
// We put these stub implementations here for when we implement accelerated cross-process animations.
bool WebGraphicsLayer::addAnimation(const KeyframeValueList& valueList, const IntSize& boxSize, const Animation* anim, const String& keyframesName, double timeOffset)
{
- if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2 || (valueList.property() != AnimatedPropertyWebkitTransform && valueList.property() != AnimatedPropertyOpacity))
- return false;
-
- WebLayerAnimation webAnimation(valueList);
- webAnimation.name = keyframesName;
- webAnimation.operation = WebLayerAnimation::AddAnimation;
- webAnimation.boxSize = boxSize;
- webAnimation.animation = Animation::create(anim);
- webAnimation.startTime = WTF::currentTime() - timeOffset;
- m_layerInfo.animations.append(webAnimation);
-
- m_hasPendingAnimations = true;
- notifyChange();
-
- return true;
+ return false;
}
void WebGraphicsLayer::pauseAnimation(const String& animationName, double timeOffset)
{
- WebLayerAnimation animation;
- animation.name = animationName;
- animation.operation = WebLayerAnimation::PauseAnimation;
- animation.startTime = WTF::currentTime() - timeOffset;
- m_layerInfo.animations.append(animation);
- notifyChange();
}
void WebGraphicsLayer::removeAnimation(const String& animationName)
{
- WebLayerAnimation animation;
- animation.name = animationName;
- animation.operation = WebLayerAnimation::RemoveAnimation;
- m_layerInfo.animations.append(animation);
- notifyChange();
}
void WebGraphicsLayer::setContentsNeedsDisplay()
@@ -427,7 +402,6 @@
m_layerInfo.imageIsUpdated = false;
if (m_hasPendingAnimations)
notifyAnimationStarted(WTF::currentTime());
- m_layerInfo.animations.clear();
m_hasPendingAnimations = false;
}
