Bug 974335 - Refactor Qt Widget Backend implementation. Shared Widget part . r=doug

widget/shared/nsShmImage.cpp

@@ -8,7 +8,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #elif defined(MOZ_WIDGET_QT)
-#include <QWidget>
+#include <QWindow>
 #endif
 
 #include "nsShmImage.h"
@@ -169,14 +169,14 @@ nsShmImage::Put(GdkWindow* aWindow, cairo_rectangle_list_t* aRects)
 
 #elif defined(MOZ_WIDGET_QT)
 void
-nsShmImage::Put(QWidget* aWindow, QRect& aRect)
+nsShmImage::Put(QWindow* aWindow, QRect& aRect)
 {
     Display* dpy = gfxQtPlatform::GetXDisplay(aWindow);
     Drawable d = aWindow->winId();
 
     GC gc = XCreateGC(dpy, d, 0, nullptr);
     // Avoid out of bounds painting
-    QRect inter = aRect.intersected(aWindow->rect());
+    QRect inter = aRect.intersected(aWindow->geometry());
     XShmPutImage(dpy, d, gc, mImage,
                  inter.x(), inter.y(),
                  inter.x(), inter.y(),

widget/shared/nsShmImage.h

@@ -31,7 +31,7 @@
 #endif
 
 class QRect;
-class QWidget;
+class QWindow;
 class gfxASurface;
 
 class nsShmImage {
@@ -66,7 +66,7 @@ public:
 #elif (MOZ_WIDGET_GTK == 3)
     void Put(GdkWindow* aWindow, cairo_rectangle_list_t* aRects);
 #elif defined(MOZ_WIDGET_QT)
-    void Put(QWidget* aWindow, QRect& aRect);
+    void Put(QWindow* aWindow, QRect& aRect);
 #endif
 
     gfxIntSize Size() const { return mSize; }

widget/xpwidgets/nsBaseWidget.cpp

@@ -838,7 +838,7 @@ bool
 nsBaseWidget::ComputeShouldAccelerate(bool aDefault)
 {
 #if defined(XP_WIN) || defined(ANDROID) || \
-    defined(MOZ_GL_PROVIDER) || defined(XP_MACOSX)
+    defined(MOZ_GL_PROVIDER) || defined(XP_MACOSX) || defined(MOZ_WIDGET_QT)
   bool accelerateByDefault = true;
 #else
   bool accelerateByDefault = false;