Changeset 167923 in webkit

Timestamp:

Apr 28, 2014 9:20:37 PM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/16750708> REGRESSION (r159358): Crash in InjectedBundleHitTestResult::frame
​https://bugs.webkit.org/show_bug.cgi?id=132318

Reviewed by Andy Estes.

• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction): Fixed a typo: set
the source frame, not the destination frame.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Changed to get the
frame for the action not from a hit test result, because some link activation actions are
not mouse events, but rather from the event’s target.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-28  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/16750708> REGRESSION (r159358): Crash in InjectedBundleHitTestResult::frame
+        https://bugs.webkit.org/show_bug.cgi?id=132318
+
+        Reviewed by Andy Estes.
+
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction): Fixed a typo: set
+        the source frame, not the destination frame.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Changed to get the
+        frame for the action not from a hit test result, because some link activation actions are
+        not mouse events, but rather from the event’s target.
+
 2014-04-28  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -257 +257 @@
             [navigationAction setSourceFrame:[navigationAction targetFrame]];
         else
-            [navigationAction setTargetFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*sourceFrame]).get()];
+            [navigationAction setSourceFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*sourceFrame]).get()];
     }
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -734 +734 @@
     switch (action->navigationType()) {
     case NavigationTypeLinkClicked:
-        originatingFrame = action->hitTestResult()->frame();
+        if (EventTarget* target = navigationAction.event()->target()) {
+            if (Node* node = target->toNode()) {
+                if (Frame* frame = node->document().frame())
+                    originatingFrame = WebFrame::fromCoreFrame(*frame);
+            }
+        }
         break;
     case NavigationTypeFormSubmitted: