Changeset 561 for trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h (modified) (14 diffs)

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h

@@ -26 +26 @@
 
 #include <QtCore/qobject.h>
+
 #include <QtGui/qwidget.h>
 
@@ -31 +32 @@
 class QNetworkProxy;
 class QUndoStack;
-class QUrl;
 class QMenu;
 class QNetworkRequest;
@@ -38 +38 @@
 QT_END_NAMESPACE
 
+
 class QWebFrame;
 class QWebNetworkRequest;
@@ -53 +54 @@
     class EditorClientQt;
     class FrameLoaderClientQt;
-    class FrameLoadRequest;
     class InspectorClientQt;
     class ResourceHandle;
     class HitTestResult;
+
+
+
 }
 
-class QWEBKIT_EXPORT QWebPage : public QObject
-{
+class QWEBKIT_EXPORT QWebPage : public QObject {
     Q_OBJECT
 
@@ -66 +68 @@
     Q_PROPERTY(QString selectedText READ selectedText)
     Q_PROPERTY(QSize viewportSize READ viewportSize WRITE setViewportSize)
+
     Q_PROPERTY(bool forwardUnsupportedContent READ forwardUnsupportedContent WRITE setForwardUnsupportedContent)
     Q_PROPERTY(LinkDelegationPolicy linkDelegationPolicy READ linkDelegationPolicy WRITE setLinkDelegationPolicy)
@@ -148 +151 @@
 
         SelectAll,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
         WebActionCount
@@ -155 +175 @@
         FindBackward = 1,
         FindCaseSensitively = 2,
-        FindWrapsAroundDocument = 4
+        FindWrapsAroundDocument = 4,
+        HighlightAllOccurrences = 8
     };
     Q_DECLARE_FLAGS(FindFlags, FindFlag)
@@ -175 +196 @@
     QWebFrame *mainFrame() const;
     QWebFrame *currentFrame() const;
+
 
     QWebHistory *history() const;
@@ -216 +238 @@
     void setViewportSize(const QSize &size) const;
 
+
+
+
     virtual bool event(QEvent*);
     bool focusNextPrevChild(bool next);
@@ -243 +268 @@
 
     enum Extension {
-        ChooseMultipleFilesExtension
+        ChooseMultipleFilesExtension,
+        ErrorPageExtension
     };
     class ExtensionOption
@@ -261 +287 @@
     };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     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:
@@ -318 +367 @@
     Q_PRIVATE_SLOT(d, void _q_onLoadProgressChanged(int))
     Q_PRIVATE_SLOT(d, void _q_webActionTriggered(bool checked))
+
+
     QWebPagePrivate *d;
 
@@ -323 +374 @@
     friend class QWebPagePrivate;
     friend class QWebView;
+
+
     friend class WebCore::ChromeClientQt;
     friend class WebCore::EditorClientQt;
@@ -328 +381 @@
     friend class WebCore::InspectorClientQt;
     friend class WebCore::ResourceHandle;
+
 };