Title: [148000] trunk/Source
Revision
148000
Author
[email protected]
Date
2013-04-09 03:03:21 -0700 (Tue, 09 Apr 2013)

Log Message

[WK2] Remove build warnings for unused parameters
https://bugs.webkit.org/show_bug.cgi?id=114234

Patch by Jinwoo Song <[email protected]> on 2013-04-09
Reviewed by Andreas Kling.

Fix build warnings -Wunused-parameter.

Source/WebCore:

* Modules/indexeddb/IDBBackingStore.cpp:
(WebCore::IDBBackingStore::openInMemory):
* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
(WebCore::CreateIndexAbortOperation::perform):
(WebCore::DeleteIndexAbortOperation::perform):
(WebCore::CreateObjectStoreAbortOperation::perform):
(WebCore::DeleteObjectStoreAbortOperation::perform):
(WebCore::IDBDatabaseBackendImpl::VersionChangeAbortOperation::perform):
* Modules/indexeddb/IDBLevelDBCoding.cpp:
(WebCore::IDBLevelDBCoding::decodeBool):
(WebCore::IDBLevelDBCoding::KeyPrefix::KeyPrefix):
* Modules/indexeddb/IDBLevelDBCoding.h:
(WebCore::IDBLevelDBCoding::encodeIntSafely):
* bindings/js/IDBBindingUtilities.cpp:
(WebCore::canSet):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::createVideoSink):
* platform/leveldb/LevelDBDatabase.cpp:
(WebCore::ComparatorAdapter::FindShortestSeparator):
(WebCore::ComparatorAdapter::FindShortSuccessor):

Source/WebKit2:

* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::SessionStorageNamespace::cloneTo):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::requestNetworkingStatistics):
(WebKit::WebContext::pluginInfoStoreDidLoadPlugins):
* WebProcess/Storage/StorageAreaProxy.cpp:
(WebKit::StorageAreaProxy::removeItem):
(WebKit::StorageAreaProxy::clear):
(WebKit::StorageAreaProxy::dispatchSessionStorageEvent):
(WebKit::StorageAreaProxy::dispatchLocalStorageEvent):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::didUninstallPageOverlay):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didFinishLoad):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::shouldPlugInAutoStartFromOrigin):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (147999 => 148000)


--- trunk/Source/WebCore/ChangeLog	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebCore/ChangeLog	2013-04-09 10:03:21 UTC (rev 148000)
@@ -1,3 +1,33 @@
+2013-04-09  Jinwoo Song  <[email protected]>
+
+        [WK2] Remove build warnings for unused parameters
+        https://bugs.webkit.org/show_bug.cgi?id=114234
+
+        Reviewed by Andreas Kling.
+
+        Fix build warnings -Wunused-parameter.
+
+        * Modules/indexeddb/IDBBackingStore.cpp:
+        (WebCore::IDBBackingStore::openInMemory):
+        * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+        (WebCore::CreateIndexAbortOperation::perform):
+        (WebCore::DeleteIndexAbortOperation::perform):
+        (WebCore::CreateObjectStoreAbortOperation::perform):
+        (WebCore::DeleteObjectStoreAbortOperation::perform):
+        (WebCore::IDBDatabaseBackendImpl::VersionChangeAbortOperation::perform):
+        * Modules/indexeddb/IDBLevelDBCoding.cpp:
+        (WebCore::IDBLevelDBCoding::decodeBool):
+        (WebCore::IDBLevelDBCoding::KeyPrefix::KeyPrefix):
+        * Modules/indexeddb/IDBLevelDBCoding.h:
+        (WebCore::IDBLevelDBCoding::encodeIntSafely):
+        * bindings/js/IDBBindingUtilities.cpp:
+        (WebCore::canSet):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::createVideoSink):
+        * platform/leveldb/LevelDBDatabase.cpp:
+        (WebCore::ComparatorAdapter::FindShortestSeparator):
+        (WebCore::ComparatorAdapter::FindShortSuccessor):
+
 2013-04-09  Thiago Marcos P. Santos  <[email protected]>
 
         [WK2] Drop WebProcess capabilities on Linux using seccomp filters

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp (147999 => 148000)


--- trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -448,7 +448,7 @@
     return IDBBackingStore::openInMemory(securityOrigin, identifier, &levelDBFactory);
 }
 
-PassRefPtr<IDBBackingStore> IDBBackingStore::openInMemory(SecurityOrigin* securityOrigin, const String& identifier, LevelDBFactory* levelDBFactory)
+PassRefPtr<IDBBackingStore> IDBBackingStore::openInMemory(SecurityOrigin*, const String& identifier, LevelDBFactory*)
 {
     IDB_TRACE("IDBBackingStore::openInMemory");
 

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (147999 => 148000)


--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -622,7 +622,7 @@
 void CreateIndexAbortOperation::perform(IDBTransactionBackendImpl* transaction)
 {
     IDB_TRACE("CreateIndexAbortOperation");
-    ASSERT(!transaction);
+    ASSERT_UNUSED(transaction, !transaction);
     m_database->removeIndex(m_objectStoreId, m_indexId);
 }
 
@@ -658,7 +658,7 @@
 void DeleteIndexAbortOperation::perform(IDBTransactionBackendImpl* transaction)
 {
     IDB_TRACE("DeleteIndexAbortOperation");
-    ASSERT(!transaction);
+    ASSERT_UNUSED(transaction, !transaction);
     m_database->addIndex(m_objectStoreId, m_indexMetadata, IDBIndexMetadata::InvalidId);
 }
 
@@ -1360,21 +1360,21 @@
 void CreateObjectStoreAbortOperation::perform(IDBTransactionBackendImpl* transaction)
 {
     IDB_TRACE("CreateObjectStoreAbortOperation");
-    ASSERT(!transaction);
+    ASSERT_UNUSED(transaction, !transaction);
     m_database->removeObjectStore(m_objectStoreId);
 }
 
 void DeleteObjectStoreAbortOperation::perform(IDBTransactionBackendImpl* transaction)
 {
     IDB_TRACE("DeleteObjectStoreAbortOperation");
-    ASSERT(!transaction);
+    ASSERT_UNUSED(transaction, !transaction);
     m_database->addObjectStore(m_objectStoreMetadata, IDBObjectStoreMetadata::InvalidId);
 }
 
 void IDBDatabaseBackendImpl::VersionChangeAbortOperation::perform(IDBTransactionBackendImpl* transaction)
 {
     IDB_TRACE("VersionChangeAbortOperation");
-    ASSERT(!transaction);
+    ASSERT_UNUSED(transaction, !transaction);
     m_database->m_metadata.version = m_previousVersion;
     m_database->m_metadata.intVersion = m_previousIntVersion;
 }

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp (147999 => 148000)


--- trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -209,7 +209,7 @@
 
 bool decodeBool(const char* begin, const char* end)
 {
-    ASSERT(begin < end);
+    ASSERT_UNUSED(end, begin < end);
     return *begin;
 }
 
@@ -1005,7 +1005,7 @@
     , m_objectStoreId(objectStoreId)
     , m_indexId(indexId)
 {
-    ASSERT(type == InvalidType);
+    ASSERT_UNUSED(type, type == InvalidType);
     ASSERT(KeyPrefix::isValidDatabaseId(databaseId));
     ASSERT(KeyPrefix::isValidObjectStoreId(objectStoreId));
 }

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.h (147999 => 148000)


--- trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.h	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBCoding.h	2013-04-09 10:03:21 UTC (rev 148000)
@@ -56,7 +56,7 @@
 Vector<char> encodeInt(int64_t);
 inline Vector<char> encodeIntSafely(int64_t nParam, int64_t max)
 {
-    ASSERT(nParam <= max);
+    ASSERT_UNUSED(max, nParam <= max);
     return encodeInt(nParam);
 }
 int64_t decodeInt(const char* begin, const char* end);

Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (147999 => 148000)


--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -59,6 +59,7 @@
 
 static bool canSet(JSValue object, const String& keyPathElement)
 {
+    UNUSED_PARAM(keyPathElement);
     return object.isObject();
 }
 

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (147999 => 148000)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -386,6 +386,7 @@
     m_gstGWorld = GStreamerGWorld::createGWorld(pipeline);
     m_webkitVideoSink = webkitVideoSinkNew(m_gstGWorld.get());
 #else
+    UNUSED_PARAM(pipeline);
     m_webkitVideoSink = webkitVideoSinkNew();
 #endif
     m_videoSinkPad = adoptGRef(gst_element_get_static_pad(m_webkitVideoSink.get(), "sink"));

Modified: trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp (147999 => 148000)


--- trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -86,8 +86,8 @@
     virtual const char* Name() const { return m_comparator->name(); }
 
     // FIXME: Support the methods below in the future.
-    virtual void FindShortestSeparator(std::string* start, const leveldb::Slice& limit) const { }
-    virtual void FindShortSuccessor(std::string* key) const { }
+    virtual void FindShortestSeparator(std::string* /* start */, const leveldb::Slice& /* limit */) const { }
+    virtual void FindShortSuccessor(std::string* /* key */) const { }
 
 private:
     const LevelDBComparator* m_comparator;

Modified: trunk/Source/WebKit2/ChangeLog (147999 => 148000)


--- trunk/Source/WebKit2/ChangeLog	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-09 10:03:21 UTC (rev 148000)
@@ -1,3 +1,29 @@
+2013-04-09  Jinwoo Song  <[email protected]>
+
+        [WK2] Remove build warnings for unused parameters
+        https://bugs.webkit.org/show_bug.cgi?id=114234
+
+        Reviewed by Andreas Kling.
+
+        Fix build warnings -Wunused-parameter.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::SessionStorageNamespace::cloneTo):
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::requestNetworkingStatistics):
+        (WebKit::WebContext::pluginInfoStoreDidLoadPlugins):
+        * WebProcess/Storage/StorageAreaProxy.cpp:
+        (WebKit::StorageAreaProxy::removeItem):
+        (WebKit::StorageAreaProxy::clear):
+        (WebKit::StorageAreaProxy::dispatchSessionStorageEvent):
+        (WebKit::StorageAreaProxy::dispatchLocalStorageEvent):
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+        (WebKit::CoordinatedLayerTreeHost::didUninstallPageOverlay):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didFinishLoad):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::shouldPlugInAutoStartFromOrigin):
+
 2013-04-09  Thiago Marcos P. Santos  <[email protected]>
 
         [WK2] Drop WebProcess capabilities on Linux using seccomp filters

Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (147999 => 148000)


--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -163,7 +163,7 @@
 
 void StorageManager::SessionStorageNamespace::cloneTo(SessionStorageNamespace& newSessionStorageNamespace)
 {
-    ASSERT(newSessionStorageNamespace.isEmpty());
+    ASSERT_UNUSED(newSessionStorageNamespace, newSessionStorageNamespace.isEmpty());
 
     // FIXME: Implement.
 }

Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (147999 => 148000)


--- trunk/Source/WebKit2/UIProcess/WebContext.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -1154,6 +1154,8 @@
     uint64_t requestID = request->addOutstandingRequest();
     m_statisticsRequests.set(requestID, request);
     m_networkProcess->send(Messages::NetworkProcess::GetNetworkProcessStatistics(requestID), 0);
+#else
+    UNUSED_PARAM(request);
 #endif
 }
 
@@ -1224,6 +1226,9 @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
 void WebContext::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store)
 {
+#ifdef NDEBUG
+    UNUSED_PARAM(store);
+#endif
     ASSERT(store == &m_pluginInfoStore);
 
     Vector<RefPtr<APIObject> > pluginArray;

Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp (147999 => 148000)


--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaProxy.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -152,12 +152,15 @@
 {
     // FIXME: Implement this.
     ASSERT_NOT_REACHED();
+    UNUSED_PARAM(key);
+    UNUSED_PARAM(sourceFrame);
 }
 
 void StorageAreaProxy::clear(ExceptionCode&, Frame* sourceFrame)
 {
     // FIXME: Implement this.
     ASSERT_NOT_REACHED();
+    UNUSED_PARAM(sourceFrame);
 }
 
 bool StorageAreaProxy::contains(const String& key, ExceptionCode& ec, Frame* sourceFrame)
@@ -289,6 +292,10 @@
     ASSERT(storageType() == SessionStorage);
 
     // FIXME: Implement.
+    UNUSED_PARAM(key);
+    UNUSED_PARAM(oldValue);
+    UNUSED_PARAM(newValue);
+    UNUSED_PARAM(urlString);
 }
 
 void StorageAreaProxy::dispatchLocalStorageEvent(const String& key, const String& oldValue, const String& newValue, const String& urlString)
@@ -296,6 +303,10 @@
     ASSERT(storageType() == LocalStorage);
 
     // FIXME: Implement.
+    UNUSED_PARAM(key);
+    UNUSED_PARAM(oldValue);
+    UNUSED_PARAM(newValue);
+    UNUSED_PARAM(urlString);
 }
 
 } // namespace WebKit

Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (147999 => 148000)


--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -261,7 +261,7 @@
     scheduleLayerFlush();
 }
 
-void CoordinatedLayerTreeHost::didUninstallPageOverlay(PageOverlay* pageOverlay)
+void CoordinatedLayerTreeHost::didUninstallPageOverlay(PageOverlay*)
 {
     m_pageOverlay = 0;
 

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (147999 => 148000)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -3916,6 +3916,8 @@
     m_readyToFindPrimarySnapshottedPlugin = true;
     if (!m_page->settings()->snapshotAllPlugIns() && m_page->settings()->primaryPlugInSnapshotDetectionEnabled())
         determinePrimarySnapshottedPlugIn();
+#else
+    UNUSED_PARAM(frame);
 #endif
 }
 

Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (147999 => 148000)


--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp	2013-04-09 09:24:29 UTC (rev 147999)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp	2013-04-09 10:03:21 UTC (rev 148000)
@@ -803,6 +803,8 @@
     // The plugin wasn't in the general whitelist, so check if it similar to the primary plugin for the page (if we've found one).
     if (page && page->matchesPrimaryPlugIn(pageOrigin, pluginOrigin, mimeType))
         return true;
+#else
+    UNUSED_PARAM(page);
 #endif
 
     // Lastly check against the more explicit hash list.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to