Make DataTransferItemList::length() const.

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

Just a const-correctness change.

Reviewed by Tony Chang.

No new tests since no functionality changed.

* dom/DataTransferItemList.h:
(DataTransferItemList):
* platform/chromium/DataTransferItemListChromium.cpp:
(WebCore::DataTransferItemListChromium::length):
* platform/chromium/DataTransferItemListChromium.h:
(DataTransferItemListChromium):
* platform/qt/DataTransferItemListQt.cpp:
(WebCore::DataTransferItemListQt::length):
* platform/qt/DataTransferItemListQt.h:
(DataTransferItemListQt):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 84766cc..7c9a302 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2012-01-24  Daniel Cheng  <dcheng@chromium.org>
+
+        Make DataTransferItemList::length() const.
+        https://bugs.webkit.org/show_bug.cgi?id=76946
+
+        Just a const-correctness change.
+
+        Reviewed by Tony Chang.
+
+        No new tests since no functionality changed.
+
+        * dom/DataTransferItemList.h:
+        (DataTransferItemList):
+        * platform/chromium/DataTransferItemListChromium.cpp:
+        (WebCore::DataTransferItemListChromium::length):
+        * platform/chromium/DataTransferItemListChromium.h:
+        (DataTransferItemListChromium):
+        * platform/qt/DataTransferItemListQt.cpp:
+        (WebCore::DataTransferItemListQt::length):
+        * platform/qt/DataTransferItemListQt.h:
+        (DataTransferItemListQt):
+
 2012-01-24  Tony Chang  <tony@chromium.org>
 
         REGRESSION(r103245): can't scroll left/up using scrollbar controls of overflowing elements

diff --git a/Source/WebCore/dom/DataTransferItemList.h b/Source/WebCore/dom/DataTransferItemList.h
index b87a183..58db063 100644 (file)
--- a/Source/WebCore/dom/DataTransferItemList.h
+++ b/Source/WebCore/dom/DataTransferItemList.h
@@ -48,7 +48,7 @@ class DataTransferItemList : public RefCounted<DataTransferItemList> {
 public:
     virtual ~DataTransferItemList() { }
 
-    virtual size_t length() = 0;
+    virtual size_t length() const = 0;
     virtual PassRefPtr<DataTransferItem> item(unsigned long index) = 0;
     virtual void deleteItem(unsigned long index, ExceptionCode&) = 0;
     virtual void clear() = 0;

diff --git a/Source/WebCore/platform/chromium/DataTransferItemListChromium.cpp b/Source/WebCore/platform/chromium/DataTransferItemListChromium.cpp
index 09e6c3a..56f0af0 100644 (file)
--- a/Source/WebCore/platform/chromium/DataTransferItemListChromium.cpp
+++ b/Source/WebCore/platform/chromium/DataTransferItemListChromium.cpp
@@ -58,7 +58,7 @@ DataTransferItemListChromium::DataTransferItemListChromium(PassRefPtr<Clipboard>
 {
 }
 
-size_t DataTransferItemListChromium::length()
+size_t DataTransferItemListChromium::length() const
 {
     if (m_owner->policy() == ClipboardNumb)
         return 0;

diff --git a/Source/WebCore/platform/chromium/DataTransferItemListChromium.h b/Source/WebCore/platform/chromium/DataTransferItemListChromium.h
index 92cd0bd..61bd167 100644 (file)
--- a/Source/WebCore/platform/chromium/DataTransferItemListChromium.h
+++ b/Source/WebCore/platform/chromium/DataTransferItemListChromium.h
@@ -50,7 +50,7 @@ class DataTransferItemListChromium : public DataTransferItemList {
 public:
     static PassRefPtr<DataTransferItemListChromium> create(PassRefPtr<Clipboard>, ScriptExecutionContext*);
 
-    virtual size_t length();
+    virtual size_t length() const;
     virtual PassRefPtr<DataTransferItem> item(unsigned long index);
     // FIXME: Implement V8DataTransferItemList::indexedPropertyDeleter to get this called.
     virtual void deleteItem(unsigned long index, ExceptionCode&);
@@ -65,7 +65,8 @@ private:
     RefPtr<Clipboard> m_owner;
     // Indirectly owned by our parent.
     ScriptExecutionContext* m_context;
-    Vector<RefPtr<DataTransferItem> > m_items;
+    // FIXME: m_items should not be mutable. This will be fixed by https://bugs.webkit.org/show_bug.cgi?id=76598
+    mutable Vector<RefPtr<DataTransferItem> > m_items;
 };
 
 } // namespace WebCore

diff --git a/Source/WebCore/platform/qt/DataTransferItemListQt.cpp b/Source/WebCore/platform/qt/DataTransferItemListQt.cpp
index 0681982..1806a7f 100644 (file)
--- a/Source/WebCore/platform/qt/DataTransferItemListQt.cpp
+++ b/Source/WebCore/platform/qt/DataTransferItemListQt.cpp
@@ -45,7 +45,7 @@ DataTransferItemListQt::DataTransferItemListQt(PassRefPtr<Clipboard> owner, Scri
 {
 }
 
-size_t DataTransferItemListQt::length()
+size_t DataTransferItemListQt::length() const
 {
     if (m_owner->policy() == ClipboardNumb)
         return 0;

diff --git a/Source/WebCore/platform/qt/DataTransferItemListQt.h b/Source/WebCore/platform/qt/DataTransferItemListQt.h
index c8a8dbc..d5c39a4 100644 (file)
--- a/Source/WebCore/platform/qt/DataTransferItemListQt.h
+++ b/Source/WebCore/platform/qt/DataTransferItemListQt.h
@@ -42,7 +42,7 @@ class DataTransferItemListQt : public DataTransferItemList {
 public:
     static PassRefPtr<DataTransferItemListQt> create(PassRefPtr<Clipboard>, ScriptExecutionContext*);
 
-    virtual size_t length();
+    virtual size_t length() const;
     virtual PassRefPtr<DataTransferItem> item(unsigned long index);
     virtual void deleteItem(unsigned long index, ExceptionCode&);
     virtual void clear();