Title: [91934] branches/chromium/835/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp
- Revision
- 91934
- Author
- vange...@chromium.org
- Date
- 2011-07-28 09:30:01 -0700 (Thu, 28 Jul 2011)
Log Message
Merge 91768 - [SKIA] Make the skia GL context current when drawing text to gpu backed platform context.
https://bugs.webkit.org/show_bug.cgi?id=65182
Patch by Brian Salomon <bsalo...@google.com> on 2011-07-26
Reviewed by Stephen White.
No new tests. Not sure how to test wrong-ctx bugs in layout tests.
* platform/graphics/skia/SkiaFontWin.cpp:
(WebCore::paintSkiaText):
TBR=commit-qu...@webkit.org
Review URL: http://codereview.chromium.org/7520031
Modified Paths
Diff
Modified: branches/chromium/835/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp (91933 => 91934)
--- branches/chromium/835/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2011-07-28 16:26:50 UTC (rev 91933)
+++ branches/chromium/835/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2011-07-28 16:30:01 UTC (rev 91934)
@@ -191,6 +191,9 @@
SkCanvas* canvas = platformContext->canvas();
TextDrawingModeFlags textMode = platformContext->getTextDrawingMode();
+ // If platformContext is GPU-backed make its GL context current.
+ platformContext->makeGrContextCurrent();
+
// Filling (if necessary). This is the common case.
SkPaint paint;
platformContext->setupPaintForFilling(&paint);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
