diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 22:46:22 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 22:46:22 +0000 |
| commit | 9bd6f38ddfe66712e8e04de142ae64fa70ea5ada (patch) | |
| tree | 3b403ff1b8f9a8b5590decdd2b781d4cff0dc499 | |
| parent | e2d8f6b652e5b99a1a1adcd98a5c9745cb843586 (diff) | |
| download | chromium_src-9bd6f38ddfe66712e8e04de142ae64fa70ea5ada.zip chromium_src-9bd6f38ddfe66712e8e04de142ae64fa70ea5ada.tar.gz chromium_src-9bd6f38ddfe66712e8e04de142ae64fa70ea5ada.tar.bz2 | |
Plugin changes to make JSC build work.
Review URL: http://codereview.chromium.org/7883
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3783 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 7 | ||||
| -rw-r--r-- | webkit/glue/webplugin_impl.h | 4 |
3 files changed, 12 insertions, 1 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@3740", + "/trunk/deps/third_party/WebKit@3778", "src/third_party/cygwin": "/trunk/deps/third_party/cygwin@3248", diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index bdd6441..3b8f9eb 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -121,6 +121,13 @@ WebCore::IntRect WebPluginContainer::windowClipRect() const { return impl_->windowClipRect(); } +#if USE(JSC) +bool WebPluginContainer::isPluginView() const { + return true; +} +#endif + + void WebPluginContainer::geometryChanged() const { impl_->geometryChanged(); } diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h index 827fa8c..70d4b89 100644 --- a/webkit/glue/webplugin_impl.h +++ b/webkit/glue/webplugin_impl.h @@ -66,6 +66,10 @@ class WebPluginContainer : public WebCore::Widget { virtual void attachToWindow(); virtual void detachFromWindow(); +#if USE(JSC) + virtual bool isPluginView() const; +#endif + // Returns window-relative rectangles that should clip this widget. // Only rects that intersect the given bounds are relevant. // Use this to implement iframe shim behavior. |