summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-05-12 12:30:06 +0100
committerBen Murdoch <benm@google.com>2010-05-14 12:25:47 +0100
commit88a30a51ea8b4aa85ab99022c9244e25c16623ad (patch)
tree0e22fd0dbe30493961133eb0f9774b18b95b79c9 /WebCore
parente1a050511f7c6f4fb978049f2b183710f8892293 (diff)
downloadexternal_webkit-88a30a51ea8b4aa85ab99022c9244e25c16623ad.zip
external_webkit-88a30a51ea8b4aa85ab99022c9244e25c16623ad.tar.gz
external_webkit-88a30a51ea8b4aa85ab99022c9244e25c16623ad.tar.bz2
Merge Webkit at r58956: Add bool parameter to Widget::setFocus. See http://trac.webkit.org/changeset/58821
Change-Id: I3ab2eb4fdb14e32106c4b2ef51b889f2ffcd3661
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/plugins/android/PluginViewAndroid.cpp4
1 files changed, 2 insertions, 2 deletions
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);
}