From 9ab4d5e2c1f33672b6f2069b2fb6a50299f082f1 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Mon, 9 Feb 2015 17:32:52 -0500
Subject: [PATCH] Bug 1119980 - Fix a -Woverloaded-virtual warning in gonk
 widget code. r=sotaro

--HG--
extra : source : 3003d96ab84c83f18304b067fbc40c1337872d3d
---
 .../GonkBufferQueueLL/GonkBufferQueueConsumer.cpp             | 2 +-
 .../nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.h  | 2 +-
 widget/gonk/nativewindow/GonkConsumerBaseLL.cpp               | 2 +-
 widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.cpp     | 4 ++--
 widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.h       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
index 5e7d4b378c4a..8993c70b8987 100644
--- a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
+++ b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
@@ -516,7 +516,7 @@ sp<NativeHandle> GonkBufferQueueConsumer::getSidebandStream() const {
     return mCore->mSidebandStream;
 }
 
-void GonkBufferQueueConsumer::dump(String8& result, const char* prefix) const {
+void GonkBufferQueueConsumer::dumpToString(String8& result, const char* prefix) const {
     mCore->dump(result, prefix);
 }
 
diff --git a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.h b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.h
index 1bd49a924672..111d284a9740 100644
--- a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.h
+++ b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.h
@@ -137,7 +137,7 @@ public:
     virtual sp<NativeHandle> getSidebandStream() const;
 
     // dump our state in a String
-    virtual void dump(String8& result, const char* prefix) const;
+    virtual void dumpToString(String8& result, const char* prefix) const;
 
     // Added by mozilla
     virtual mozilla::TemporaryRef<GonkBufferSlot::TextureClient> getTextureClientFromBuffer(ANativeWindowBuffer* buffer);
diff --git a/widget/gonk/nativewindow/GonkConsumerBaseLL.cpp b/widget/gonk/nativewindow/GonkConsumerBaseLL.cpp
index 36e4a8319d88..5b1166b57c40 100644
--- a/widget/gonk/nativewindow/GonkConsumerBaseLL.cpp
+++ b/widget/gonk/nativewindow/GonkConsumerBaseLL.cpp
@@ -166,7 +166,7 @@ void GonkConsumerBase::dumpLocked(String8& result, const char* prefix) const {
     result.appendFormat("%smAbandoned=%d\n", prefix, int(mAbandoned));
 
     if (!mAbandoned) {
-        mConsumer->dump(result, prefix);
+        mConsumer->dumpToString(result, prefix);
     }
 }
 
diff --git a/widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.cpp b/widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.cpp
index 5e570298e1ca..16c697fe6619 100644
--- a/widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.cpp
+++ b/widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.cpp
@@ -405,7 +405,7 @@ public:
         return stream;
     }
 
-    virtual void dump(String8& result, const char* prefix) const {
+    virtual void dumpToString(String8& result, const char* prefix) const {
         Parcel data, reply;
         data.writeInterfaceToken(IGonkGraphicBufferConsumer::getInterfaceDescriptor());
         data.writeString8(result);
@@ -554,7 +554,7 @@ status_t BnGonkGraphicBufferConsumer::onTransact(
             CHECK_INTERFACE(IGonkGraphicBufferConsumer, data, reply);
             String8 result = data.readString8();
             String8 prefix = data.readString8();
-            static_cast<IGonkGraphicBufferConsumer*>(this)->dump(result, prefix);
+            static_cast<IGonkGraphicBufferConsumer*>(this)->dumpToString(result, prefix);
             reply->writeString8(result);
             return NO_ERROR;
         }
diff --git a/widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.h b/widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.h
index c76aa90f19d2..92a500fed47b 100644
--- a/widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.h
+++ b/widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.h
@@ -308,7 +308,7 @@ public:
     virtual sp<NativeHandle> getSidebandStream() const = 0;
 
     // dump state into a string
-    virtual void dump(String8& result, const char* prefix) const = 0;
+    virtual void dumpToString(String8& result, const char* prefix) const = 0;
 
     // Added by mozilla
     virtual mozilla::TemporaryRef<mozilla::layers::TextureClient>