[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit ee24598d8aa990b83977bbca236557202d949401
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 29 00:50:00 2002 +0000

    	Fix Radar 2890340 (JavaScript doesn't work)
    
    	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::executeScript): Implement
    	the other overloaded version of this function. This is needed for
    	JavaScript to work.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@882 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index affb875..b88f2c6 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-03-28  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix Radar 2890340 (JavaScript doesn't work)
+
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::executeScript): Implement
+	the other overloaded version of this function. This is needed for
+	JavaScript to work.
+
 2002-03-28  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/misc/loader.h: Added API for looking at the contents of the
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index affb875..b88f2c6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-03-28  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix Radar 2890340 (JavaScript doesn't work)
+
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::executeScript): Implement
+	the other overloaded version of this function. This is needed for
+	JavaScript to work.
+
 2002-03-28  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/misc/loader.h: Added API for looking at the contents of the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index affb875..b88f2c6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-03-28  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix Radar 2890340 (JavaScript doesn't work)
+
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::executeScript): Implement
+	the other overloaded version of this function. This is needed for
+	JavaScript to work.
+
 2002-03-28  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/misc/loader.h: Added API for looking at the contents of the
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index a881b0b..b2e884c 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -335,6 +335,11 @@ QVariant KHTMLPart::executeScript( const QString &script )
 
 QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
 {
+    return executeScript(QString::null, 0, n, script);
+}
+
+QVariant KHTMLPart::executeScript(QString filename, int baseLine, const DOM::Node &n, const QString &script)
+{
 // DUBIOUS, rather than executing the script this document should be
 // passed to the interpreter.
     KJSProxy *proxy = jScript();
@@ -342,7 +347,7 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     if (!proxy || proxy->paused())
       return QVariant();
     d->m_runningScripts++;
-    QVariant ret = proxy->evaluate( QString::null, 0, script, n );
+    QVariant ret = proxy->evaluate( filename, baseLine, script, n );
     d->m_runningScripts--;
 
     // FIXME: implement
@@ -357,13 +362,6 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     return ret;
 }
 
-QVariant KHTMLPart::executeScript(QString filename, int baseLine, const DOM::Node &n, const QString &script)
-{
-  // FIXME:MERGE need to implement this, I think
-  _logNotYetImplemented();
-  return QVariant();
-}
-
 QVariant KHTMLPart::executeScheduledScript()
 {
     _logNeverImplemented();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index a881b0b..b2e884c 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -335,6 +335,11 @@ QVariant KHTMLPart::executeScript( const QString &script )
 
 QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
 {
+    return executeScript(QString::null, 0, n, script);
+}
+
+QVariant KHTMLPart::executeScript(QString filename, int baseLine, const DOM::Node &n, const QString &script)
+{
 // DUBIOUS, rather than executing the script this document should be
 // passed to the interpreter.
     KJSProxy *proxy = jScript();
@@ -342,7 +347,7 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     if (!proxy || proxy->paused())
       return QVariant();
     d->m_runningScripts++;
-    QVariant ret = proxy->evaluate( QString::null, 0, script, n );
+    QVariant ret = proxy->evaluate( filename, baseLine, script, n );
     d->m_runningScripts--;
 
     // FIXME: implement
@@ -357,13 +362,6 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     return ret;
 }
 
-QVariant KHTMLPart::executeScript(QString filename, int baseLine, const DOM::Node &n, const QString &script)
-{
-  // FIXME:MERGE need to implement this, I think
-  _logNotYetImplemented();
-  return QVariant();
-}
-
 QVariant KHTMLPart::executeScheduledScript()
 {
     _logNeverImplemented();
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index a881b0b..b2e884c 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -335,6 +335,11 @@ QVariant KHTMLPart::executeScript( const QString &script )
 
 QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
 {
+    return executeScript(QString::null, 0, n, script);
+}
+
+QVariant KHTMLPart::executeScript(QString filename, int baseLine, const DOM::Node &n, const QString &script)
+{
 // DUBIOUS, rather than executing the script this document should be
 // passed to the interpreter.
     KJSProxy *proxy = jScript();
@@ -342,7 +347,7 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     if (!proxy || proxy->paused())
       return QVariant();
     d->m_runningScripts++;
-    QVariant ret = proxy->evaluate( QString::null, 0, script, n );
+    QVariant ret = proxy->evaluate( filename, baseLine, script, n );
     d->m_runningScripts--;
 
     // FIXME: implement
@@ -357,13 +362,6 @@ QVariant KHTMLPart::executeScript( const DOM::Node &n, const QString &script )
     return ret;
 }
 
-QVariant KHTMLPart::executeScript(QString filename, int baseLine, const DOM::Node &n, const QString &script)
-{
-  // FIXME:MERGE need to implement this, I think
-  _logNotYetImplemented();
-  return QVariant();
-}
-
 QVariant KHTMLPart::executeScheduledScript()
 {
     _logNeverImplemented();

-- 
WebKit Debian packaging