Title: [150182] trunk/Source/WebKit/gtk
- Revision
- 150182
- Author
- [email protected]
- Date
- 2013-05-16 08:19:05 -0700 (Thu, 16 May 2013)
Log Message
[GTK] TargetFrame and innerNodeFrame confused
https://bugs.webkit.org/show_bug.cgi?id=102907
Reviewed by Martin Robinson.
* webkit/webkithittestresult.cpp:
(WebKit::kit):
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (150181 => 150182)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-05-16 12:49:23 UTC (rev 150181)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-05-16 15:19:05 UTC (rev 150182)
@@ -1,3 +1,13 @@
+2013-05-16 Allan Sandfeld Jensen <[email protected]>
+
+ [GTK] TargetFrame and innerNodeFrame confused
+ https://bugs.webkit.org/show_bug.cgi?id=102907
+
+ Reviewed by Martin Robinson.
+
+ * webkit/webkithittestresult.cpp:
+ (WebKit::kit):
+
2013-05-15 Anders Carlsson <[email protected]>
Fix build.
Modified: trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp (150181 => 150182)
--- trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp 2013-05-16 12:49:23 UTC (rev 150181)
+++ trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp 2013-05-16 15:19:05 UTC (rev 150182)
@@ -287,7 +287,7 @@
GOwnPtr<char> imageURI(0);
GOwnPtr<char> mediaURI(0);
WebKitDOMNode* node = 0;
- WebCore::Frame* targetFrame;
+ WebCore::Frame* innerNodeFrame;
WebCore::IntPoint point;
if (!result.absoluteLinkURL().isEmpty()) {
@@ -314,14 +314,14 @@
if (result.innerNonSharedNode())
node = kit(result.innerNonSharedNode());
- // FIXME: This should probably use innerNodeFrame, as targetFrame is the potentially different frame the link opens in.
- targetFrame = result.targetFrame();
- if (targetFrame && targetFrame->view()) {
+ innerNodeFrame = result.innerNodeFrame();
+ if (innerNodeFrame && innerNodeFrame->view()) {
// Convert document coords to widget coords.
- point = targetFrame->view()->contentsToWindow(result.roundedPointInInnerNodeFrame());
+ point = innerNodeFrame->view()->contentsToWindow(result.roundedPointInInnerNodeFrame());
} else {
- // FIXME: This should probably use roundedPointInMainFrame and translate from the mainframe.
- point = result.roundedPointInInnerNodeFrame();
+ // FIXME: Main frame coords is not the same as window coords,
+ // but we do not have pointer to mainframe view here.
+ point = result.roundedPointInMainFrame();
}
return WEBKIT_HIT_TEST_RESULT(g_object_new(WEBKIT_TYPE_HIT_TEST_RESULT,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
