[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 1ea52c9b7159bb006c02f3a6b051af9289bd1169
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 21:48:31 2010 +0000

    Add IWebFramePrivate::visibleContentRect
    
    Fixes <http://webkit.org/b/34956> Add API to get a WebFrame's visible
    content rect
    
    Reviewed by Jon Honeycutt.
    
    * Interfaces/IWebFramePrivate.idl: Added visibleContentRect.
    
    * Interfaces/WebKit.idl: Touched to force a build.
    
    * WebFrame.cpp:
    (WebFrame::visibleContentRect):
    * WebFrame.h:
    Added. Calls through to FrameView::visibleContentRect.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54796 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index fc0c224..1a6b3ec 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-15  Adam Roben  <aroben at apple.com>
+
+        Add IWebFramePrivate::visibleContentRect
+
+        Fixes <http://webkit.org/b/34956> Add API to get a WebFrame's visible
+        content rect
+
+        Reviewed by Jon Honeycutt.
+
+        * Interfaces/IWebFramePrivate.idl: Added visibleContentRect.
+
+        * Interfaces/WebKit.idl: Touched to force a build.
+
+        * WebFrame.cpp:
+        (WebFrame::visibleContentRect):
+        * WebFrame.h:
+        Added. Calls through to FrameView::visibleContentRect.
+
 2010-02-12  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index ef1c133..b5a5502 100644
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -102,4 +102,6 @@ interface IWebFramePrivate : IUnknown
     HRESULT counterValueForElementById([in] BSTR id, [out, retval] BSTR* result);
 
     HRESULT pauseSVGAnimation([in] BSTR elementId, [in] IDOMNode* node, [in] double secondsFromNow, [out, retval] BOOL* animationWasRunning);
+
+    HRESULT visibleContentRect([out, retval] RECT*);
 }
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index 3cd748c..94dc697 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -294,3 +294,4 @@ library WebKit
         [default] interface IWebGeolocationPosition;
     }
 }
+
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index b7ad014..ce06a0c 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -1192,6 +1192,24 @@ HRESULT WebFrame::pauseSVGAnimation(BSTR elementId, IDOMNode* node, double secon
     return S_OK;
 }
 
+HRESULT WebFrame::visibleContentRect(RECT* rect)
+{
+    if (!rect)
+        return E_POINTER;
+    SetRectEmpty(rect);
+
+    Frame* frame = core(this);
+    if (!frame)
+        return E_FAIL;
+
+    FrameView* view = frame->view();
+    if (!view)
+        return E_FAIL;
+
+    *rect = view->visibleContentRect(false);
+    return S_OK;
+}
+
 HRESULT WebFrame::numberOfActiveAnimations(UINT* number)
 {
     if (!number)
diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
index 1a92751..a10dcb2 100644
--- a/WebKit/win/WebFrame.h
+++ b/WebKit/win/WebFrame.h
@@ -252,6 +252,8 @@ public:
     virtual HRESULT STDMETHODCALLTYPE stringByEvaluatingJavaScriptInScriptWorld(IWebScriptWorld*, JSObjectRef globalObjectRef, BSTR script, BSTR* evaluationResult);
     virtual JSGlobalContextRef STDMETHODCALLTYPE globalContextForScriptWorld(IWebScriptWorld*);
 
+    virtual HRESULT STDMETHODCALLTYPE visibleContentRect(RECT*);
+
     // IWebDocumentText
     virtual HRESULT STDMETHODCALLTYPE supportsTextEncoding( 
         /* [retval][out] */ BOOL* result);

-- 
WebKit Debian packaging