Chromium Code Reviews| Index: src/views/unix/SkOSWindow_Unix.cpp |
| diff --git a/src/views/unix/SkOSWindow_Unix.cpp b/src/views/unix/SkOSWindow_Unix.cpp |
| index 591493e57eee9987e3ec36ae25b71d28a940f837..11e836227846ce59a387ad0592a2f246cc614bff 100644 |
| --- a/src/views/unix/SkOSWindow_Unix.cpp |
| +++ b/src/views/unix/SkOSWindow_Unix.cpp |
| @@ -182,7 +182,7 @@ static void MyXNextEventWithDelay(Display* dsp, XEvent* evt) { |
| timeval tv; |
| tv.tv_sec = ms / 1000; // seconds |
| tv.tv_usec = (ms % 1000) * 1000; // microseconds |
| - |
| + |
| (void)select(x11_fd + 1, &input_fds, NULL, NULL, &tv); |
| } |
| @@ -374,6 +374,10 @@ void SkOSWindow::doPaint() { |
| if (NULL == fUnixWindow.fDisplay) { |
| return; |
| } |
| + // If we are drawing with GL, we don't need XPutImage. |
| + if (NULL != fUnixWindow.fGLContext) { |
| + return; |
| + } |
|
sglez
2013/06/17 18:04:35
This is a fix to Mike's recent changes; it fixes a
|
| // Draw the bitmap to the screen. |
| const SkBitmap& bitmap = getBitmap(); |
| int width = bitmap.width(); |