[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

commit-queue at webkit.org commit-queue at webkit.org
Mon Feb 21 00:08:29 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 28926bc1e6dc6b7e5560a34084ed1f93f95d9ff3
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 12:46:50 2011 +0000

    2011-01-28  Ilya Sherman  <isherman at chromium.org>
    
            Reviewed by Andreas Kling.
    
            Const-correct HTMLSelectElement and WebSelectElement
            https://bugs.webkit.org/show_bug.cgi?id=53293
    
            * html/HTMLSelectElement.cpp:
            (WebCore::HTMLSelectElement::value): const.
            * html/HTMLSelectElement.h:
    2011-01-28  Ilya Sherman  <isherman at chromium.org>
    
            Reviewed by Andreas Kling.
    
            Const-correct HTMLSelectElement and WebSelectElement
            https://bugs.webkit.org/show_bug.cgi?id=53293
    
            * public/WebSelectElement.h:
            * src/WebSelectElement.cpp:
            (WebKit::WebSelectElement::value): const.
            (WebKit::WebSelectElement::listItems): const.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4084151..6ead7e1 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-28  Ilya Sherman  <isherman at chromium.org>
+
+        Reviewed by Andreas Kling.
+
+        Const-correct HTMLSelectElement and WebSelectElement
+        https://bugs.webkit.org/show_bug.cgi?id=53293
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::value): const.
+        * html/HTMLSelectElement.h:
+
 2011-01-28  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r76893.
diff --git a/Source/WebCore/html/HTMLSelectElement.cpp b/Source/WebCore/html/HTMLSelectElement.cpp
index c7f47f2..da72aa9 100644
--- a/Source/WebCore/html/HTMLSelectElement.cpp
+++ b/Source/WebCore/html/HTMLSelectElement.cpp
@@ -206,7 +206,7 @@ void HTMLSelectElement::remove(HTMLOptionElement* option)
     option->remove(ec);
 }
 
-String HTMLSelectElement::value()
+String HTMLSelectElement::value() const
 {
     const Vector<Element*>& items = listItems();
     for (unsigned i = 0; i < items.size(); i++) {
diff --git a/Source/WebCore/html/HTMLSelectElement.h b/Source/WebCore/html/HTMLSelectElement.h
index 42e8963..837675c 100644
--- a/Source/WebCore/html/HTMLSelectElement.h
+++ b/Source/WebCore/html/HTMLSelectElement.h
@@ -55,7 +55,7 @@ public:
     void remove(int index);
     void remove(HTMLOptionElement*);
 
-    String value();
+    String value() const;
     void setValue(const String&);
 
     PassRefPtr<HTMLOptionsCollection> options();
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 49d15ae..e468ac8 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-28  Ilya Sherman  <isherman at chromium.org>
+
+        Reviewed by Andreas Kling.
+
+        Const-correct HTMLSelectElement and WebSelectElement
+        https://bugs.webkit.org/show_bug.cgi?id=53293
+
+        * public/WebSelectElement.h:
+        * src/WebSelectElement.cpp:
+        (WebKit::WebSelectElement::value): const.
+        (WebKit::WebSelectElement::listItems): const.
+
 2011-01-27  Finnur Thorarinsson  <finnur.webkit at gmail.com>
 
         Reviewed by Ojan Vafai.
diff --git a/Source/WebKit/chromium/public/WebSelectElement.h b/Source/WebKit/chromium/public/WebSelectElement.h
index 97d3a78..5cea39a 100644
--- a/Source/WebKit/chromium/public/WebSelectElement.h
+++ b/Source/WebKit/chromium/public/WebSelectElement.h
@@ -55,8 +55,8 @@ public:
     void assign(const WebSelectElement& element) { WebFormControlElement::assign(element); }
 
     WEBKIT_API void setValue(const WebString&);
-    WEBKIT_API WebString value();
-    WEBKIT_API WebVector<WebElement> listItems();
+    WEBKIT_API WebString value() const;
+    WEBKIT_API WebVector<WebElement> listItems() const;
 
 #if WEBKIT_IMPLEMENTATION
     WebSelectElement(const WTF::PassRefPtr<WebCore::HTMLSelectElement>&);
diff --git a/Source/WebKit/chromium/src/WebSelectElement.cpp b/Source/WebKit/chromium/src/WebSelectElement.cpp
index 79a4d85..7aac44a 100644
--- a/Source/WebKit/chromium/src/WebSelectElement.cpp
+++ b/Source/WebKit/chromium/src/WebSelectElement.cpp
@@ -46,14 +46,14 @@ void WebSelectElement::setValue(const WebString& value)
     unwrap<HTMLSelectElement>()->setValue(value);
 }
 
-WebString WebSelectElement::value()
+WebString WebSelectElement::value() const
 {
-    return unwrap<HTMLSelectElement>()->value();
+    return constUnwrap<HTMLSelectElement>()->value();
 }
 
-WebVector<WebElement> WebSelectElement::listItems()
+WebVector<WebElement> WebSelectElement::listItems() const
 {
-    const Vector<Element*>& sourceItems = unwrap<HTMLSelectElement>()->listItems();
+    const Vector<Element*>& sourceItems = constUnwrap<HTMLSelectElement>()->listItems();
     WebVector<WebElement> items(sourceItems.size());
     for (size_t i = 0; i < sourceItems.size(); ++i)
         items[i] = WebElement(static_cast<HTMLElement*>(sourceItems[i]));

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list