Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1119980 - Fix a -Woverloaded-virtual warning in gonk widget code. r=sotaro

Browse Source 
--HG--
extra : source : 3003d96ab84c83f18304b067fbc40c1337872d3d
This commit is contained in:
Botond Ballo 2015-02-09 17:32:52 -05:00
parent 1e125efa54
commit 9ab4d5e2c1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
View File

@ -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);
}

2
widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.h
View File

@ -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);

2
widget/gonk/nativewindow/GonkConsumerBaseLL.cpp
View File

@ -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);
}
}

4
widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.cpp
View File

@ -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;
}

2
widget/gonk/nativewindow/IGonkGraphicBufferConsumerLL.h
View File

@ -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>