diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-09 18:08:03 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-09 18:08:03 +0000 |
| commit | 769ebb89e05b0c1e80a478f0c2124193d7317bc5 (patch) | |
| tree | f2c4959cfc81f13aaab66c72cdd23b6dad38fc69 | |
| parent | e8b06c4c0e91661599ffbd982fc866c0363911d3 (diff) | |
| download | chromium_src-769ebb89e05b0c1e80a478f0c2124193d7317bc5.zip chromium_src-769ebb89e05b0c1e80a478f0c2124193d7317bc5.tar.gz chromium_src-769ebb89e05b0c1e80a478f0c2124193d7317bc5.tar.bz2 | |
WebKit merge 39711:39744. This CL includes changes to webkit/glue code.
R=levin
Review URL: http://codereview.chromium.org/17319
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7809 0039d316-1c4b-4281-b951-d872f2087c98
| -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); |