Add ENABLE(ASYNC_SCROLLING) guards around WK2 scrolling files

https://bugs.webkit.org/show_bug.cgi?id=126672

Reviewed by Tim Horton.

Protected WK2 scrolling files with ENABLE(ASYNC_SCROLLING) guards.

* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
* UIProcess/Scrolling/RemoteScrollingTree.cpp:
* UIProcess/Scrolling/RemoteScrollingTree.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.messages.in:
* WebProcess/Scrolling/RemoteScrollingCoordinator.mm:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161529 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cb6d8f02
2014-01-08 Simon Fraser <simon.fraser@apple.com>
Add ENABLE(ASYNC_SCROLLING) guards around WK2 scrolling files
https://bugs.webkit.org/show_bug.cgi?id=126672
Reviewed by Tim Horton.
Protected WK2 scrolling files with ENABLE(ASYNC_SCROLLING) guards.
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.h:
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
* UIProcess/Scrolling/RemoteScrollingTree.cpp:
* UIProcess/Scrolling/RemoteScrollingTree.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.messages.in:
* WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
2014-01-08 Ryuan Choi <ryuan.choi@samsung.com>
[EFL][WK2] Add API to execute js script
......
......@@ -26,6 +26,8 @@
#include "config.h"
#include "RemoteScrollingCoordinatorTransaction.h"
#if ENABLE(ASYNC_SCROLLING)
#include "ArgumentCoders.h"
#include "MessageDecoder.h"
#include "MessageEncoder.h"
......@@ -301,3 +303,5 @@ bool RemoteScrollingCoordinatorTransaction::decode(IPC::ArgumentDecoder& decoder
}
} // namespace WebKit
#endif // ENABLE(ASYNC_SCROLLING)
......@@ -26,6 +26,8 @@
#ifndef RemoteScrollingCoordinatorTransaction_h
#define RemoteScrollingCoordinatorTransaction_h
#if ENABLE(ASYNC_SCROLLING)
#include <WebCore/ScrollingStateTree.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
......@@ -53,4 +55,6 @@ private:
} // namespace WebKit
#endif // ENABLE(ASYNC_SCROLLING)
#endif // RemoteScrollingCoordinatorTransaction_h
......@@ -26,6 +26,8 @@
#include "config.h"
#include "RemoteScrollingCoordinatorProxy.h"
#if ENABLE(ASYNC_SCROLLING)
#include "ArgumentCoders.h"
#include "MessageDecoder.h"
#include "MessageEncoder.h"
......@@ -124,3 +126,5 @@ void RemoteScrollingCoordinatorProxy::scrollPositionChanged(WebCore::ScrollingNo
}
} // namespace WebKit
#endif // ENABLE(ASYNC_SCROLLING)
......@@ -26,6 +26,8 @@
#ifndef RemoteScrollingCoordinatorProxy_h
#define RemoteScrollingCoordinatorProxy_h
#if ENABLE(ASYNC_SCROLLING)
#include "MessageReceiver.h"
#include "RemoteScrollingCoordinator.h"
#include <wtf/Noncopyable.h>
......@@ -70,4 +72,6 @@ private:
} // namespace WebKit
#endif // ENABLE(ASYNC_SCROLLING)
#endif // RemoteScrollingCoordinatorProxy_h
......@@ -26,6 +26,8 @@
#include "config.h"
#include "RemoteScrollingTree.h"
#if ENABLE(ASYNC_SCROLLING)
#include "RemoteLayerTreeHost.h"
#include "RemoteScrollingCoordinatorProxy.h"
#include <WebCore/ScrollingTreeFixedNode.h>
......@@ -89,3 +91,5 @@ PassOwnPtr<ScrollingTreeNode> RemoteScrollingTree::createNode(ScrollingNodeType
}
} // namespace WebKit
#endif // ENABLE(ASYNC_SCROLLING)
......@@ -26,6 +26,8 @@
#ifndef RemoteScrollingTree_h
#define RemoteScrollingTree_h
#if ENABLE(ASYNC_SCROLLING)
#include "RemoteScrollingCoordinator.h"
#include <WebCore/ScrollElasticityController.h>
#include <WebCore/ScrollingConstraints.h>
......@@ -62,4 +64,6 @@ SCROLLING_TREE_TYPE_CASTS(RemoteScrollingTree, isRemoteScrollingTree());
} // namespace WebKit
#endif // ENABLE(ASYNC_SCROLLING)
#endif // RemoteScrollingTree_h
......@@ -26,6 +26,8 @@
#ifndef RemoteScrollingCoordinator_h
#define RemoteScrollingCoordinator_h
#if ENABLE(ASYNC_SCROLLING)
#include "MessageReceiver.h"
#include <WebCore/AsyncScrollingCoordinator.h>
#include <WebCore/ScrollTypes.h>
......@@ -78,4 +80,6 @@ SCROLLING_COORDINATOR_TYPE_CASTS(RemoteScrollingCoordinator, isRemoteScrollingCo
} // namespace WebKit
#endif // ENABLE(ASYNC_SCROLLING)
#endif // RemoteScrollingCoordinator_h
......@@ -20,6 +20,10 @@
# 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.
#if ENABLE(ASYNC_SCROLLING)
messages -> RemoteScrollingCoordinator {
ScrollPositionChangedForNode(uint64_t nodeID, WebCore::FloatPoint scrollPosition);
}
#endif // ENABLE(ASYNC_SCROLLING)
......@@ -26,6 +26,8 @@
#import "config.h"
#import "RemoteScrollingCoordinator.h"
#if ENABLE(ASYNC_SCROLLING)
#import "ArgumentCoders.h"
#import "GraphicsLayerCARemote.h"
#import "MessageDecoder.h"
......@@ -95,3 +97,5 @@ void RemoteScrollingCoordinator::scrollPositionChangedForNode(ScrollingNodeID no
}
} // namespace WebKit
#endif // ENABLE(ASYNC_SCROLLING)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment