summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-16 02:13:24 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-16 02:13:24 +0000
commit5b0d9165de0e8c5652d731bb83e72a3d39d4d066 (patch)
treead34ccba3e9999e27f126ee4bc7064dd0e354b40 /webkit/glue
parent381e299978874f38b6c9af4afdac1f9d05bb4a29 (diff)
downloadchromium_src-5b0d9165de0e8c5652d731bb83e72a3d39d4d066.zip
chromium_src-5b0d9165de0e8c5652d731bb83e72a3d39d4d066.tar.gz
chromium_src-5b0d9165de0e8c5652d731bb83e72a3d39d4d066.tar.bz2
WebKit Merge 39143:39309, Part 8 (port side)
Review URL: http://codereview.chromium.org/14140 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/chrome_client_impl.h3
-rw-r--r--webkit/glue/webplugin_impl.cc2
-rw-r--r--webkit/glue/webplugin_impl.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index b985103..7d69ee1 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -123,6 +123,9 @@ public:
virtual void enableSuddenTermination();
virtual void disableSuddenTermination();
+ // TODO(brettw): Implement me!
+ virtual void formStateDidChange(const WebCore::Node*) { }
+
private:
WebViewImpl* webview_; // weak pointer
bool toolbars_visible_;
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 5996315..221f0e2 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -196,7 +196,7 @@ void WebPluginContainer::handleEvent(WebCore::Event* event) {
impl_->handleEvent(event);
}
-void WebPluginContainer::frameRectsChanged() const {
+void WebPluginContainer::frameRectsChanged() {
WebCore::Widget::frameRectsChanged();
// This is a hack to tickle re-positioning of the plugin in the case where
// our parent view was scrolled.
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h
index 4ff1757..01cf7db 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/webplugin_impl.h
@@ -64,7 +64,7 @@ class WebPluginContainer : public WebCore::Widget {
virtual void show();
virtual void hide();
virtual void handleEvent(WebCore::Event* event);
- virtual void frameRectsChanged() const;
+ virtual void frameRectsChanged();
virtual void setParentVisible(bool visible);
#if USE(JSC)