diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit/chromium/src/WebScrollableLayer.cpp | |
parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit/chromium/src/WebScrollableLayer.cpp')
-rw-r--r-- | Source/WebKit/chromium/src/WebScrollableLayer.cpp | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/Source/WebKit/chromium/src/WebScrollableLayer.cpp b/Source/WebKit/chromium/src/WebScrollableLayer.cpp deleted file mode 100644 index a20e81d81..000000000 --- a/Source/WebKit/chromium/src/WebScrollableLayer.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include <public/WebScrollableLayer.h> - -#include "LayerChromium.h" -#include "Region.h" - -namespace WebKit { - -void WebScrollableLayer::setScrollPosition(WebPoint position) -{ - m_private->setScrollPosition(position); -} - -void WebScrollableLayer::setScrollable(bool scrollable) -{ - m_private->setScrollable(scrollable); -} - -void WebScrollableLayer::setHaveWheelEventHandlers(bool haveWheelEventHandlers) -{ - m_private->setHaveWheelEventHandlers(haveWheelEventHandlers); -} - -void WebScrollableLayer::setShouldScrollOnMainThread(bool shouldScrollOnMainThread) -{ - m_private->setShouldScrollOnMainThread(shouldScrollOnMainThread); -} - -void WebScrollableLayer::setNonFastScrollableRegion(const WebVector<WebRect>& rects) -{ - WebCore::Region region; - for (size_t i = 0; i < rects.size(); ++i) { - WebCore::IntRect rect = rects[i]; - region.unite(rect); - } - m_private->setNonFastScrollableRegion(region); - -} - -void WebScrollableLayer::setIsContainerForFixedPositionLayers(bool enable) -{ - m_private->setIsContainerForFixedPositionLayers(enable); -} - -void WebScrollableLayer::setFixedToContainerLayer(bool enable) -{ - m_private->setFixedToContainerLayer(enable); -} - -} // namespace WebKit |