Call the frame arguments for the javascript callbacks "originatingFrame"

Signed-off-by: Lars
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 256d40b2011b3951c007766a3251e9bc69e1c7d6..07b97a6e7e482121f6faa54ca1ed001bb6d56498 100644 (file)
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -203,12 +203,10 @@ protected:
     virtual QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
 
     virtual NavigationRequestResponse navigationRequested(QWebFrame *frame, const QWebNetworkRequest &request, NavigationType type);
-    // ### do we need the frame? maybe include "file dialog" in the name
-    virtual QString chooseFile(QWebFrame *frame, const QString& oldFile);
-    // ### can we unify the next 3 methods? do we need the frame?
-    virtual void javaScriptAlert(QWebFrame *frame, const QString& msg);
-    virtual bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
-    virtual bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
+    virtual QString chooseFile(QWebFrame *originatingFrame, const QString& oldFile);
+    virtual void javaScriptAlert(QWebFrame *originatingFrame, const QString& msg);
+    virtual bool javaScriptConfirm(QWebFrame *originatingFrame, const QString& msg);
+    virtual bool javaScriptPrompt(QWebFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result);
     virtual void javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString& sourceID);
 
     virtual QString userAgentFor(const QUrl& url) const;

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index cb12cfd97f9d2a243624ed10569ba038239d2091..cf869a5b73070d3294416085c9dbaf94df5ac1d5 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-04  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Lars.
+
+        Call the frame arguments for the javascript callbacks "originatingFrame"
+        
+
+        * Api/qwebpage.h:
+
 2008-01-04  Simon Hausmann  <hausmann@webkit.org>
 
         Reviewed by Lars.