Merge remote-tracking branch 'origin/5.212' into devHEADdev

Change-Id: I2b773e6958cf1d3699ff7887f2807572f1dafa8d

1 files changed, 0 insertions, 126 deletions

diff --git a/Source/WebKit/qt/tests/hybridPixmap/widget.cpp b/Source/WebKit/qt/tests/hybridPixmap/widget.cpp
deleted file mode 100644
index 6c4d2cd49..000000000
--- a/Source/WebKit/qt/tests/hybridPixmap/widget.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#include "widget.h"
-
-#include "qwebelement.h"
-#include "qwebframe.h"
-#include "ui_widget.h"
-#include <QPainter>
-#include <QtTest/QtTest>
-
-Widget::Widget(QWidget* parent) :
-    QWidget(parent),
-    ui(new Ui::Widget),
-    abcFilledImage(32, 32, QImage::Format_ARGB32)
-{
-    ui->setupUi(this);
-    abcFilledImage.fill(qRgba(0xaa, 0xbb, 0xcc, 0xff));
-}
-
-void Widget::refreshJS()
-{
-    ui->webView->page()->mainFrame()->addToJavaScriptWindowObject("myWidget", this);
-}
-void Widget::start()
-{
-    ui->webView->load(QUrl("qrc:///test.html"));
-    connect(ui->webView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(refreshJS()));
-    ui->webView->page()->mainFrame()->addToJavaScriptWindowObject("myWidget", this);
-}
-
-void Widget::completeTest()
-{
-    QCOMPARE(ui->lbl1->pixmap()->size(), ui->lbl2->size());
-    QCOMPARE(ui->lbl3->size(), ui->lbl4->pixmap()->size());
-    QCOMPARE(ui->lbl2->size().width(), ui->webView->page()->mainFrame()->findFirstElement("#img1").evaluateJavaScript("this.width").toInt());
-    QCOMPARE(ui->lbl3->size().width(), ui->webView->page()->mainFrame()->findFirstElement("#img2").evaluateJavaScript("this.width").toInt());
-    emit testComplete();
-}
-
-void Widget::setPixmap(const QPixmap& p)
-{
-    ui->lbl1->setPixmap(p);
-}
-QPixmap Widget::pixmap() const
-{
-    QPixmap px(ui->lbl3->size());
-    {
-        QPainter p(&px);
-        ui->lbl3->render(&p);
-    }
-    return px;
-}
-void Widget::setImage(const QImage& img)
-{
-    ui->lbl4->setPixmap(QPixmap::fromImage(img));
-}
-
-QImage Widget::image() const
-{
-    QImage img(ui->lbl2->size(), QImage::Format_ARGB32);
-    {
-        QPainter p(&img);
-        ui->lbl2->render(&p);
-    }
-    return img;
-}
-
-QImage Widget::abcImage(int format)
-{
-    return abcFilledImage.convertToFormat(static_cast<QImage::Format>(format));
-}
-
-Widget::~Widget()
-{
-    delete ui;
-}
-
-void Widget::changeEvent(QEvent* e)
-{
-    QWidget::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-void Widget::compare(const QVariant& a, const QVariant& b)
-{
-    QCOMPARE(a, b);
-}
-
-void Widget::imageSlot(const QImage& img)
-{
-    QCOMPARE(img.size(), ui->lbl3->size());
-    emit pixmapSignal(QPixmap::fromImage(img));
-}
-
-void Widget::pixmapSlot(const QPixmap& pxm)
-{
-    QCOMPARE(pxm.size(), ui->lbl2->size());
-    emit imageSignal(ui->lbl4->pixmap()->toImage());
-}
-
-void Widget::randomSlot(const QPixmap& pxm)
-{
-    QVERIFY(pxm.isNull());
-}