From 88a30a51ea8b4aa85ab99022c9244e25c16623ad Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Wed, 12 May 2010 12:30:06 +0100
Subject: Merge Webkit at r58956: Add bool parameter to Widget::setFocus. See
 http://trac.webkit.org/changeset/58821

Change-Id: I3ab2eb4fdb14e32106c4b2ef51b889f2ffcd3661
---
 WebCore/plugins/android/PluginViewAndroid.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebCore')

diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp
index 51b41a2..c6fbdbe 100644
--- a/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -595,9 +595,9 @@ void PluginView::forceRedraw()
     this->invalidateRect(0);
 }
 
-void PluginView::setFocus()
+void PluginView::setFocus(bool focused)
 {
-    Widget::setFocus();
+    Widget::setFocus(focused);
 //    SkDebugf("------------- setFocus %p\n", this);
 }
 
-- 
cgit v1.1