diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 22:13:23 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 22:13:23 +0000 |
| commit | f462899015bbd03c10cabfa791acd4811db7d2b8 (patch) | |
| tree | fdb1fd0ebf284003b539450bb9438bd577a8b19d /webkit/glue | |
| parent | 6d748ec125d222f1d45c913d30a8e8317d10eb43 (diff) | |
| download | chromium_src-f462899015bbd03c10cabfa791acd4811db7d2b8.zip chromium_src-f462899015bbd03c10cabfa791acd4811db7d2b8.tar.gz chromium_src-f462899015bbd03c10cabfa791acd4811db7d2b8.tar.bz2 | |
remove unneeded webkit_glue:: and wrap windows functions in ifdefs
Review URL: http://codereview.chromium.org/6413
Patch from icefox.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/SConscript | 2 | ||||
| -rw-r--r-- | webkit/glue/simple_clipboard_impl.cc | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index edbc8c0..cee6aab 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -23,6 +23,7 @@ input_files = [ 'image_decoder.cc', 'npruntime_util.cc', 'password_form_dom_manager.cc', + 'simple_clipboard_impl.cc', 'webkit_glue.cc', 'weburlrequest_impl.cc', ] @@ -68,7 +69,6 @@ if env['PLATFORM'] == 'win32': 'resource_fetcher.cc', 'resource_handle_win.cc', 'searchable_form_data.cc', - 'simple_clipboard_impl.cc', 'webcursor.cc', 'webdatasource_impl.cc', 'webdocumentloader_impl.cc', diff --git a/webkit/glue/simple_clipboard_impl.cc b/webkit/glue/simple_clipboard_impl.cc index e4a8eaa..43ff30d 100644 --- a/webkit/glue/simple_clipboard_impl.cc +++ b/webkit/glue/simple_clipboard_impl.cc @@ -18,47 +18,49 @@ namespace webkit_glue { Clipboard clipboard; -void webkit_glue::ClipboardClear() { +void ClipboardClear() { clipboard.Clear(); } -void webkit_glue::ClipboardWriteText(const std::wstring& text) { +void ClipboardWriteText(const std::wstring& text) { clipboard.WriteText(text); } -void webkit_glue::ClipboardWriteHTML(const std::wstring& html, +void ClipboardWriteHTML(const std::wstring& html, const GURL& url) { clipboard.WriteHTML(html, url.spec()); } -void webkit_glue::ClipboardWriteBookmark(const std::wstring& title, +void ClipboardWriteBookmark(const std::wstring& title, const GURL& url) { clipboard.WriteBookmark(title, url.spec()); } -void webkit_glue::ClipboardWriteBitmap(const SkBitmap& bitmap) { +#if defined(OS_WIN) +void ClipboardWriteBitmap(const SkBitmap& bitmap) { SkAutoLockPixels bitmap_lock(bitmap); clipboard.WriteBitmap(bitmap.getPixels(), gfx::Size(bitmap.width(), bitmap.height())); } -void webkit_glue::ClipboardWriteWebSmartPaste() { +void ClipboardWriteWebSmartPaste() { clipboard.WriteWebSmartPaste(); } +#endif -bool webkit_glue::ClipboardIsFormatAvailable(unsigned int format) { +bool ClipboardIsFormatAvailable(unsigned int format) { return clipboard.IsFormatAvailable(format); } -void webkit_glue::ClipboardReadText(std::wstring* result) { +void ClipboardReadText(std::wstring* result) { clipboard.ReadText(result); } -void webkit_glue::ClipboardReadAsciiText(std::string* result) { +void ClipboardReadAsciiText(std::string* result) { clipboard.ReadAsciiText(result); } -void webkit_glue::ClipboardReadHTML(std::wstring* markup, GURL* url) { +void ClipboardReadHTML(std::wstring* markup, GURL* url) { std::string url_str; clipboard.ReadHTML(markup, url ? &url_str : NULL); if (url) |