diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/mac/WidgetMac.mm | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/mac/WidgetMac.mm')
| -rw-r--r-- | Source/WebCore/platform/mac/WidgetMac.mm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/WebCore/platform/mac/WidgetMac.mm b/Source/WebCore/platform/mac/WidgetMac.mm index 96bcde2..f75faaa 100644 --- a/Source/WebCore/platform/mac/WidgetMac.mm +++ b/Source/WebCore/platform/mac/WidgetMac.mm @@ -115,10 +115,15 @@ void Widget::setFocus(bool focused) BEGIN_BLOCK_OBJC_EXCEPTIONS; + // If there's no platformWidget, WK2 is running. The focus() method needs to be used + // to bring focus to the right view on the UIProcess side. NSView *view = [platformWidget() _webcore_effectiveFirstResponder]; - if (Page* page = frame->page()) - page->chrome()->focusNSView(view); - + if (Page* page = frame->page()) { + if (!platformWidget()) + page->chrome()->focus(); + else + page->chrome()->focusNSView(view); + } END_BLOCK_OBJC_EXCEPTIONS; } |