Title: [173891] trunk/Source/WebCore
Revision
173891
Author
cdu...@apple.com
Date
2014-09-23 14:21:17 -0700 (Tue, 23 Sep 2014)

Log Message

Have DataTransfer::files() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137039

Reviewed by Ryosuke Niwa.

Have DataTransfer::files() return a reference instead of a pointer as
it can never return null.

No new tests, no behavior change.

* dom/DataTransfer.cpp:
(WebCore::DataTransfer::files):
* dom/DataTransfer.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (173890 => 173891)


--- trunk/Source/WebCore/ChangeLog	2014-09-23 21:17:28 UTC (rev 173890)
+++ trunk/Source/WebCore/ChangeLog	2014-09-23 21:21:17 UTC (rev 173891)
@@ -1,5 +1,21 @@
 2014-09-23  Chris Dumez  <cdu...@apple.com>
 
+        Have DataTransfer::files() return a reference
+        https://bugs.webkit.org/show_bug.cgi?id=137039
+
+        Reviewed by Ryosuke Niwa.
+
+        Have DataTransfer::files() return a reference instead of a pointer as
+        it can never return null.
+
+        No new tests, no behavior change.
+
+        * dom/DataTransfer.cpp:
+        (WebCore::DataTransfer::files):
+        * dom/DataTransfer.h:
+
+2014-09-23  Chris Dumez  <cdu...@apple.com>
+
         Have NamedNodeMap::element() and DOMStringMap::element() return a reference
         https://bugs.webkit.org/show_bug.cgi?id=137040
 

Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (173890 => 173891)


--- trunk/Source/WebCore/dom/DataTransfer.cpp	2014-09-23 21:17:28 UTC (rev 173890)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp	2014-09-23 21:21:17 UTC (rev 173891)
@@ -159,7 +159,7 @@
     return m_pasteboard->types();
 }
 
-FileList* DataTransfer::files() const
+FileList& DataTransfer::files() const
 {
     bool newlyCreatedFileList = !m_fileList;
     if (!m_fileList)
@@ -167,13 +167,13 @@
 
     if (!canReadData()) {
         m_fileList->clear();
-        return m_fileList.get();
+        return *m_fileList;
     }
 
 #if ENABLE(DRAG_SUPPORT)
     if (m_forDrag && !m_forFileDrag) {
         ASSERT(m_fileList->isEmpty());
-        return m_fileList.get();
+        return *m_fileList;
     }
 #endif
 
@@ -181,7 +181,7 @@
         for (const String& filename : m_pasteboard->readFilenames())
             m_fileList->append(File::create(filename));
     }
-    return m_fileList.get();
+    return *m_fileList;
 }
 
 bool DataTransfer::hasFileOfType(const String& type)

Modified: trunk/Source/WebCore/dom/DataTransfer.h (173890 => 173891)


--- trunk/Source/WebCore/dom/DataTransfer.h	2014-09-23 21:17:28 UTC (rev 173890)
+++ trunk/Source/WebCore/dom/DataTransfer.h	2014-09-23 21:21:17 UTC (rev 173891)
@@ -56,7 +56,7 @@
 
         Vector<String> types() const;
 
-        FileList* files() const;
+        FileList& files() const;
 
         void clearData(const String& type);
         void clearData();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to