diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-18 17:42:45 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-18 17:42:45 +0000 |
commit | 3a9eb83a621e991d593b9d02d377db75a0272f29 (patch) | |
tree | 6ba043e91f2a430983c4ac7c767f90d5adecd9cc /webkit/glue/chromium_bridge_impl.cc | |
parent | aad0ab57d277c5bec206ea6f6766835e3ec4bf4a (diff) | |
download | chromium_src-3a9eb83a621e991d593b9d02d377db75a0272f29.zip chromium_src-3a9eb83a621e991d593b9d02d377db75a0272f29.tar.gz chromium_src-3a9eb83a621e991d593b9d02d377db75a0272f29.tar.bz2 |
Backout my image change which broke mac.
Review URL: http://codereview.chromium.org/11446
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/chromium_bridge_impl.cc')
-rw-r--r-- | webkit/glue/chromium_bridge_impl.cc | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc index 54f445c..a7f7c76 100644 --- a/webkit/glue/chromium_bridge_impl.cc +++ b/webkit/glue/chromium_bridge_impl.cc @@ -5,8 +5,6 @@ #include "config.h" #include "ChromiumBridge.h" -#include "BitmapImage.h" -#include "BitmapImageSingleFrameSkia.h" #include "ClipboardUtilitiesChromium.h" #include "Cursor.h" #include "Frame.h" @@ -30,7 +28,6 @@ #include "base/stats_counters.h" #include "base/string_util.h" #include "base/trace_event.h" -#include "build/build_config.h" #include "net/base/mime_util.h" #if USE(V8) #include <v8.h> @@ -45,13 +42,6 @@ #include "webkit/glue/webview_impl.h" #include "webkit/glue/webview_delegate.h" -#if defined(OS_WIN) -#include <windows.h> -#include <vssym32.h> - -#include "base/gfx/native_theme.h" -#endif - namespace { PlatformWidget ToPlatform(WebCore::Widget* widget) { @@ -324,68 +314,6 @@ String ChromiumBridge::uiResourceProtocol() { return webkit_glue::StdStringToString(webkit_glue::GetUIResourceProtocol()); } - -// Resources ------------------------------------------------------------------ - -#if defined(OS_WIN) -// Creates an Image for the text area resize corner. We do this by drawing the -// theme native control into a memory buffer then converting the memory buffer -// into an image. We don't bother caching this image because the caller holds -// onto a static copy (see WebCore/rendering/RenderLayer.cpp). -static PassRefPtr<Image> GetTextAreaResizeCorner() { - // Get the size of the resizer. - const int thickness = ScrollbarTheme::nativeTheme()->scrollbarThickness(); - - // Setup a memory buffer. - gfx::PlatformCanvasWin canvas(thickness, thickness, false); - gfx::PlatformDeviceWin& device = canvas.getTopPlatformDevice(); - device.prepareForGDI(0, 0, thickness, thickness); - HDC hdc = device.getBitmapDC(); - RECT widgetRect = { 0, 0, thickness, thickness }; - - // Do the drawing. - gfx::NativeTheme::instance()->PaintStatusGripper(hdc, SP_GRIPPER, 0, 0, - &widgetRect); - device.postProcessGDI(0, 0, thickness, thickness); - return BitmapImageSingleFrameSkia::create(device.accessBitmap(false)); -} -#endif - -PassRefPtr<Image> ChromiumBridge::loadPlatformImageResource(const char* name) { - // Some need special handling. - if (!strcmp(name, "textAreaResizeCorner")) { -#if defined(OS_WIN) - return GetTextAreaResizeCorner(); -#else - DLOG(WARNING) << "This needs implementing on other platforms."; - return Image::nullImage(); -#endif - } - - // The rest get converted to a resource ID that we can pass to the glue. - int resource_id = 0; - if (!strcmp(name, "missingImage")) { - resource_id = IDR_BROKENIMAGE; - } else if (!strcmp(name, "tickmarkDash")) { - resource_id = IDR_TICKMARK_DASH; - } else if (!strcmp(name, "deleteButton") || - !strcmp(name, "deleteButtonPressed")) { - NOTREACHED() << "Image resource " << name << " does not exist yet."; - return Image::nullImage(); - } else { - NOTREACHED() << "Unknown image resource " << name; - return Image::nullImage(); - } - - std::string data = webkit_glue::GetDataResource(resource_id); - RefPtr<SharedBuffer> buffer( - SharedBuffer::create(data.empty() ? "" : data.data(), - data.length())); - RefPtr<Image> image = BitmapImage::create(); - image->setData(buffer, true); - return image; -} - // Screen --------------------------------------------------------------------- int ChromiumBridge::screenDepth(Widget* widget) { |