| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/port.h" | 6 #include "base/port.h" |
| 7 #include "cc/layers/compositing_reasons.h" | 7 #include "cc/layers/compositing_reasons.h" |
| 8 #include "third_party/WebKit/public/platform/WebCompositingReasons.h" | 8 #include "third_party/WebKit/public/platform/WebCompositingReasons.h" |
| 9 | 9 |
| 10 #define COMPILE_ASSERT_MATCHING_UINT64(cc_name, webkit_name) \ | 10 #define COMPILE_ASSERT_MATCHING_UINT64(cc_name, webkit_name) \ |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 | 52 |
| 53 COMPILE_ASSERT_MATCHING_UINT64( | 53 COMPILE_ASSERT_MATCHING_UINT64( |
| 54 cc::kCompositingReasonPositionSticky, | 54 cc::kCompositingReasonPositionSticky, |
| 55 WebKit::CompositingReasonPositionSticky); | 55 WebKit::CompositingReasonPositionSticky); |
| 56 | 56 |
| 57 COMPILE_ASSERT_MATCHING_UINT64( | 57 COMPILE_ASSERT_MATCHING_UINT64( |
| 58 cc::kCompositingReasonOverflowScrollingTouch, | 58 cc::kCompositingReasonOverflowScrollingTouch, |
| 59 WebKit::CompositingReasonOverflowScrollingTouch); | 59 WebKit::CompositingReasonOverflowScrollingTouch); |
| 60 | 60 |
| 61 COMPILE_ASSERT_MATCHING_UINT64( | 61 COMPILE_ASSERT_MATCHING_UINT64( |
| 62 cc::kCompositingReasonBlending, | |
| 63 WebKit::CompositingReasonBlending); | |
| 64 | |
| 65 COMPILE_ASSERT_MATCHING_UINT64( | |
| 66 cc::kCompositingReasonAssumedOverlap, | 62 cc::kCompositingReasonAssumedOverlap, |
| 67 WebKit::CompositingReasonAssumedOverlap); | 63 WebKit::CompositingReasonAssumedOverlap); |
| 68 | 64 |
| 69 COMPILE_ASSERT_MATCHING_UINT64( | 65 COMPILE_ASSERT_MATCHING_UINT64( |
| 70 cc::kCompositingReasonOverlap, | 66 cc::kCompositingReasonOverlap, |
| 71 WebKit::CompositingReasonOverlap); | 67 WebKit::CompositingReasonOverlap); |
| 72 | 68 |
| 73 COMPILE_ASSERT_MATCHING_UINT64( | 69 COMPILE_ASSERT_MATCHING_UINT64( |
| 74 cc::kCompositingReasonNegativeZIndexChildren, | 70 cc::kCompositingReasonNegativeZIndexChildren, |
| 75 WebKit::CompositingReasonNegativeZIndexChildren); | 71 WebKit::CompositingReasonNegativeZIndexChildren); |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 cc::kCompositingReasonLayerForMask, | 138 cc::kCompositingReasonLayerForMask, |
| 143 WebKit::CompositingReasonLayerForMask); | 139 WebKit::CompositingReasonLayerForMask); |
| 144 | 140 |
| 145 COMPILE_ASSERT_MATCHING_UINT64( | 141 COMPILE_ASSERT_MATCHING_UINT64( |
| 146 cc::kCompositingReasonOverflowScrollingParent, | 142 cc::kCompositingReasonOverflowScrollingParent, |
| 147 WebKit::CompositingReasonOverflowScrollingParent); | 143 WebKit::CompositingReasonOverflowScrollingParent); |
| 148 | 144 |
| 149 COMPILE_ASSERT_MATCHING_UINT64( | 145 COMPILE_ASSERT_MATCHING_UINT64( |
| 150 cc::kCompositingReasonOutOfFlowClipping, | 146 cc::kCompositingReasonOutOfFlowClipping, |
| 151 WebKit::CompositingReasonOutOfFlowClipping); | 147 WebKit::CompositingReasonOutOfFlowClipping); |
| OLD | NEW |