[Qt][WK2] Mark FINAL properties which can't be overridden by a subclass.

https://bugs.webkit.org/show_bug.cgi?id=68848

Reviewed by Andreas Kling.

The presence of the FINAL attribute indicates that the property will not be
overridden by a derived class. This can be used for performance optimizations
by QML.

* UIProcess/API/qt/qdesktopwebview.h:
* UIProcess/API/qt/qtouchwebpage.h:
* UIProcess/API/qt/qtouchwebview.h:
* UIProcess/API/qt/qwebnavigationcontroller.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96079 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 8a2167f..1adbca7 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2011-09-27  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt][WK2] Mark FINAL properties which can't be overridden by a subclass.
+        https://bugs.webkit.org/show_bug.cgi?id=68848
+
+        Reviewed by Andreas Kling.
+
+        The presence of the FINAL attribute indicates that the property will not be 
+        overridden by a derived class. This can be used for performance optimizations
+        by QML.
+
+        * UIProcess/API/qt/qdesktopwebview.h:
+        * UIProcess/API/qt/qtouchwebpage.h:
+        * UIProcess/API/qt/qtouchwebview.h:
+        * UIProcess/API/qt/qwebnavigationcontroller.h:
+
 2011-09-26  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 
         [Qt] Fix WK2 build after r96014

diff --git a/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h b/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h
index 1da1d77..859a99e 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h
+++ b/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h
@@ -52,7 +52,7 @@ class QWEBKIT_EXPORT QDesktopWebView : public QSGPaintedItem {
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QUrl url READ url NOTIFY urlChanged)
     Q_PROPERTY(int loadProgress READ loadProgress NOTIFY loadProgressChanged)
-    Q_PROPERTY(QWebNavigationController* navigation READ navigationController CONSTANT)
+    Q_PROPERTY(QWebNavigationController* navigation READ navigationController CONSTANT FINAL)
     Q_ENUMS(NavigationPolicy)
     Q_ENUMS(ErrorType)
 public:

diff --git a/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h b/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h
index decc637..10a8cb2 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h
+++ b/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h
@@ -40,7 +40,7 @@ class QWEBKIT_EXPORT QTouchWebPage : public QSGItem {
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QUrl url READ url NOTIFY urlChanged)
     Q_PROPERTY(int loadProgress READ loadProgress NOTIFY loadProgressChanged)
-    Q_PROPERTY(QWebNavigationController* navigation READ navigationController CONSTANT)
+    Q_PROPERTY(QWebNavigationController* navigation READ navigationController CONSTANT FINAL)
     Q_ENUMS(ErrorType)
 public:
     enum ErrorType {

diff --git a/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h b/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h
index ce23f4f..bd555e8 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h
+++ b/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h
@@ -35,7 +35,7 @@ class TouchViewInterface;
 class QWEBKIT_EXPORT QTouchWebView : public QSGItem
 {
     Q_OBJECT
-    Q_PROPERTY(QTouchWebPage* page READ page CONSTANT)
+    Q_PROPERTY(QTouchWebPage* page READ page CONSTANT FINAL)
 
 public:
     QTouchWebView(QSGItem* parent = 0);

diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationcontroller.h b/Source/WebKit2/UIProcess/API/qt/qwebnavigationcontroller.h
index 5d3e583..57ab747 100644 (file)
--- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationcontroller.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationcontroller.h
@@ -35,10 +35,10 @@ class QWebNavigationControllerPrivate;
 
 class QWEBKIT_EXPORT QWebNavigationController : public QObject {
     Q_OBJECT
-    Q_PROPERTY(QAction* backAction READ backAction CONSTANT)
-    Q_PROPERTY(QAction* forwardAction READ forwardAction CONSTANT)
-    Q_PROPERTY(QAction* stopAction READ stopAction CONSTANT)
-    Q_PROPERTY(QAction* reloadAction READ reloadAction CONSTANT)
+    Q_PROPERTY(QAction* backAction READ backAction CONSTANT FINAL)
+    Q_PROPERTY(QAction* forwardAction READ forwardAction CONSTANT FINAL)
+    Q_PROPERTY(QAction* stopAction READ stopAction CONSTANT FINAL)
+    Q_PROPERTY(QAction* reloadAction READ reloadAction CONSTANT FINAL)
 public:
     QWebNavigationController(QtWebPageProxy*);
     ~QWebNavigationController();