wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset d8fb025ca7d2 (bug 948531) for suspicion of causing OSX 10.6 debug mochitest-5 orange.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2013-12-11 18:47:03 -05:00
parent f076280148
commit 5aada6624a
3 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
layout/base/ActiveLayerTracker.cpp
View File

@ -10,8 +10,6 @@
#include "nsRefreshDriver.h"
#include "nsPIDOMWindow.h"
#include "nsIDocument.h"
#include "nsAnimationManager.h"
#include "nsTransitionManager.h"
namespace mozilla {
@ -217,18 +215,6 @@ ActiveLayerTracker::IsStyleAnimated(nsIFrame* aFrame, nsCSSProperty aProperty)
if (aProperty == eCSSProperty_transform && aFrame->Preserves3D()) {
return IsStyleAnimated(aFrame->GetParent(), aProperty);
}
nsIContent* content = aFrame->GetContent();
if (content) {
if (mozilla::HasAnimationOrTransition<ElementAnimations>(
content, nsGkAtoms::animationsProperty, aProperty)) {
return true;
}
if (mozilla::HasAnimationOrTransition<ElementTransitions>(
content, nsGkAtoms::transitionsProperty, aProperty)) {
return true;
}
}
return false;
}

15
layout/base/nsLayoutUtils.cpp
View File

@ -230,8 +230,8 @@ nsLayoutUtils::HasAnimationsForCompositor(nsIContent* aContent,
}
template <class AnimationsOrTransitions>
AnimationsOrTransitions*
mozilla::HasAnimationOrTransition(nsIContent* aContent,
static AnimationsOrTransitions*
HasAnimationOrTransition(nsIContent* aContent,
nsIAtom* aAnimationProperty,
nsCSSProperty aProperty)
{
@ -247,17 +247,6 @@ mozilla::HasAnimationOrTransition(nsIContent* aContent,
return nullptr;
}
template ElementAnimations*
mozilla::HasAnimationOrTransition<ElementAnimations>(nsIContent* aContent,
nsIAtom* aAnimationProperty,
nsCSSProperty aProperty);
template ElementTransitions*
mozilla::HasAnimationOrTransition<ElementTransitions>(nsIContent* aContent,
nsIAtom* aAnimationProperty,
nsCSSProperty aProperty);
bool
nsLayoutUtils::HasAnimations(nsIContent* aContent,
nsCSSProperty aProperty)

6
layout/base/nsLayoutUtils.h
View File

@ -70,12 +70,6 @@ class HTMLVideoElement;
namespace layers {
class Layer;
}
template <class AnimationsOrTransitions>
extern AnimationsOrTransitions* HasAnimationOrTransition(nsIContent* aContent,
nsIAtom* aAnimationProperty,
nsCSSProperty aProperty);
} // namespace mozilla
/**