summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-09 16:25:46 +0100
committerSteve Block <steveblock@google.com>2011-05-12 14:28:33 +0100
commit31dbc523d9ee6fd7d7e46c540b5f675eeb559ed7 (patch)
tree3e73099a4bf4c6849c6f448aa3aba9fe408998f8 /WebCore/platform/graphics/android/ScrollableLayerAndroid.h
parentcad810f21b803229eb11403f9209855525a25d57 (diff)
downloadexternal_webkit-31dbc523d9ee6fd7d7e46c540b5f675eeb559ed7.zip
external_webkit-31dbc523d9ee6fd7d7e46c540b5f675eeb559ed7.tar.gz
external_webkit-31dbc523d9ee6fd7d7e46c540b5f675eeb559ed7.tar.bz2
Merge WebKit at r75315: Move Android-specific WebCore files to Source
This moves files in the following WebCore subdirectories ... - bindings/js - bindings/v8/custom - plugins/android - platform/android - platform/graphics/android - page/ - css/ - dom/ - loader/archive/android
Diffstat (limited to 'WebCore/platform/graphics/android/ScrollableLayerAndroid.h')
-rw-r--r--WebCore/platform/graphics/android/ScrollableLayerAndroid.h68
1 files changed, 0 insertions, 68 deletions
diff --git a/WebCore/platform/graphics/android/ScrollableLayerAndroid.h b/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
deleted file mode 100644
index b23f056..0000000
--- a/WebCore/platform/graphics/android/ScrollableLayerAndroid.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ScrollableLayerAndroid_h
-#define ScrollableLayerAndroid_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerAndroid.h"
-
-namespace WebCore {
-
-class ScrollableLayerAndroid : public LayerAndroid {
-
-public:
- ScrollableLayerAndroid(RenderLayer* owner)
- : LayerAndroid(owner) {}
- ScrollableLayerAndroid(const ScrollableLayerAndroid& layer)
- : LayerAndroid(layer)
- , m_scrollLimits(layer.m_scrollLimits) {}
- ScrollableLayerAndroid(const LayerAndroid& layer)
- : LayerAndroid(layer)
- {
- m_scrollLimits.setEmpty();
- }
- virtual ~ScrollableLayerAndroid() {};
-
- virtual bool contentIsScrollable() const { return true; }
-
- virtual LayerAndroid* copy() const { return new ScrollableLayerAndroid(*this); }
-
- // Returns true if the content position has changed.
- bool scrollTo(int dx, int dy);
-
- // Fills the rect with the current scroll offset and the maximum scroll.
- // fLeft = scrollX
- // fTop = scrollY
- // fRight = maxX
- // fBottom = maxY
- void getScrollRect(SkIRect* out) const;
-
- void setScrollLimits(float x, float y, float width, float height)
- {
- m_scrollLimits.set(x, y, x + width, y + height);
- }
-
-private:
- SkRect m_scrollLimits;
-};
-
-}
-
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif // LayerAndroid_h