1 files changed, 33 insertions, 3 deletions

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 5b978d8..2bbbc2a 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -46,6 +46,7 @@ class QWebFrameData;
 class QWebNetworkInterface;
 class QWebPluginFactory;
 class QWebHitTestResult;
+class QWebHistoryItem;
 
 namespace WebCore {
     class ChromeClientQt;
@@ -64,10 +65,12 @@ class QWEBKIT_EXPORT QWebPage : public QObject
     Q_PROPERTY(bool modified READ isModified)
     Q_PROPERTY(QString selectedText READ selectedText)
     Q_PROPERTY(QSize viewportSize READ viewportSize WRITE setViewportSize)
+    Q_PROPERTY(QSize fixedLayoutSize READ fixedLayoutSize WRITE setFixedLayoutSize)
+    Q_PROPERTY(bool useFixedLayout READ useFixedLayout WRITE setUseFixedLayout)
     Q_PROPERTY(bool forwardUnsupportedContent READ forwardUnsupportedContent WRITE setForwardUnsupportedContent)
     Q_PROPERTY(LinkDelegationPolicy linkDelegationPolicy READ linkDelegationPolicy WRITE setLinkDelegationPolicy)
     Q_PROPERTY(QPalette palette READ palette WRITE setPalette)
-    Q_PROPERTY(bool editable READ isEditable WRITE setEditable)
+    Q_PROPERTY(bool contentEditable READ isContentEditable WRITE setContentEditable)
     Q_ENUMS(LinkDelegationPolicy NavigationType WebAction)
 public:
     enum NavigationType {
@@ -145,6 +148,8 @@ public:
         InsertParagraphSeparator,
         InsertLineSeparator,
 
+        SelectAll,
+
         WebActionCount
     };
 
@@ -212,6 +217,12 @@ public:
     QSize viewportSize() const;
     void setViewportSize(const QSize &size) const;
 
+    QSize fixedLayoutSize() const;
+    void setFixedLayoutSize(const QSize &size) const;
+
+    bool useFixedLayout() const;
+    void setUseFixedLayout(bool useFixedLayout);
+
     virtual bool event(QEvent*);
     bool focusNextPrevChild(bool next);
 
@@ -228,8 +239,8 @@ public:
     void setPalette(const QPalette &palette);
     QPalette palette() const;
 
-    void setEditable(bool editable);
-    bool isEditable() const;
+    void setContentEditable(bool editable);
+    bool isContentEditable() const;
 
 #ifndef QT_NO_CONTEXTMENU
     bool swallowContextMenuEvent(QContextMenuEvent *event);
@@ -239,14 +250,29 @@ public:
     QMenu *createStandardContextMenu();
 
     enum Extension {
+        ChooseMultipleFilesExtension
     };
     class ExtensionOption
     {};
     class ExtensionReturn
     {};
+
+    class ChooseMultipleFilesExtensionOption : public ExtensionOption {
+    public:
+        QWebFrame *parentFrame;
+        QStringList suggestedFileNames;
+    };
+
+    class ChooseMultipleFilesExtensionReturn : public ExtensionReturn {
+    public:
+        QStringList fileNames;
+    };
+
     virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0);
     virtual bool supportsExtension(Extension extension) const;
 
+    inline QWebPagePrivate* handle() const { return d; }
+
 Q_SIGNALS:
     void loadStarted();
     void loadProgress(int progress);
@@ -274,6 +300,10 @@ Q_SIGNALS:
 
     void microFocusChanged();
     void contentsChanged();
+    void databaseQuotaExceeded(QWebFrame* frame, QString databaseName);
+
+    void saveFrameStateRequested(QWebFrame* frame, QWebHistoryItem* item);
+    void restoreFrameStateRequested(QWebFrame* frame);
 
 protected:
     virtual QWebPage *createWindow(WebWindowType type);