Title: [87552] branches/safari-534-branch/Source/WebKit2
- Revision
- 87552
- Author
- mr...@apple.com
- Date
- 2011-05-27 13:45:00 -0700 (Fri, 27 May 2011)
Log Message
Merge r87458.
Modified Paths
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (87551 => 87552)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-27 20:43:22 UTC (rev 87551)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-05-27 20:45:00 UTC (rev 87552)
@@ -1,5 +1,22 @@
2011-05-27 Mark Rowe <mr...@apple.com>
+ Merge r87458.
+
+ 2011-05-26 Chris Fleizach <cfleiz...@apple.com>
+
+ Reviewed by Darin Adler.
+
+ Safari's AXFocusedUIElement attribute returns WebArea object with AXSelectedTextMarkerRange of nil
+ https://bugs.webkit.org/show_bug.cgi?id=61492
+
+ The method for determining which WebPage is actually focused and foreground was faulty. More
+ extensive checks are required to check which WebPage should be returned as the focusable one.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::windowIsFocused):
+
+2011-05-27 Mark Rowe <mr...@apple.com>
+
Merge r87324.
2011-05-25 Jon Honeycutt <jhoneyc...@apple.com>
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (87551 => 87552)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-05-27 20:43:22 UTC (rev 87551)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-05-27 20:45:00 UTC (rev 87552)
@@ -1958,12 +1958,16 @@
}
#endif
-
+
bool WebPage::windowIsFocused() const
{
- return m_page->focusController()->isActive();
-}
-
+#if PLATFORM(MAC)
+ if (!m_windowIsVisible)
+ return false;
+#endif
+ return m_page->focusController()->isFocused() && m_page->focusController()->isActive();
+}
+
void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
if (messageID.is<CoreIPC::MessageClassDrawingAreaLegacy>()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
