diff options
| author | eseidel@google.com <eseidel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 22:34:40 +0000 |
|---|---|---|
| committer | eseidel@google.com <eseidel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 22:34:40 +0000 |
| commit | bb3235c150bea8943280471fecf161d5fd579780 (patch) | |
| tree | 9f734c7acc53f70e459a816fda341540d2ce4b2c /webkit/api/src/ChromiumBridge.cpp | |
| parent | 31a95b118b1fd0df09aa58638ab385f10a747873 (diff) | |
| download | chromium_src-bb3235c150bea8943280471fecf161d5fd579780.zip chromium_src-bb3235c150bea8943280471fecf161d5fd579780.tar.gz chromium_src-bb3235c150bea8943280471fecf161d5fd579780.tar.bz2 | |
Commit from review 373017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api/src/ChromiumBridge.cpp')
| -rw-r--r-- | webkit/api/src/ChromiumBridge.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp index afd8eb5..72d37b8 100644 --- a/webkit/api/src/ChromiumBridge.cpp +++ b/webkit/api/src/ChromiumBridge.cpp @@ -48,8 +48,8 @@ #include "WebPluginListBuilderImpl.h" #include "WebScreenInfo.h" #include "WebString.h" -#include "WebVector.h" #include "WebURL.h" +#include "WebVector.h" #include "WebViewClient.h" #include "WebViewImpl.h" #include "WebWorkerClientImpl.h" @@ -71,9 +71,9 @@ #include "BitmapImage.h" #include "Cookie.h" +#include "FrameView.h" #include "GraphicsContext.h" #include "KURL.h" -#include "FrameView.h" #include "NotImplemented.h" #include "PlatformContextSkia.h" #include "PluginData.h" @@ -258,7 +258,7 @@ String ChromiumBridge::pathByAppendingComponent(const String& path, const String bool ChromiumBridge::makeAllDirectories(const String& path) { - return webKitClient()->makeAllDirectories(path); + return webKitClient()->makeAllDirectories(path); } String ChromiumBridge::getAbsolutePath(const String& path) @@ -294,13 +294,12 @@ String ChromiumBridge::getFontFamilyForCharacters(const UChar* characters, size_ { if (webKitClient()->sandboxSupport()) return webKitClient()->sandboxSupport()->getFontFamilyForCharacters(characters, numCharacters); - else { - WebCString family = WebFontInfo::familyForChars(characters, numCharacters); - if (family.data()) - return WebString::fromUTF8(family.data()); - else - return WebString(); - } + + WebCString family = WebFontInfo::familyForChars(characters, numCharacters); + if (family.data()) + return WebString::fromUTF8(family.data()); + + return WebString(); } #endif |