diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 22:57:01 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 22:57:01 +0000 |
| commit | 70aaf91acf82e4ea9d86123e02c29c498241f0df (patch) | |
| tree | 31e821b3c532a5ec43d40898c10bce8c1575c6ec | |
| parent | 45039fd9ba56b5ce10177391cc1ed324c1a8ae92 (diff) | |
| download | chromium_src-70aaf91acf82e4ea9d86123e02c29c498241f0df.zip chromium_src-70aaf91acf82e4ea9d86123e02c29c498241f0df.tar.gz chromium_src-70aaf91acf82e4ea9d86123e02c29c498241f0df.tar.bz2 | |
Enable some code that compiles fine on linux now. This code talks
about the next merge and was written in September.
Review URL: http://codereview.chromium.org/39281
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11170 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 3ee3a8e..ac90657 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -19,9 +19,7 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "FrameView.h" #include "Frame.h" #include "HistoryItem.h" -#if defined(OS_WIN) // TODO(port): unnecessary after the webkit merge lands. #include "ImageSource.h" -#endif #include "KURL.h" #include "Page.h" #include "PlatformString.h" @@ -247,7 +245,6 @@ void CheckForLeaks() { } bool DecodeImage(const std::string& image_data, SkBitmap* image) { -#if defined(OS_WIN) // TODO(port): unnecessary after the webkit merge lands. RefPtr<WebCore::SharedBuffer> buffer( WebCore::SharedBuffer::create(image_data.data(), static_cast<int>(image_data.length()))); @@ -260,11 +257,6 @@ bool DecodeImage(const std::string& image_data, SkBitmap* image) { } // We failed to decode the image. return false; -#else - // This ought to work; we just need the webkit merge. - NOTIMPLEMENTED(); - return false; -#endif } FilePath::StringType WebStringToFilePathString(const WebKit::WebString& str) { |