[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7f664819468cc04f413fd1edc08bf2a1c21b8531
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 28 22:19:28 2009 +0000

    2009-10-28  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Eric Seidel.
    
            [Qt] WebFrame::counterValueForElementById must not be exposed
            https://bugs.webkit.org/show_bug.cgi?id=30882
    
            * Api/qwebframe.cpp:
            (qt_drt_counterValueForElementById):
            * Api/qwebframe.h:
    2009-10-28  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Eric Seidel.
    
            [Qt] WebFrame::counterValueForElementById must not be exposed
            https://bugs.webkit.org/show_bug.cgi?id=30882
    
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::counterValueForElementById):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 5996b74..606dae4 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -185,6 +185,17 @@ void QWEBKIT_EXPORT qt_drt_garbageCollector_collectOnAlternateThread(bool waitUn
     gcController().garbageCollectOnAlternateThreadForDebugging(waitUntilDone);
 }
 
+// Returns the value of counter in the element specified by \a id.
+QString QWEBKIT_EXPORT qt_drt_counterValueForElementById(QWebFrame* qFrame, const QString& id)
+{
+    Frame* frame = QWebFramePrivate::core(qFrame);
+    if (Document* document = frame->document()) {
+        Element* element = document->getElementById(id);
+        return WebCore::counterValueForElement(element);
+    }
+    return QString();
+}
+
 QWebFrameData::QWebFrameData(WebCore::Page* parentPage, WebCore::Frame* parentFrame,
                              WebCore::HTMLFrameOwnerElement* ownerFrameElement,
                              const WebCore::String& frameName)
@@ -476,19 +487,6 @@ QString QWebFrame::renderTreeDump() const
 }
 
 /*!
-    Returns the value of counter in the element specified by \a id.
-*/
-QString QWebFrame::counterValueForElementById(const QString &id) const
-{
-    if (Document *document = d->frame->document()) {
-        Element *element = document->getElementById(id);
-        return WebCore::counterValueForElement(element);
-    }
-    return QString();
-
-}
-
-/*!
     \property QWebFrame::title
     \brief the title of the frame as defined by the HTML &lt;title&gt; element
 
diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h
index 89e0be2..08285f8 100644
--- a/WebKit/qt/Api/qwebframe.h
+++ b/WebKit/qt/Api/qwebframe.h
@@ -138,7 +138,6 @@ public:
     QString toHtml() const;
     QString toPlainText() const;
     QString renderTreeDump() const;
-    QString counterValueForElementById(const QString &id) const;
 
     QString title() const;
     void setUrl(const QUrl &url);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3f93e6b..67cf7f3 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-28  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] WebFrame::counterValueForElementById must not be exposed
+        https://bugs.webkit.org/show_bug.cgi?id=30882
+
+        * Api/qwebframe.cpp:
+        (qt_drt_counterValueForElementById):
+        * Api/qwebframe.h:
+
 2009-10-27  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fb66fbe..4aea52b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-28  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] WebFrame::counterValueForElementById must not be exposed
+        https://bugs.webkit.org/show_bug.cgi?id=30882
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::counterValueForElementById):
+
 2009-10-28  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Rubberstamped by Oliver Hunt.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 8a7b869..b8de6a5 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -40,6 +40,7 @@ extern bool qt_drt_pauseAnimation(QWebFrame*, const QString& name, double time,
 extern bool qt_drt_pauseTransitionOfProperty(QWebFrame*, const QString& name, double time, const QString& elementId);
 extern int qt_drt_numberOfActiveAnimations(QWebFrame*);
 extern void qt_drt_whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
+extern QString qt_drt_counterValueForElementById(QWebFrame* qFrame, const QString& id);
 
 LayoutTestController::LayoutTestController(WebCore::DumpRenderTree* drt)
     : QObject()
@@ -111,7 +112,7 @@ void LayoutTestController::waitUntilDone()
 
 QString LayoutTestController::counterValueForElementById(const QString& id)
 {
-    return m_drt->webPage()->mainFrame()->counterValueForElementById(id);
+    return qt_drt_counterValueForElementById(m_drt->webPage()->mainFrame(), id);
 }
 
 void LayoutTestController::keepWebHistory()

-- 
WebKit Debian packaging