Changeset 72089 in webkit


Ignore:
Timestamp:
Nov 16, 2010 5:23:35 AM (13 years ago)
Author:
kbalazs@webkit.org
Message:

2010-11-16 Balazs Kelemen <​kbalazs@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.
Location:
trunk/WebKitTools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r72071 r72089  
     12010-11-16  Balazs Kelemen  <kbalazs@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt][WK2] Add a way to turn on tiled backing store in MiniBrowser
     6        https://bugs.webkit.org/show_bug.cgi?id=49587
     7
     8        * MiniBrowser/qt/BrowserView.cpp:
     9        (BrowserView::BrowserView): Added BackingStoreType
     10        argument to ctor. Propagating it to the QGraphicsWKView.
     11        * MiniBrowser/qt/BrowserView.h:
     12        * MiniBrowser/qt/BrowserWindow.cpp:
     13        (BrowserWindow::BrowserWindow):
     14        (BrowserWindow::newWindow): Create the new BrowserWindow
     15        with the same BackingStoreType that this instance has.
     16        * MiniBrowser/qt/BrowserWindow.h: Added BackingStoreType member.
     17        * MiniBrowser/qt/main.cpp:
     18        (main): Use tiled backing store if got -tiled command line argument.
     19        Avoid redundant copy of command line args.
     20
    1212010-11-16  John Knottenbelt  <jknotten@chromium.org>
    222

  • trunk/WebKitTools/MiniBrowser/qt/BrowserView.cpp

    r67266 r72089  
    3737}
    3838
    39 BrowserView::BrowserView(QWidget* parent)
     39BrowserView::BrowserView(QGraphicsWKView::BackingStoreType backingStoreType, QWidget* parent)
    4040    : QGraphicsView(parent)
    4141    , m_item(0)
    … …  
    4444    WKRetainPtr<WKPageNamespaceRef> pageNamespace(AdoptWK, WKPageNamespaceCreate(m_context.get()));
    4545
    46     m_item = new QGraphicsWKView(pageNamespace.get(), QGraphicsWKView::Simple, 0);
     46    m_item = new QGraphicsWKView(pageNamespace.get(), backingStoreType, 0);
    4747    setScene(new QGraphicsScene(this));
    4848    scene()->addItem(m_item);

  • trunk/WebKitTools/MiniBrowser/qt/BrowserView.h

    r67082 r72089  
    3838
    3939public:
    40     BrowserView(QWidget* parent = 0);
     40    BrowserView(QGraphicsWKView::BackingStoreType, QWidget* parent = 0);
    4141    virtual ~BrowserView() { delete m_item; }
    4242

  • trunk/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp

    r72008 r72089  
    3131#include "WKPageNamespace.h"
    3232
    33 BrowserWindow::BrowserWindow()
     33BrowserWindow::BrowserWindow(QGraphicsWKView::BackingStoreType type)
     34    : m_backingStoreType(type)
    3435{
    3536    setAttribute(Qt::WA_DeleteOnClose);
    3637
    3738    m_menu = new QMenuBar();
    38     m_browser = new BrowserView();
     39    m_browser = new BrowserView(m_backingStoreType);
    3940    m_addressBar = new QLineEdit();
    4041
    … …  
    7677BrowserWindow* BrowserWindow::newWindow(const QString& url)
    7778{
    78     BrowserWindow* window = new BrowserWindow();
     79    BrowserWindow* window = new BrowserWindow(m_backingStoreType);
    7980    window->load(url);
    8081    return window;

  • trunk/WebKitTools/MiniBrowser/qt/BrowserWindow.h

    r72008 r72089  
    3333
    3434#include "BrowserView.h"
     35#include <qgraphicswkview.h>
    3536#include <QtGui>
    3637
    … …  
    3940
    4041public:
    41     BrowserWindow();
     42    BrowserWindow(QGraphicsWKView::BackingStoreType);
    4243    ~BrowserWindow();
    4344    void load(const QString& url);
    … …  
    5758    QMenuBar* m_menu;
    5859    QLineEdit* m_addressBar;
     60    QGraphicsWKView::BackingStoreType m_backingStoreType;
    5961};
    6062

  • trunk/WebKitTools/MiniBrowser/qt/main.cpp

    r67089 r72089  
    2828
    2929#include "BrowserWindow.h"
     30#include <QLatin1String>
     31#include <QRegExp>
     32#include <qgraphicswkview.h>
    3033#include <QtGui>
    3134
    … …  
    3437
    3538    QStringList args = QApplication::arguments();
    36     QStringList urls = args;
    37     urls.removeAt(0);
     39    args.removeAt(0);
    3840
    39     if (urls.isEmpty()) {
     41    QGraphicsWKView::BackingStoreType backingStoreTypeToUse = QGraphicsWKView::Simple;
     42    int indexOfTiledOption;
     43    if ((indexOfTiledOption = args.indexOf(QRegExp(QLatin1String("-tiled")))) != -1) {
     44        backingStoreTypeToUse = QGraphicsWKView::Tiled;
     45        args.removeAt(indexOfTiledOption);
     46    }
     47
     48    if (args.isEmpty()) {
    4049        QString defaultUrl = QString("file://%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
    4150        if (QDir(defaultUrl).exists())
    42             urls.append(defaultUrl);
     51            args.append(defaultUrl);
    4352        else
    44             urls.append("http://www.google.com");
     53            args.append("http://www.google.com");
    4554    }
    4655
    47     BrowserWindow* window = new BrowserWindow();
    48     window->load(urls[0]);
     56    BrowserWindow* window = new BrowserWindow(backingStoreTypeToUse);
     57    window->load(args[0]);
    4958
    50     for (int i = 1; i < urls.size(); ++i)
    51         window->newWindow(urls[i]);
     59    for (int i = 1; i < args.size(); ++i)
     60        window->newWindow(args[i]);
    5261
    5362    app.exec();
Note: See TracChangeset for help on using the changeset viewer.