[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e62a5f32fbbefb8bb67de6d944efbd05952d9594
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 17:45:12 2009 +0000

    Remove clipRenderToViewport as agreed upon in
    https://bugs.webkit.org/show_bug.cgi?id=29843
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-20
    Rubberstamped by Adam Barth.
    
    * Api/qwebframe.cpp:
    * Api/qwebframe.h:
    * Api/qwebframe_p.h:
    (QWebFramePrivate::QWebFramePrivate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 7fb868b..45dbfba 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -1014,26 +1014,6 @@ void QWebFrame::render(QPainter *painter)
 }
 
 /*!
-    \since 4.6
-    \property QWebFrame::clipRenderToViewport
-
-    Returns true if render will clip content to viewport; otherwise returns false.
-*/
-bool QWebFrame::clipRenderToViewport() const
-{
-    return d->clipRenderToViewport;
-}
-
-/*!
-    \since 4.6
-    Sets whether the content of a frame will be clipped to viewport when rendered.
-*/
-void QWebFrame::setClipRenderToViewport(bool clipRenderToViewport)
-{
-    d->clipRenderToViewport = clipRenderToViewport;
-}
-
-/*!
     \property QWebFrame::textSizeMultiplier
     \brief the scaling factor for all text in the frame
     \obsolete
diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h
index bc21e8a..e4cef06 100644
--- a/WebKit/qt/Api/qwebframe.h
+++ b/WebKit/qt/Api/qwebframe.h
@@ -112,7 +112,6 @@ class QWEBKIT_EXPORT QWebFrame : public QObject {
     Q_PROPERTY(QIcon icon READ icon)
     Q_PROPERTY(QSize contentsSize READ contentsSize)
     Q_PROPERTY(QPoint scrollPosition READ scrollPosition WRITE setScrollPosition)
-    Q_PROPERTY(bool clipRenderToViewport READ clipRenderToViewport WRITE setClipRenderToViewport)
     Q_PROPERTY(bool focus READ hasFocus)
 private:
     QWebFrame(QWebPage *parent, QWebFrameData *frameData);
@@ -177,9 +176,6 @@ public:
     void render(QPainter*, const QRegion& clip);
     void render(QPainter*, RenderLayer layer, const QRegion& clip = QRegion());
 
-    bool clipRenderToViewport() const;
-    void setClipRenderToViewport(bool clipRenderToViewport);
-
     void setTextSizeMultiplier(qreal factor);
     qreal textSizeMultiplier() const;
 
diff --git a/WebKit/qt/Api/qwebframe_p.h b/WebKit/qt/Api/qwebframe_p.h
index 7d39673..081e65d 100644
--- a/WebKit/qt/Api/qwebframe_p.h
+++ b/WebKit/qt/Api/qwebframe_p.h
@@ -70,7 +70,6 @@ public:
         , allowsScrolling(true)
         , marginWidth(-1)
         , marginHeight(-1)
-        , clipRenderToViewport(true)
         {}
     void init(QWebFrame* qframe, QWebFrameData* frameData);
 
@@ -94,7 +93,6 @@ public:
     bool allowsScrolling;
     int marginWidth;
     int marginHeight;
-    bool clipRenderToViewport;
 };
 
 class QWebHitTestResultPrivate {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 5f24e26..a984239 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,17 @@
 2009-10-20  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
+        Rubberstamped by Adam Barth.
+
+        Remove clipRenderToViewport as agreed upon in
+        https://bugs.webkit.org/show_bug.cgi?id=29843
+
+        * Api/qwebframe.cpp:
+        * Api/qwebframe.h:
+        * Api/qwebframe_p.h:
+        (QWebFramePrivate::QWebFramePrivate):
+
+2009-10-20  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
         Reviewed by Adam Barth.
 
         Update the tests to test the new render functionality, and take

-- 
WebKit Debian packaging