[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kbalazs at webkit.org
kbalazs at webkit.org
Wed Dec 22 15:54:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e4eef1fd8c75cd5be503484c39dfab82cb5baece
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 13:23:35 2010 +0000
2010-11-16 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Andreas Kling.
[Qt][WK2] Add a way to turn on tiled backing store in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=49587
* MiniBrowser/qt/BrowserView.cpp:
(BrowserView::BrowserView): Added BackingStoreType
argument to ctor. Propagating it to the QGraphicsWKView.
* MiniBrowser/qt/BrowserView.h:
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::newWindow): Create the new BrowserWindow
with the same BackingStoreType that this instance has.
* MiniBrowser/qt/BrowserWindow.h: Added BackingStoreType member.
* MiniBrowser/qt/main.cpp:
(main): Use tiled backing store if got -tiled command line argument.
Avoid redundant copy of command line args.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72089 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 16d01ae..bbc4094 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-16 Balazs Kelemen <kbalazs at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt][WK2] Add a way to turn on tiled backing store in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=49587
+
+ * MiniBrowser/qt/BrowserView.cpp:
+ (BrowserView::BrowserView): Added BackingStoreType
+ argument to ctor. Propagating it to the QGraphicsWKView.
+ * MiniBrowser/qt/BrowserView.h:
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ (BrowserWindow::newWindow): Create the new BrowserWindow
+ with the same BackingStoreType that this instance has.
+ * MiniBrowser/qt/BrowserWindow.h: Added BackingStoreType member.
+ * MiniBrowser/qt/main.cpp:
+ (main): Use tiled backing store if got -tiled command line argument.
+ Avoid redundant copy of command line args.
+
2010-11-16 John Knottenbelt <jknotten at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebKitTools/MiniBrowser/qt/BrowserView.cpp b/WebKitTools/MiniBrowser/qt/BrowserView.cpp
index ce101c2..c885a39 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserView.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserView.cpp
@@ -36,14 +36,14 @@ static QWKPage* createNewPage(QWKPage* page)
return page;
}
-BrowserView::BrowserView(QWidget* parent)
+BrowserView::BrowserView(QGraphicsWKView::BackingStoreType backingStoreType, QWidget* parent)
: QGraphicsView(parent)
, m_item(0)
, m_context(WKContextGetSharedProcessContext())
{
WKRetainPtr<WKPageNamespaceRef> pageNamespace(AdoptWK, WKPageNamespaceCreate(m_context.get()));
- m_item = new QGraphicsWKView(pageNamespace.get(), QGraphicsWKView::Simple, 0);
+ m_item = new QGraphicsWKView(pageNamespace.get(), backingStoreType, 0);
setScene(new QGraphicsScene(this));
scene()->addItem(m_item);
diff --git a/WebKitTools/MiniBrowser/qt/BrowserView.h b/WebKitTools/MiniBrowser/qt/BrowserView.h
index 42b7658..7e8288e 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserView.h
+++ b/WebKitTools/MiniBrowser/qt/BrowserView.h
@@ -37,7 +37,7 @@ class BrowserView : public QGraphicsView {
Q_OBJECT
public:
- BrowserView(QWidget* parent = 0);
+ BrowserView(QGraphicsWKView::BackingStoreType, QWidget* parent = 0);
virtual ~BrowserView() { delete m_item; }
void load(const QString&);
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index 985d88b..1af18a3 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -30,12 +30,13 @@
#include "WKPageNamespace.h"
-BrowserWindow::BrowserWindow()
+BrowserWindow::BrowserWindow(QGraphicsWKView::BackingStoreType type)
+ : m_backingStoreType(type)
{
setAttribute(Qt::WA_DeleteOnClose);
m_menu = new QMenuBar();
- m_browser = new BrowserView();
+ m_browser = new BrowserView(m_backingStoreType);
m_addressBar = new QLineEdit();
m_menu->addAction("New Window", this, SLOT(newWindow()));
@@ -75,7 +76,7 @@ void BrowserWindow::load(const QString& url)
BrowserWindow* BrowserWindow::newWindow(const QString& url)
{
- BrowserWindow* window = new BrowserWindow();
+ BrowserWindow* window = new BrowserWindow(m_backingStoreType);
window->load(url);
return window;
}
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.h b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
index 79ba291..b171a50 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.h
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
@@ -32,13 +32,14 @@
#define PLATFORM(x) 0
#include "BrowserView.h"
+#include <qgraphicswkview.h>
#include <QtGui>
class BrowserWindow : public QMainWindow {
Q_OBJECT
public:
- BrowserWindow();
+ BrowserWindow(QGraphicsWKView::BackingStoreType);
~BrowserWindow();
void load(const QString& url);
@@ -56,6 +57,7 @@ private:
BrowserView* m_browser;
QMenuBar* m_menu;
QLineEdit* m_addressBar;
+ QGraphicsWKView::BackingStoreType m_backingStoreType;
};
#endif
diff --git a/WebKitTools/MiniBrowser/qt/main.cpp b/WebKitTools/MiniBrowser/qt/main.cpp
index 8ff3de8..20f4ff5 100644
--- a/WebKitTools/MiniBrowser/qt/main.cpp
+++ b/WebKitTools/MiniBrowser/qt/main.cpp
@@ -27,28 +27,37 @@
*/
#include "BrowserWindow.h"
+#include <QLatin1String>
+#include <QRegExp>
+#include <qgraphicswkview.h>
#include <QtGui>
int main(int argc, char** argv) {
QApplication app(argc, argv);
QStringList args = QApplication::arguments();
- QStringList urls = args;
- urls.removeAt(0);
+ args.removeAt(0);
- if (urls.isEmpty()) {
+ QGraphicsWKView::BackingStoreType backingStoreTypeToUse = QGraphicsWKView::Simple;
+ int indexOfTiledOption;
+ if ((indexOfTiledOption = args.indexOf(QRegExp(QLatin1String("-tiled")))) != -1) {
+ backingStoreTypeToUse = QGraphicsWKView::Tiled;
+ args.removeAt(indexOfTiledOption);
+ }
+
+ if (args.isEmpty()) {
QString defaultUrl = QString("file://%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
if (QDir(defaultUrl).exists())
- urls.append(defaultUrl);
+ args.append(defaultUrl);
else
- urls.append("http://www.google.com");
+ args.append("http://www.google.com");
}
- BrowserWindow* window = new BrowserWindow();
- window->load(urls[0]);
+ BrowserWindow* window = new BrowserWindow(backingStoreTypeToUse);
+ window->load(args[0]);
- for (int i = 1; i < urls.size(); ++i)
- window->newWindow(urls[i]);
+ for (int i = 1; i < args.size(); ++i)
+ window->newWindow(args[i]);
app.exec();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list