summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 00:25:43 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 00:25:43 +0000
commite2cb652d6f2b91c1ab51f7355f417f0390aaf312 (patch)
treeae902ce4c9d8eb36780c108c0ec517613d30fac4 /app
parenta6dbdf7b66a75fc30de5fec8c6057cc32e7908f3 (diff)
downloadchromium_src-e2cb652d6f2b91c1ab51f7355f417f0390aaf312.zip
chromium_src-e2cb652d6f2b91c1ab51f7355f417f0390aaf312.tar.gz
chromium_src-e2cb652d6f2b91c1ab51f7355f417f0390aaf312.tar.bz2
Fall back to the chrome-themed default favicon if the gtk theme fails to produce one.
BUG=19994 Review URL: http://codereview.chromium.org/174267 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/gfx/canvas_linux.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/gfx/canvas_linux.cc b/app/gfx/canvas_linux.cc
index 5d644ad..602edf5 100644
--- a/app/gfx/canvas_linux.cc
+++ b/app/gfx/canvas_linux.cc
@@ -231,6 +231,11 @@ void Canvas::DrawStringInt(const std::wstring& text,
}
void Canvas::DrawGdkPixbuf(GdkPixbuf* pixbuf, int x, int y) {
+ if (!pixbuf) {
+ NOTREACHED();
+ return;
+ }
+
cairo_t* cr = beginPlatformPaint();
gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
cairo_paint(cr);