| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "WebCompositorInputHandlerImpl.h" | 28 #include "WebCompositorInputHandlerImpl.h" |
| 29 | 29 |
| 30 #include "TraceEvent.h" | |
| 31 #include "WebCompositorInputHandlerClient.h" | 30 #include "WebCompositorInputHandlerClient.h" |
| 32 #include "WebInputEvent.h" | 31 #include "WebInputEvent.h" |
| 32 #include "core/platform/chromium/TraceEvent.h" |
| 33 #include <public/Platform.h> | 33 #include <public/Platform.h> |
| 34 #include <public/WebInputHandlerClient.h> | 34 #include <public/WebInputHandlerClient.h> |
| 35 #include <wtf/PassOwnPtr.h> | 35 #include <wtf/PassOwnPtr.h> |
| 36 #include <wtf/ThreadingPrimitives.h> | 36 #include <wtf/ThreadingPrimitives.h> |
| 37 | 37 |
| 38 using namespace WebCore; | 38 using namespace WebCore; |
| 39 | 39 |
| 40 namespace WebKit { | 40 namespace WebKit { |
| 41 | 41 |
| 42 // These statics may only be accessed from the compositor thread. | 42 // These statics may only be accessed from the compositor thread. |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 m_flingParameters.cumulativeScroll.height += increment.height; | 369 m_flingParameters.cumulativeScroll.height += increment.height; |
| 370 } | 370 } |
| 371 } | 371 } |
| 372 | 372 |
| 373 void WebCompositorInputHandlerImpl::mainThreadHasStoppedFlinging() | 373 void WebCompositorInputHandlerImpl::mainThreadHasStoppedFlinging() |
| 374 { | 374 { |
| 375 m_flingActiveOnMainThread = false; | 375 m_flingActiveOnMainThread = false; |
| 376 } | 376 } |
| 377 | 377 |
| 378 } | 378 } |
| OLD | NEW |