Changeset 100617 in webkit

Timestamp:

Nov 17, 2011 6:51:52 AM (12 years ago)

Author:

alexis.menard@openbossa.org

Message:

[Qt][WK2] Cleanup dead code in QtWebPageProxy.
​https://bugs.webkit.org/show_bug.cgi?id=72608

Reviewed by Simon Hausmann.

Remove some dead code after we merged our views.
QQuickWebView is now using AC which means that this
path is never called now.

• UIProcess/qt/QtWebPageProxy.cpp:

(QtWebPageProxy::didReceiveDownloadResponse):

• UIProcess/qt/QtWebPageProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtWebPageProxy.cpp (modified) (2 diffs)
• UIProcess/qt/QtWebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-17  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt][WK2] Cleanup dead code in QtWebPageProxy.
+        https://bugs.webkit.org/show_bug.cgi?id=72608
+
+        Reviewed by Simon Hausmann.
+
+        Remove some dead code after we merged our views.
+        QQuickWebView is now using AC which means that this
+        path is never called now.
+
+        * UIProcess/qt/QtWebPageProxy.cpp:
+        (QtWebPageProxy::didReceiveDownloadResponse):
+        * UIProcess/qt/QtWebPageProxy.h:
+
 2011-11-17  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp

@@ -608 +608 @@
 }
 
-void QtWebPageProxy::paint(QPainter* painter, const QRect& area)
-{
-    if (m_webPageProxy->isValid())
-        paintContent(painter, area);
-    else
-        painter->fillRect(area, Qt::white);
-}
-
 bool QtWebPageProxy::canGoBack() const
 {
@@ -820 +812 @@
     // Now that our downloadItem has everything we need we can emit downloadRequested.
     m_viewInterface->downloadRequested(download);
-}
-
-void QtWebPageProxy::paintContent(QPainter* painter, const QRect& area)
-{
-    // FIXME: Do something with the unpainted region?
-    WebCore::Region unpaintedRegion;
-    static_cast<DrawingAreaProxyImpl*>(m_webPageProxy->drawingArea())->paint(painter, area, unpaintedRegion);
 }
 

trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h

@@ -148 +148 @@
     int loadProgress() const { return m_loadProgress; }
 
-    void paint(QPainter*, const QRect&);
-
     bool canGoBack() const;
     void goBack();
@@ -212 +210 @@
 
 protected:
-    virtual void paintContent(QPainter* painter, const QRect& area);
     RefPtr<WebKit::WebPageProxy> m_webPageProxy;
     WebKit::QtViewInterface* const m_viewInterface;