Title: [151431] releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk
- Revision
- 151431
- Author
- carlo...@webkit.org
- Date
- 2013-06-11 02:31:24 -0700 (Tue, 11 Jun 2013)
Log Message
Merge r150182 - [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: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog (151430 => 151431)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog 2013-06-11 08:48:10 UTC (rev 151430)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog 2013-06-11 09:31:24 UTC (rev 151431)
@@ -1,3 +1,13 @@
+2013-05-16 Allan Sandfeld Jensen <allan.jen...@digia.com>
+
+ [GTK] TargetFrame and innerNodeFrame confused
+ https://bugs.webkit.org/show_bug.cgi?id=102907
+
+ Reviewed by Martin Robinson.
+
+ * webkit/webkithittestresult.cpp:
+ (WebKit::kit):
+
2013-06-05 Alberto Garcia <agar...@igalia.com>
[GTK] AcceleratedCompositingContext: fix layerFlushTimerFiredCallback condition
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkithittestresult.cpp (151430 => 151431)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkithittestresult.cpp 2013-06-11 08:48:10 UTC (rev 151430)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/webkit/webkithittestresult.cpp 2013-06-11 09:31:24 UTC (rev 151431)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
