Title: [183146] branches/safari-600.7-branch/Source/WebKit2
- Revision
- 183146
- Author
- [email protected]
- Date
- 2015-04-22 15:43:32 -0700 (Wed, 22 Apr 2015)
Log Message
Merge r181580 for rdar://problem/20545393.
Modified Paths
Diff
Modified: branches/safari-600.7-branch/Source/WebKit2/ChangeLog (183145 => 183146)
--- branches/safari-600.7-branch/Source/WebKit2/ChangeLog 2015-04-22 22:41:28 UTC (rev 183145)
+++ branches/safari-600.7-branch/Source/WebKit2/ChangeLog 2015-04-22 22:43:32 UTC (rev 183146)
@@ -1,3 +1,19 @@
+2015-04-22 Dana Burkart <[email protected]>
+
+ Merge r181580 for rdar://problem/20545393.
+
+ 2015-03-13 Enrica Casucci <[email protected]>
+
+ Webkit crash in WebKit::nextFocusableElement() when typing TAB on external keyboard
+ rdar://problem/20155503
+
+ Reviewed by David Kilzer.
+
+ Adding null check!
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::nextFocusableElement):
+
2015-04-22 Matthew Hanson <[email protected]>
Merge r182746. rdar://problem/20645260
Modified: branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (183145 => 183146)
--- branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-04-22 22:41:28 UTC (rev 183145)
+++ branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-04-22 22:43:32 UTC (rev 183146)
@@ -1993,7 +1993,7 @@
static inline Element* nextFocusableElement(Node* startNode, Page* page, bool isForward)
{
- if (!startNode->isElementNode())
+ if (!startNode || !startNode->isElementNode())
return nullptr;
RefPtr<KeyboardEvent> key = KeyboardEvent::create();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
