diff options
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/glue/webwidget_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webwidget_impl.h | 3 |
4 files changed, 13 insertions, 6 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7806", + "/trunk/deps/third_party/WebKit@7808", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@1040", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39711", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39744", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@39711", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@39744", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39711", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39744", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 5f93d27..8f3d12b 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@39711
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@39744
\ No newline at end of file diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc index 4fe1d1b..bf5aaf4 100644 --- a/webkit/glue/webwidget_impl.cc +++ b/webkit/glue/webwidget_impl.cc @@ -242,6 +242,12 @@ PlatformWidget WebWidgetImpl::platformWindow() const { return delegate_->GetContainingView(const_cast<WebWidgetImpl*>(this)); } +void WebWidgetImpl::scrollRectIntoView( + const WebCore::IntRect&, const WebCore::ScrollView*) const { + // Nothing to be done here since we do not have the concept of a container + // that implements its own scrolling. +} + //----------------------------------------------------------------------------- // WebCore::FramelessScrollViewClient diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h index 743473d..d3d9b06 100644 --- a/webkit/glue/webwidget_impl.h +++ b/webkit/glue/webwidget_impl.h @@ -84,7 +84,8 @@ class WebWidgetImpl : public WebWidget, virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const; virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const; virtual PlatformWidget platformWindow() const; - virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const {} + virtual void scrollRectIntoView(const WebCore::IntRect&, + const WebCore::ScrollView*) const; // WebCore::FramelessScrollViewClient methods: virtual void popupClosed(WebCore::FramelessScrollView* popup_view); |