| commit | 7fa22f33290e3a1777c781eb059c97d5b674b27a | [log] [tgz] |
|---|---|---|
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jun 18 15:37:27 2013 +0000 |
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jun 18 15:37:27 2013 +0000 |
| tree | 5a7ceca161027eaac751b1a744d1939286382a1c | |
| parent | 60533dc4bf3e7ade90f8b72b802e3325c20254e7 [diff] [blame] |
Smallest possible desktop application that uses Skia to render stuff. Small Hello World smaple. Subclasses SkOSWindow. R=caryclark@google.com Author: sglez@google.com Review URL: https://chromiumcodereview.appspot.com/16337012 git-svn-id: http://skia.googlecode.com/svn/trunk@9657 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/views/unix/SkOSWindow_Unix.cpp b/src/views/unix/SkOSWindow_Unix.cpp index cb7aa4b..0a66c7c 100644 --- a/src/views/unix/SkOSWindow_Unix.cpp +++ b/src/views/unix/SkOSWindow_Unix.cpp
@@ -374,6 +374,10 @@ if (NULL == fUnixWindow.fDisplay) { return; } + // If we are drawing with GL, we don't need XPutImage. + if (NULL != fUnixWindow.fGLContext) { + return; + } // Draw the bitmap to the screen. const SkBitmap& bitmap = getBitmap(); int width = bitmap.width();