diff options
| author | Jing Yu <jingyu@google.com> | 2010-05-03 09:26:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-03 09:26:01 -0700 |
| commit | 59425e1dce108ed470c787c3c7fc9a9928aa114d (patch) | |
| tree | 1da455ee4021889afe0e4d5b85a10da3927c2d9a | |
| parent | fbcad591f3f2962b92aa61c017c360ddaef5ebba (diff) | |
| parent | bb35adadf8ffa769733526c7aa9b430642f7521b (diff) | |
| download | external_webkit-59425e1dce108ed470c787c3c7fc9a9928aa114d.zip external_webkit-59425e1dce108ed470c787c3c7fc9a9928aa114d.tar.gz external_webkit-59425e1dce108ed470c787c3c7fc9a9928aa114d.tar.bz2 | |
Merge "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"."
| -rw-r--r-- | WebKit/android/nav/FindCanvas.cpp | 3 |
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) } } - |