WebKitTools:

        Reviewed by Adam Roben.

        Fix for <rdar://problem/5382579>
        http/tests/security/cross-frame-access-put.html reports large
        negative numbers for screenLeft and screenTop (Mac reports "0")

        * DumpRenderTree/win/UIDelegate.cpp:
        (UIDelegate::UIDelegate): Initialize the RECT.
        (UIDelegate::setFrame): copy the contents of the rect, not the pointer.
        (UIDelegate::webViewFrame): ditto.
        * DumpRenderTree/win/UIDelegate.h: Use a RECT not a RECT*

LayoutTests:

        Reviewed by Adam Roben.

        Fix for <rdar://problem/5382579>
        http/tests/security/cross-frame-access-put.html reports large
        negative numbers for screenLeft and screenTop (Mac reports "0")

        * platform/win/Skipped: remove http/tests/security/cross-frame-access-put.html

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27771 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 729b0eb1c22af86960f02f053da83216e8b5d390..1b4cb6df544b7c50ae9548975b2953385d2c4f56 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-13  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Fix for <rdar://problem/5382579>
+        http/tests/security/cross-frame-access-put.html reports large 
+        negative numbers for screenLeft and screenTop (Mac reports "0")
+
+        * platform/win/Skipped: remove http/tests/security/cross-frame-access-put.html
+
 2007-11-13  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Adam.

diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index ff8b7e918b5435dbb05e4708ff9971c9c9128eaf..de2a9b4cac06ccf4a1b603b79f6757c672679a1d 100644 (file)
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -433,9 +433,6 @@ editing/selection/5354455-2.html
 http/tests/security/cross-frame-access-protocol-explicit-domain.html
 http/tests/security/cross-frame-access-protocol.html
 
-# Reports large negative numbers for screenLeft and screenTop <rdar://problem/5382579>
-http/tests/security/cross-frame-access-put.html
-
 # <rdar://problem/5463489> A number of layout tests use textInputController for operations that should be crossplatform
 editing/deleting/5300379.html
 editing/deleting/delete-to-end-of-paragraph.html

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8102b4c75a0f1aa4f3e0ff493eb57c7e786bf183..a69a7047688bdb3cd60bc08962e74136a23f545c 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2007-11-13  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Fix for <rdar://problem/5382579>
+        http/tests/security/cross-frame-access-put.html reports large 
+        negative numbers for screenLeft and screenTop (Mac reports "0")
+
+        * DumpRenderTree/win/UIDelegate.cpp:
+        (UIDelegate::UIDelegate): Initialize the RECT.
+        (UIDelegate::setFrame): copy the contents of the rect, not the pointer.
+        (UIDelegate::webViewFrame): ditto.
+        * DumpRenderTree/win/UIDelegate.h: Use a RECT not a RECT*
+
 2007-11-13  Kevin McCullough  <kmccullough@apple.com>
 
         Reviewed by Adam.

diff --git a/WebKitTools/DumpRenderTree/win/UIDelegate.cpp b/WebKitTools/DumpRenderTree/win/UIDelegate.cpp
index b5f008c44cfe990ac4641919c9401990e7eec0ed..d101d9697eca2ef106ed43ec732fd0e227d3a9fc 100755 (executable)
--- a/WebKitTools/DumpRenderTree/win/UIDelegate.cpp
+++ b/WebKitTools/DumpRenderTree/win/UIDelegate.cpp
@@ -40,6 +40,15 @@
 #include <WebKit/IWebViewPrivate.h>
 #include <stdio.h>
 
+UIDelegate::UIDelegate()
+    : m_refCount(1)
+{
+    m_frame.bottom = 0;
+    m_frame.top = 0;
+    m_frame.left = 0;
+    m_frame.right = 0;
+}
+
 HRESULT STDMETHODCALLTYPE UIDelegate::QueryInterface(REFIID riid, void** ppvObject)
 {
     *ppvObject = 0;
@@ -82,7 +91,7 @@ HRESULT STDMETHODCALLTYPE UIDelegate::setFrame(
         /* [in] */ IWebView* /*sender*/,
         /* [in] */ RECT* frame)
 {
-    m_frame = frame;
+    m_frame = *frame;
     return S_OK;
 }
 
@@ -90,7 +99,7 @@ HRESULT STDMETHODCALLTYPE UIDelegate::webViewFrame(
         /* [in] */ IWebView* /*sender*/,
         /* [retval][out] */ RECT* frame)
 {
-    frame = m_frame;
+    *frame = m_frame;
     return S_OK;
 }
 

diff --git a/WebKitTools/DumpRenderTree/win/UIDelegate.h b/WebKitTools/DumpRenderTree/win/UIDelegate.h
index 671c648dafc275a0cd42501f8b720e915d1a1f91..881f125b894d3676dd6cbcbbe2de8696a887f6d6 100755 (executable)
--- a/WebKitTools/DumpRenderTree/win/UIDelegate.h
+++ b/WebKitTools/DumpRenderTree/win/UIDelegate.h
@@ -31,10 +31,11 @@
 
 #include <WebKit/IWebUIDelegate.h>
 #include <WebKit/IWebUIDelegatePrivate.h>
+#include <windef.h>
 
 class UIDelegate : public IWebUIDelegate, IWebUIDelegatePrivate {
 public:
-    UIDelegate() : m_refCount(1), m_frame(0) { }
+    UIDelegate();
 
     void processWork();
 
@@ -293,7 +294,7 @@ protected:
     ULONG                   m_refCount;
 
 private:
-    RECT* m_frame;
+    RECT m_frame;
 };
 
 #endif