summaryrefslogtreecommitdiffstats
path: root/WebKitTools/QtTestBrowser/launcherwindow.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-09-29 17:32:26 +0100
committerSteve Block <steveblock@google.com>2010-09-29 17:35:08 +0100
commit68513a70bcd92384395513322f1b801e7bf9c729 (patch)
tree161b50f75a5921d61731bb25e730005994fcec85 /WebKitTools/QtTestBrowser/launcherwindow.h
parentfd5c6425ce58eb75211be7718d5dee960842a37e (diff)
downloadexternal_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip
external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz
external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebKitTools/QtTestBrowser/launcherwindow.h')
-rw-r--r--WebKitTools/QtTestBrowser/launcherwindow.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.h b/WebKitTools/QtTestBrowser/launcherwindow.h
index 65f390d..d3b7f8e 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.h
+++ b/WebKitTools/QtTestBrowser/launcherwindow.h
@@ -148,8 +148,6 @@ protected slots:
/* void dumpPlugins() */
void dumpHtml();
- void initializeView();
-
void setTouchMocking(bool on);
void toggleWebView(bool graphicsBased);
void toggleAcceleratedCompositing(bool toggle);
@@ -183,11 +181,13 @@ signals:
private:
void init();
- bool isGraphicsBased() const;
+ void initializeView();
void createChrome();
void applyPrefs();
void applyZoom();
+ bool isGraphicsBased() const;
+
private:
static QVector<int> m_zoomLevels;
int m_currentZoom;