| Index: cc/layer_sorter.cc
|
| diff --git a/cc/layer_sorter.cc b/cc/layer_sorter.cc
|
| index ef347dbe55b41f6ead7b16d804cda08d461477ed..f1c0fe4066e9eb94a8fc7066697c7c50303cdf4a 100644
|
| --- a/cc/layer_sorter.cc
|
| +++ b/cc/layer_sorter.cc
|
| @@ -20,6 +20,13 @@ using WebKit::WebTransformationMatrix;
|
|
|
| namespace cc {
|
|
|
| +// This epsilon is used to determine if two layers are too close to each other
|
| +// to be able to tell which is in front of the other. It's a relative epsilon
|
| +// so it is robust to changes in scene scale. This value was chosen by picking
|
| +// a value near machine epsilon and then increasing it until the flickering on
|
| +// the test scene went away.
|
| +const float LAYER_EPSILON = 1e-4f;
|
| +
|
| inline static float perpProduct(const FloatSize& u, const FloatSize& v)
|
| {
|
| return u.width() * v.height() - u.height() * v.width();
|
| @@ -114,10 +121,28 @@ LayerSorter::ABCompareResult LayerSorter::checkOverlap(LayerShape* a, LayerShape
|
| // which layer is in front.
|
| float maxPositive = 0;
|
| float maxNegative = 0;
|
| +
|
| + // This flag tracks the existance of a numerically accurate seperation
|
| + // between two layers. If there is no accurate seperation, the layers
|
| + // cannot be effectively sorted.
|
| + bool accurate = false;
|
| +
|
| for (unsigned o = 0; o < overlapPoints.size(); o++) {
|
| float za = a->layerZFromProjectedPoint(overlapPoints[o]);
|
| float zb = b->layerZFromProjectedPoint(overlapPoints[o]);
|
|
|
| + // Here we attempt to avoid numeric issues with layers that are too
|
| + // close together. If we have 2-sided quads that are very close
|
| + // together then we will draw them in document order to avoid
|
| + // flickering. The correct solution is for the content maker to turn
|
| + // on back-face culling or move the quads apart (if they're not two
|
| + // sides of one object).
|
| + float absDif = fabsf(zb - za);
|
| + float absMax = fmax(fabs(zb), fabs(za));
|
| + // Check to see if we've got a result with a reasonable amount of error.
|
| + if (absDif > LAYER_EPSILON * absMax)
|
| + accurate = true;
|
| +
|
| float diff = za - zb;
|
| if (diff > maxPositive)
|
| maxPositive = diff;
|
| @@ -125,6 +150,10 @@ LayerSorter::ABCompareResult LayerSorter::checkOverlap(LayerShape* a, LayerShape
|
| maxNegative = diff;
|
| }
|
|
|
| + // If we can't tell which should come first, we use document order.
|
| + if (!accurate)
|
| + return ABeforeB;
|
| +
|
| float maxDiff = (fabsf(maxPositive) > fabsf(maxNegative) ? maxPositive : maxNegative);
|
|
|
| // If the results are inconsistent (and the z difference substantial to rule out
|
|
|