Changeset 561 for trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.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/qwebframe.h (modified) (13 diffs)

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

@@ -1 +1 @@
 /*
-    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
     Copyright (C) 2007 Staikos Computing Services Inc.
 
@@ -50 +50 @@
 class QWebHistoryItem;
 class QWebSecurityOrigin;
+
+
 
 namespace WebCore {
@@ -60 +62 @@
 class QWebFrame;
 
-class QWEBKIT_EXPORT QWebHitTestResult
-{
+class QWEBKIT_EXPORT QWebHitTestResult {
 public:
     QWebHitTestResult();
@@ -72 +73 @@
     QPoint pos() const;
     QRect boundingRect() const;
+
     QString title() const;
 
@@ -78 +80 @@
     QUrl linkTitle() const;
     QWebFrame *linkTargetFrame() const;
+
 
     QString alternateText() const; // for img, area, input and applet
@@ -86 +89 @@
     bool isContentEditable() const;
     bool isContentSelected() const;
+
+
 
     QWebFrame *frame() const;
@@ -98 +103 @@
 };
 
-class QWEBKIT_EXPORT QWebFrame : public QObject
-{
+class QWEBKIT_EXPORT QWebFrame : public QObject {
     Q_OBJECT
     Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
@@ -105 +109 @@
     Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
+
+
     Q_PROPERTY(QIcon icon READ icon)
     Q_PROPERTY(QSize contentsSize READ contentsSize)
     Q_PROPERTY(QPoint scrollPosition READ scrollPosition WRITE setScrollPosition)
+
 private:
     QWebFrame(QWebPage *parent, QWebFrameData *frameData);
@@ -136 +143 @@
     void setUrl(const QUrl &url);
     QUrl url() const;
+
+
     QIcon icon() const;
     QMultiMap<QString, QString> metaData() const;
@@ -151 +160 @@
     int scrollBarMinimum(Qt::Orientation orientation) const;
     int scrollBarMaximum(Qt::Orientation orientation) const;
+
 
     void scroll(int, int);
@@ -156 +166 @@
     void setScrollPosition(const QPoint &pos);
 
-    void render(QPainter *painter, const QRegion &clip);
-    void render(QPainter *painter);
+    enum RenderLayer {
+        ContentsLayer = 0x10,
+        ScrollBarLayer = 0x20,
+        PanIconLayer = 0x40,
+
+        AllLayers = 0xff
+    };
+
+    void render(QPainter*);
+    void render(QPainter*, const QRegion& clip);
+    void render(QPainter*, RenderLayer layer, const QRegion& clip = QRegion());
 
     void setTextSizeMultiplier(qreal factor);
@@ -164 +183 @@
     qreal zoomFactor() const;
     void setZoomFactor(qreal factor);
+
+
+
 
     QPoint pos() const;
     QRect geometry() const;
     QSize contentsSize() const;
+
+
+
+
 
     QWebHitTestResult hitTestContent(const QPoint &pos) const;
@@ -191 +217 @@
 
     void iconChanged();
+
+
+
+
+
 
 private: