[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

kbalazs at webkit.org kbalazs at webkit.org
Sun Feb 20 22:53:55 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 36ba4fec1e502bb4b7e242534306018037207f69
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 03:23:56 2011 +0000

    Unreviewed.
    
    Getting rid of the unused 'viewportSize' argument in QWKPagePrivate:init.
    The argument is unused since http://trac.webkit.org/changeset/75468.
    
    * UIProcess/API/qt/qgraphicswkview.cpp:
    (QGraphicsWKView::QGraphicsWKView):
    * UIProcess/API/qt/qwkpage.cpp:
    (QWKPagePrivate::init):
    * UIProcess/API/qt/qwkpage_p.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75673 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 096971c..c5c50fd 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-12  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Unreviewed.
+
+        Getting rid of the unused 'viewportSize' argument in QWKPagePrivate:init.
+        The argument is unused since http://trac.webkit.org/changeset/75468.
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::QGraphicsWKView):
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::init):
+        * UIProcess/API/qt/qwkpage_p.h:
+
 2011-01-12  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index 44cdfa9..f01c5b2 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -83,7 +83,7 @@ QGraphicsWKView::QGraphicsWKView(QWKContext* context, BackingStoreType backingSt
         break;
     }
 
-    d->page->d->init(this, size().toSize(), drawingAreaProxy);
+    d->page->d->init(this, drawingAreaProxy);
     connect(d->page, SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
     connect(d->page, SIGNAL(loadStarted()), this, SIGNAL(loadStarted()));
     connect(d->page, SIGNAL(loadFinished(bool)), this, SIGNAL(loadFinished(bool)));
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 5288160..a03d896 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -100,7 +100,7 @@ QWKPagePrivate::~QWKPagePrivate()
     delete history;
 }
 
-void QWKPagePrivate::init(QGraphicsItem* view, const QSize& viewportSize, PassOwnPtr<DrawingAreaProxy> proxy)
+void QWKPagePrivate::init(QGraphicsItem* view, PassOwnPtr<DrawingAreaProxy> proxy)
 {
     this->view = view;
     page->setDrawingArea(proxy);
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 52726c0..c844151 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -41,7 +41,7 @@ public:
 
     static QWKPagePrivate* get(QWKPage* page) { return page->d; }
 
-    void init(QGraphicsItem*, const QSize& viewportSize, WTF::PassOwnPtr<WebKit::DrawingAreaProxy>);
+    void init(QGraphicsItem*, WTF::PassOwnPtr<WebKit::DrawingAreaProxy>);
 
     // PageClient
     virtual PassOwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list