Merge 91768 - [SKIA] Make the skia GL context current when drawing text to gpu backed platform co...

Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 173 matching lines @@
                    const GOFFSET* offsets,
                    const SkPoint* origin)
 {
     HDC dc = GetDC(0);
     HGDIOBJ oldFont = SelectObject(dc, hfont);
 
     PlatformContextSkia* platformContext = context->platformContext();
     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);
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
     setupPaintForFont(hfont, &paint, platformContext);
 
     bool didFill = false;
 
     if ((textMode & TextModeFill) && (SkColorGetA(paint.getColor()) || paint.getLooper())) {
         skiaDrawText(canvas, *origin, &paint, &glyphs[0], &advances[0], &offsets[0], numGlyphs);
@@ skipping 24 matching lines @@
         }
 
         skiaDrawText(canvas, *origin, &paint, &glyphs[0], &advances[0], &offsets[0], numGlyphs);
     }
 
     SelectObject(dc, oldFont);
     ReleaseDC(0, dc);
 }
 
 }  // namespace WebCore