summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/glue/webplugin_impl.cc7
-rw-r--r--webkit/glue/webplugin_impl.h4
3 files changed, 12 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index f9a7f03..a92f067 100644
--- a/DEPS
+++ b/DEPS
@@ -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.