From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 21 May 2010 16:53:46 +0100
Subject: Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
---
 WebKit/chromium/src/WebPluginContainerImpl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'WebKit/chromium/src/WebPluginContainerImpl.cpp')

diff --git a/WebKit/chromium/src/WebPluginContainerImpl.cpp b/WebKit/chromium/src/WebPluginContainerImpl.cpp
index b207a25..5807a79 100644
--- a/WebKit/chromium/src/WebPluginContainerImpl.cpp
+++ b/WebKit/chromium/src/WebPluginContainerImpl.cpp
@@ -35,6 +35,7 @@
 #include "ChromeClientImpl.h"
 #include "WebCursorInfo.h"
 #include "WebDataSourceImpl.h"
+#include "WebElement.h"
 #include "WebInputEvent.h"
 #include "WebInputEventConversion.h"
 #include "WebKit.h"
@@ -239,6 +240,11 @@ void WebPluginContainerImpl::printEnd()
     return m_webPlugin->printEnd();
 }
 
+WebElement WebPluginContainerImpl::element()
+{
+    return WebElement(m_element);
+}
+
 void WebPluginContainerImpl::invalidate()
 {
     Widget::invalidate();
-- 
cgit v1.1