| Index: cc/stubs/FloatSize.h
|
| diff --git a/cc/stubs/FloatSize.h b/cc/stubs/FloatSize.h
|
| index 9db59788f7d52bfd1b29af44f0661b018f183a56..f5d5c4ea5ab664e48cc02abfec143084633e3494 100644
|
| --- a/cc/stubs/FloatSize.h
|
| +++ b/cc/stubs/FloatSize.h
|
| @@ -1,43 +1,6 @@
|
| -// Copyright (c) 2012 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 CC_STUBS_FLOATSIZE_H_
|
| -#define CC_STUBS_FLOATSIZE_H_
|
| -
|
| -#include "IntSize.h"
|
| -#if INSIDE_WEBKIT_BUILD
|
| -#include "Source/WebCore/platform/graphics/FloatSize.h"
|
| -#else
|
| -#include "third_party/WebKit/Source/WebCore/platform/graphics/FloatSize.h"
|
| -#endif
|
| -
|
| -namespace cc {
|
| -class FloatSize : public WebCore::FloatSize {
|
| -public:
|
| - FloatSize() { }
|
| -
|
| - FloatSize(float width, float height)
|
| - : WebCore::FloatSize(width, height)
|
| - {
|
| - }
|
| -
|
| - FloatSize(IntSize size)
|
| - : WebCore::FloatSize(size.width(), size.height())
|
| - {
|
| - }
|
| -
|
| - FloatSize(WebCore::FloatSize size)
|
| - : WebCore::FloatSize(size.width(), size.height())
|
| - {
|
| - }
|
| -
|
| - FloatSize(WebCore::IntSize size)
|
| - : WebCore::FloatSize(size.width(), size.height())
|
| - {
|
| - }
|
| -};
|
| -
|
| -}
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/stubs/float_size.h"
|
|
|