Bug 992562 - Unbreak cairo-qt after bug 982734. r=enn
authorJan Beich <jbeich@tormail.org>
Sat, 05 Apr 2014 10:17:00 +0200
changeset 195756 8a290ca4c3c77fe4bc8a08c9319a9d86669afe7a
parent 195755 814f77d08ee7ecad9eaacfcb43b2f2131548b7bf
child 195757 5cea3e42cb44580003663cc783506fed8325d60b
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenn
bugs992562, 982734
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 992562 - Unbreak cairo-qt after bug 982734. r=enn
widget/qt/mozqwidget.cpp
widget/qt/nsWindow.cpp
--- a/widget/qt/mozqwidget.cpp
+++ b/widget/qt/mozqwidget.cpp
@@ -12,17 +12,17 @@
 
 using namespace mozilla::widget;
 
 MozQWidget::MozQWidget(nsWindow* aReceiver, QWindow* aParent)
   : QWindow(aParent)
   , mReceiver(aReceiver)
   , mUpdatePending(false)
 {
-    mReceiver->GetWindowType(mWindowType);
+    mWindowType = mReceiver->WindowType();
 }
 
 MozQWidget::~MozQWidget()
 {
 }
 
 void MozQWidget::render(QPainter* painter)
 {
--- a/widget/qt/nsWindow.cpp
+++ b/widget/qt/nsWindow.cpp
@@ -1784,28 +1784,16 @@ nsWindow::GetScreenBounds(nsIntRect &aRe
     LOG(("GetScreenBounds %d %d | %d %d | %d %d\n",
          aRect.x, aRect.y,
          mBounds.width, mBounds.height,
          aRect.width, aRect.height));
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsWindow::SetForegroundColor(const nscolor &aColor)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsWindow::SetBackgroundColor(const nscolor &aColor)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
 nsWindow::SetIcon(const nsAString& aIconSpec)
 {
     if (!mWidget)
         return NS_OK;
 
     nsCOMPtr<nsIFile> iconFile;
     nsAutoCString path;
     nsTArray<nsCString> iconList;