| Index: cc/CCPriorityCalculator.h
|
| diff --git a/cc/CCPriorityCalculator.h b/cc/CCPriorityCalculator.h
|
| index 45f2e64a649bd0944eb496d4b3395976364daf41..973da9fef930aee11372118cca876acee8e2f29e 100644
|
| --- a/cc/CCPriorityCalculator.h
|
| +++ b/cc/CCPriorityCalculator.h
|
| @@ -1,32 +1,6 @@
|
| -// Copyright 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CCPriorityCalculator_h
|
| -#define CCPriorityCalculator_h
|
| -
|
| -#include "GraphicsContext3D.h"
|
| -#include "IntRect.h"
|
| -#include "IntSize.h"
|
| -
|
| -namespace cc {
|
| -
|
| -class CCPriorityCalculator {
|
| -public:
|
| - static int uiPriority(bool drawsToRootSurface);
|
| - static int visiblePriority(bool drawsToRootSurface);
|
| - static int renderSurfacePriority();
|
| - static int lingeringPriority(int previousPriority);
|
| - static int priorityFromDistance(const IntRect& visibleRect, const IntRect& textureRect, bool drawsToRootSurface);
|
| - static int smallAnimatedLayerMinPriority();
|
| -
|
| - static inline int highestPriority() { return std::numeric_limits<int>::min(); }
|
| - static inline int lowestPriority() { return std::numeric_limits<int>::max(); }
|
| - static inline bool priorityIsLower(int a, int b) { return a > b; }
|
| - static inline bool priorityIsHigher(int a, int b) { return a < b; }
|
| - static inline bool maxPriority(int a, int b) { return priorityIsHigher(a, b) ? a : b; }
|
| -};
|
| -
|
| -}
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/priority_calculator.h"
|
|
|