Changeset 89707 in webkit

Timestamp:

Jun 24, 2011, 3:05:16 PM (14 years ago)

Author:

tony@chromium.org

Message:

2011-06-24 Tony Chang <​tony@chromium.org>

Reviewed by Adam Barth.

Pass Strings by const reference to functions
​https://bugs.webkit.org/show_bug.cgi?id=63341

Note that since Strings hold a RefPtr to StringImpl, passing Strings
by value isn't horrible, but it does cause ref count churn and using
const references is more consistent with the rest of the code base.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::addHTTPOriginIfNeeded): Rework the code to not

change the value of the passed in String.

• loader/FrameLoader.h:
• platform/win/ClipboardUtilitiesWin.cpp: (WebCore::setFileDescriptorData):
• platform/win/ClipboardUtilitiesWin.h:
• storage/DatabaseTracker.h:
• storage/IDBLevelDBBackingStore.cpp: (WebCore::IDBLevelDBBackingStore::IDBLevelDBBackingStore):
• storage/IDBLevelDBBackingStore.h:
• storage/IDBSQLiteBackingStore.cpp: (WebCore::IDBSQLiteBackingStore::IDBSQLiteBackingStore):
• storage/IDBSQLiteBackingStore.h:
• storage/chromium/DatabaseTrackerChromium.cpp: (WebCore::DatabaseTracker::getOpenDatabases):
• svg/SVGPaint.cpp: (WebCore::SVGPaint::SVGPaint):
• svg/SVGPaint.h:
• svg/animation/SMILTimeContainer.cpp: (WebCore::SMILTimeContainer::updateAnimations):
• svg/animation/SMILTimeContainer.h:
• websockets/ThreadableWebSocketChannelClientWrapper.cpp: (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback):
• websockets/ThreadableWebSocketChannelClientWrapper.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/FrameLoader.h (modified) (1 diff)
• platform/win/ClipboardUtilitiesWin.cpp (modified) (1 diff)
• platform/win/ClipboardUtilitiesWin.h (modified) (1 diff)
• storage/DatabaseTracker.h (modified) (1 diff)
• storage/IDBLevelDBBackingStore.cpp (modified) (1 diff)
• storage/IDBLevelDBBackingStore.h (modified) (1 diff)
• storage/IDBSQLiteBackingStore.cpp (modified) (1 diff)
• storage/IDBSQLiteBackingStore.h (modified) (1 diff)
• storage/chromium/DatabaseTrackerChromium.cpp (modified) (1 diff)
• svg/SVGPaint.cpp (modified) (1 diff)
• svg/SVGPaint.h (modified) (1 diff)
• svg/animation/SMILTimeContainer.cpp (modified) (1 diff)
• svg/animation/SMILTimeContainer.h (modified) (1 diff)
• websockets/ThreadableWebSocketChannelClientWrapper.cpp (modified) (1 diff)
• websockets/ThreadableWebSocketChannelClientWrapper.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-24  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Pass Strings by const reference to functions
+        https://bugs.webkit.org/show_bug.cgi?id=63341
+
+        Note that since Strings hold a RefPtr to StringImpl, passing Strings
+        by value isn't horrible, but it does cause ref count churn and using
+        const references is more consistent with the rest of the code base.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::addHTTPOriginIfNeeded): Rework the code to not
+            change the value of the passed in String.
+        * loader/FrameLoader.h:
+        * platform/win/ClipboardUtilitiesWin.cpp:
+        (WebCore::setFileDescriptorData):
+        * platform/win/ClipboardUtilitiesWin.h:
+        * storage/DatabaseTracker.h:
+        * storage/IDBLevelDBBackingStore.cpp:
+        (WebCore::IDBLevelDBBackingStore::IDBLevelDBBackingStore):
+        * storage/IDBLevelDBBackingStore.h:
+        * storage/IDBSQLiteBackingStore.cpp:
+        (WebCore::IDBSQLiteBackingStore::IDBSQLiteBackingStore):
+        * storage/IDBSQLiteBackingStore.h:
+        * storage/chromium/DatabaseTrackerChromium.cpp:
+        (WebCore::DatabaseTracker::getOpenDatabases):
+        * svg/SVGPaint.cpp:
+        (WebCore::SVGPaint::SVGPaint):
+        * svg/SVGPaint.h:
+        * svg/animation/SMILTimeContainer.cpp:
+        (WebCore::SMILTimeContainer::updateAnimations):
+        * svg/animation/SMILTimeContainer.h:
+        * websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+        (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback):
+        * websockets/ThreadableWebSocketChannelClientWrapper.h:
+
 2011-06-24  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2527 +2527 @@
 }
 
-void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest& request, String origin)
+void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest& request, const String& origin)
 {
     if (!request.httpOrigin().isEmpty())
@@ -2547 +2547 @@
         // If we don't know what origin header to attach, we attach the value
         // for an empty origin.
-        origin = SecurityOrigin::createEmpty()->toString();
+        request.setHTTPOrigin(SecurityOrigin::createEmpty()->toString());
+        return;
     }
 

trunk/Source/WebCore/loader/FrameLoader.h

@@ -203 +203 @@
     void addExtraFieldsToMainResourceRequest(ResourceRequest&);
     
-    static void addHTTPOriginIfNeeded(ResourceRequest&, String origin);
+    static void addHTTPOriginIfNeeded(ResourceRequest&, const String& origin);
 
     FrameLoaderClient* client() const { return m_client; }

trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp

@@ -409 +409 @@
 }
 
-void setFileDescriptorData(IDataObject* dataObject, int size, String pathname)
+void setFileDescriptorData(IDataObject* dataObject, int size, const String& pathname)
 {
     STGMEDIUM medium = { 0 };

trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.h

@@ -81 +81 @@
 void getFileDescriptorData(IDataObject*, int& size, String& pathname);
 void getFileContentData(IDataObject*, int size, void* dataBlob);
-void setFileDescriptorData(IDataObject*, int size, String pathname);
+void setFileDescriptorData(IDataObject*, int size, const String& pathname);
 void setFileContentData(IDataObject*, int size, void* dataBlob);
 

trunk/Source/WebCore/storage/DatabaseTracker.h

@@ -174 +174 @@
 #else
 public:
-    void getOpenDatabases(String originIdentifier, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases);
+    void getOpenDatabases(const String& originIdentifier, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases);
 
 private:

trunk/Source/WebCore/storage/IDBLevelDBBackingStore.cpp

@@ -116 +116 @@
 }
 
-IDBLevelDBBackingStore::IDBLevelDBBackingStore(String identifier, IDBFactoryBackendImpl* factory, PassOwnPtr<LevelDBDatabase> db)
+IDBLevelDBBackingStore::IDBLevelDBBackingStore(const String& identifier, IDBFactoryBackendImpl* factory, PassOwnPtr<LevelDBDatabase> db)
     : m_identifier(identifier)
     , m_factory(factory)

trunk/Source/WebCore/storage/IDBLevelDBBackingStore.h

@@ -80 +80 @@
 
 private:
-    IDBLevelDBBackingStore(String identifier, IDBFactoryBackendImpl*, PassOwnPtr<LevelDBDatabase>);
+    IDBLevelDBBackingStore(const String& identifier, IDBFactoryBackendImpl*, PassOwnPtr<LevelDBDatabase>);
 
     String m_identifier;

trunk/Source/WebCore/storage/IDBSQLiteBackingStore.cpp

@@ -40 +40 @@
 namespace WebCore {
 
-IDBSQLiteBackingStore::IDBSQLiteBackingStore(String identifier, IDBFactoryBackendImpl* factory)
+IDBSQLiteBackingStore::IDBSQLiteBackingStore(const String& identifier, IDBFactoryBackendImpl* factory)
     : m_identifier(identifier)
     , m_factory(factory)

trunk/Source/WebCore/storage/IDBSQLiteBackingStore.h

@@ -75 +75 @@
 
 private:
-    IDBSQLiteBackingStore(String identifier, IDBFactoryBackendImpl*);
+    IDBSQLiteBackingStore(const String& identifier, IDBFactoryBackendImpl*);
 
     SQLiteDatabase m_db;

trunk/Source/WebCore/storage/chromium/DatabaseTrackerChromium.cpp

@@ -153 +153 @@
 }
 
-void DatabaseTracker::getOpenDatabases(String originIdentifier, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases)
+void DatabaseTracker::getOpenDatabases(const String& originIdentifier, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases)
 {
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);

trunk/Source/WebCore/svg/SVGPaint.cpp

@@ -54 +54 @@
 }
 
-SVGPaint::SVGPaint(const SVGPaintType& paintType, String uri)
+SVGPaint::SVGPaint(const SVGPaintType& paintType, const String& uri)
     : SVGColor(colorTypeForPaintType(paintType))
     , m_paintType(paintType)

trunk/Source/WebCore/svg/SVGPaint.h

@@ -105 +105 @@
 
 private:
-    SVGPaint(const SVGPaintType&, String uri = String());
+    SVGPaint(const SVGPaintType&, const String& uri = String());
 
     virtual bool isSVGPaint() const { return true; }

trunk/Source/WebCore/svg/animation/SMILTimeContainer.cpp

@@ -220 +220 @@
 }
 
-void SMILTimeContainer::updateAnimations(SMILTime elapsed, double nextManualSampleTime, String nextSamplingTarget)
+void SMILTimeContainer::updateAnimations(SMILTime elapsed, double nextManualSampleTime, const String& nextSamplingTarget)
 {
     SMILTime earliersFireTime = SMILTime::unresolved();

trunk/Source/WebCore/svg/animation/SMILTimeContainer.h

@@ -71 +71 @@
     void timerFired(Timer<SMILTimeContainer>*);
     void startTimer(SMILTime fireTime, SMILTime minimumDelay = 0);
-    void updateAnimations(SMILTime elapsed, double nextManualSampleTime = 0, String nextSamplingTarget = String());
+    void updateAnimations(SMILTime elapsed, double nextManualSampleTime = 0, const String& nextSamplingTarget = String());
     
     void updateDocumentOrderIndexes();

trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp

@@ -152 +152 @@
 }
 
-void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper, String message)
+void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper, const String& message)
 {
     ASSERT_UNUSED(context, !context);

trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h

@@ -75 +75 @@
     void processPendingTasks();
     static void didConnectCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*);
-    static void didReceiveMessageCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*, String message);
+    static void didReceiveMessageCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*, const String& message);
     static void didStartClosingHandshakeCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*);
     static void didCloseCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus);