summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJing Yu <jingyu@google.com>2010-05-02 20:07:53 -0700
committerJing Yu <jingyu@google.com>2010-05-02 20:07:53 -0700
commitbb35adadf8ffa769733526c7aa9b430642f7521b (patch)
treeebea63b55db7e8da03b80b6355f2051ddd83ea87
parente762b176966e9a29ad302d4aa58bd3f79bc01bd0 (diff)
downloadexternal_webkit-bb35adadf8ffa769733526c7aa9b430642f7521b.zip
external_webkit-bb35adadf8ffa769733526c7aa9b430642f7521b.tar.gz
external_webkit-bb35adadf8ffa769733526c7aa9b430642f7521b.tar.bz2
Fix a return type bug which is complained by gcc-4.6.
If compile this function iwht gcc-4.6, gcc complains that "error: 'GlyphSet::GlyphSet' names the constructor, not the type". Change-Id: I34f3a66dc33f8dca93e4c0db1d87236bf3efc6ae Tested: With the patch, gcc-4.4.0 is still working correctly. With the patch, gcc-4.6 works well too.
-rw-r--r--WebKit/android/nav/FindCanvas.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp
index d8e908b..8eaaaef 100644
--- a/WebKit/android/nav/FindCanvas.cpp
+++ b/WebKit/android/nav/FindCanvas.cpp
@@ -98,7 +98,7 @@ GlyphSet::~GlyphSet() {
// part of mLowerGlyphs
}
-GlyphSet::GlyphSet& GlyphSet::operator=(GlyphSet& src) {
+GlyphSet& GlyphSet::operator=(GlyphSet& src) {
mTypeface = src.mTypeface;
mCount = src.mCount;
if (mCount > MAX_STORAGE_COUNT) {
@@ -675,4 +675,3 @@ void FindOnPage::setMatches(WTF::Vector<MatchInfo>* matches)
}
}
-