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

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 42de4a12640def128d8e2562d35ce5ffa3f56772
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 22 12:20:24 2009 +0000

    Fix the Qt/Mac build after r48604 (Implement new QWebPageClient class)
    
    Reivewed by Simon Hausmann.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3ad9eb6..7d87bd5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-22  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reivewed by Simon Hausmann.
+
+        Fix the Qt/Mac build after r48604 (Implement new QWebPageClient class)
+
+        There's no QWidget::x11Info() on Mac, and setPlatformPluginWidget()
+        takes a QWidget*, not a QWebPageClient*
+
+        * plugins/mac/PluginViewMac.cpp:
+        (WebCore::PluginView::platformStart):
+
 2009-09-21  Adam Barth  <abarth at webkit.org>
 
         Attempted fix for the V8 build.
diff --git a/WebCore/plugins/mac/PluginViewMac.cpp b/WebCore/plugins/mac/PluginViewMac.cpp
index b3011f4..bf80672 100644
--- a/WebCore/plugins/mac/PluginViewMac.cpp
+++ b/WebCore/plugins/mac/PluginViewMac.cpp
@@ -75,6 +75,7 @@ using JSC::UString;
 #if PLATFORM(QT)
 #include <QWidget>
 #include <QKeyEvent>
+#include "QWebPageClient.h"
 QT_BEGIN_NAMESPACE
 #if QT_VERSION < 0x040500
 extern Q_GUI_EXPORT WindowPtr qt_mac_window_for(const QWidget* w);
@@ -171,7 +172,13 @@ bool PluginView::platformStart()
         return false;
     }
 
-    setPlatformPluginWidget(m_parentFrame->view()->hostWindow()->platformPageClient());
+#if PLATFORM(QT)
+    if (QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient()) {
+        if (QWidget* window = QWidget::find(client->winId())) {
+            setPlatformPluginWidget(window);
+        }
+    }
+#endif
 
     show();
 
diff --git a/WebKit/qt/Api/qwebgraphicsitem.cpp b/WebKit/qt/Api/qwebgraphicsitem.cpp
index 79841ed..68018f4 100644
--- a/WebKit/qt/Api/qwebgraphicsitem.cpp
+++ b/WebKit/qt/Api/qwebgraphicsitem.cpp
@@ -105,10 +105,12 @@ void QWebGraphicsItemPrivate::updateCursor(const QCursor& cursor)
 
 int QWebGraphicsItemPrivate::screenNumber() const
 {
+#if defined(Q_WS_X11)
     const QList<QGraphicsView*> views = q->scene()->views();
 
     if (!views.isEmpty())
         return views.at(0)->x11Info().screen();
+#endif
 
     return 0;
 }
diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index 7f340e3..115ea3e 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -82,8 +82,10 @@ void QWebViewPrivate::updateCursor(const QCursor& cursor)
 
 int QWebViewPrivate::screenNumber() const
 {
+#if defined(Q_WS_X11)
     if (view)
         return view->x11Info().screen();
+#endif
 
     return 0;
 }
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d7126f9..8217323 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2009-09-22  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reivewed by Simon Hausmann.
+
+        Fix the Qt/Mac build after r48604 (Implement new QWebPageClient class)
+
+        There's no QWidget::x11Info() on Mac, and setPlatformPluginWidget()
+        takes a QWidget*, not a QWebPageClient*
+
+        * Api/qwebgraphicsitem.cpp:
+        (QWebGraphicsItemPrivate::screenNumber):
+        * Api/qwebview.cpp:
+        (QWebViewPrivate::screenNumber):
+
 2009-09-21  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging