Changeset 96385 in webkit

Timestamp:

Sep 29, 2011 9:44:39 PM (13 years ago)

Author:

fsamuel@chromium.org

Message:

Fixed Hit testing on Framesets when Frameset is transformed
​https://bugs.webkit.org/show_bug.cgi?id=67740

Reviewed by Simon Fraser.

Source/WebCore:

Tests: fast/frames/frame-set-rotation-hit.html

fast/frames/frame-set-scaling-hit.html

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::userResize):

LayoutTests:

• fast/frames/frame-set-rotation-hit-expected.png: Added.
• fast/frames/frame-set-rotation-hit-expected.txt: Added.
• fast/frames/frame-set-rotation-hit.html: Added.
• fast/frames/frame-set-scaling-hit-expected.png: Added.
• fast/frames/frame-set-scaling-hit-expected.txt: Added.
• fast/frames/frame-set-scaling-hit.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/frame-set-rotation-hit-expected.png (added)
• LayoutTests/fast/frames/frame-set-rotation-hit-expected.txt (added)
• LayoutTests/fast/frames/frame-set-rotation-hit.html (added)
• LayoutTests/fast/frames/frame-set-scaling-hit-expected.png (added)
• LayoutTests/fast/frames/frame-set-scaling-hit-expected.txt (added)
• LayoutTests/fast/frames/frame-set-scaling-hit.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFrameSet.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-29  Fady Samuel  <fsamuel@chromium.org>
+
+        Fixed Hit testing on Framesets when Frameset is transformed
+        https://bugs.webkit.org/show_bug.cgi?id=67740
+
+        Reviewed by Simon Fraser.
+
+        * fast/frames/frame-set-rotation-hit-expected.png: Added.
+        * fast/frames/frame-set-rotation-hit-expected.txt: Added.
+        * fast/frames/frame-set-rotation-hit.html: Added.
+        * fast/frames/frame-set-scaling-hit-expected.png: Added.
+        * fast/frames/frame-set-scaling-hit-expected.txt: Added.
+        * fast/frames/frame-set-scaling-hit.html: Added.
+
 2011-09-29  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-29  Fady Samuel  <fsamuel@chromium.org>
+
+        Fixed Hit testing on Framesets when Frameset is transformed
+        https://bugs.webkit.org/show_bug.cgi?id=67740
+
+        Reviewed by Simon Fraser.
+
+        Tests: fast/frames/frame-set-rotation-hit.html
+               fast/frames/frame-set-scaling-hit.html
+
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::userResize):
+
 2011-09-29  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -700 +700 @@
             return false;
         if (evt->type() == eventNames().mousedownEvent && evt->button() == LeftButton) {
-            FloatPoint pos = localToAbsolute();
-            startResizing(m_cols, evt->absoluteLocation().x() - pos.x());
-            startResizing(m_rows, evt->absoluteLocation().y() - pos.y());
+            FloatPoint localPos = absoluteToLocal(evt->absoluteLocation(), false, true);
+            startResizing(m_cols, localPos.x());
+            startResizing(m_rows, localPos.y());
             if (m_cols.m_splitBeingResized != noSplit || m_rows.m_splitBeingResized != noSplit) {
                 setIsResizing(true);
@@ -710 +710 @@
     } else {
         if (evt->type() == eventNames().mousemoveEvent || (evt->type() == eventNames().mouseupEvent && evt->button() == LeftButton)) {
-            FloatPoint pos = localToAbsolute();
-            continueResizing(m_cols, evt->absoluteLocation().x() - pos.x());
-            continueResizing(m_rows, evt->absoluteLocation().y() - pos.y());
+            FloatPoint localPos = absoluteToLocal(evt->absoluteLocation(), false, true);
+            continueResizing(m_cols, localPos.x());
+            continueResizing(m_rows, localPos.y());
             if (evt->type() == eventNames().mouseupEvent && evt->button() == LeftButton) {
                 setIsResizing(false);