| Index: content/renderer/render_thread_impl.cc
|
| ===================================================================
|
| --- content/renderer/render_thread_impl.cc (revision 252686)
|
| +++ content/renderer/render_thread_impl.cc (working copy)
|
| @@ -115,6 +115,20 @@
|
| #include "v8/include/v8.h"
|
| #include "webkit/renderer/compositor_bindings/web_external_bitmap_impl.h"
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include <cpu-features.h>
|
| +#include "content/renderer/android/synchronous_compositor_factory.h"
|
| +#include "content/renderer/media/android/renderer_demuxer_android.h"
|
| +#endif
|
| +
|
| +#if defined(OS_MACOSX)
|
| +#include "content/renderer/webscrollbarbehavior_impl_mac.h"
|
| +#endif
|
| +
|
| +#if defined(OS_POSIX)
|
| +#include "ipc/ipc_channel_posix.h"
|
| +#endif
|
| +
|
| #if defined(OS_WIN)
|
| #include <windows.h>
|
| #include <objbase.h>
|
| @@ -124,16 +138,6 @@
|
| #include "content/child/npapi/np_channel_base.h"
|
| #endif
|
|
|
| -#if defined(OS_POSIX)
|
| -#include "ipc/ipc_channel_posix.h"
|
| -#endif
|
| -
|
| -#if defined(OS_ANDROID)
|
| -#include <cpu-features.h>
|
| -#include "content/renderer/android/synchronous_compositor_factory.h"
|
| -#include "content/renderer/media/android/renderer_demuxer_android.h"
|
| -#endif
|
| -
|
| #if defined(ENABLE_PLUGINS)
|
| #include "content/renderer/npapi/plugin_channel_host.h"
|
| #endif
|
| @@ -1318,9 +1322,11 @@
|
| bool jump_on_track_click,
|
| blink::ScrollerStyle preferred_scroller_style,
|
| bool redraw) {
|
| + static_cast<WebScrollbarBehaviorImpl*>(
|
| + webkit_platform_support_->scrollbarBehavior())->set_jump_on_track_click(
|
| + jump_on_track_click);
|
| blink::WebScrollbarTheme::updateScrollbars(initial_button_delay,
|
| autoscroll_button_delay,
|
| - jump_on_track_click,
|
| preferred_scroller_style,
|
| redraw);
|
| }
|
|
|