From c8e6dca263be046e9c844fd223b59697b84ec874 Mon Sep 17 00:00:00 2001
From: daboe01 <daboe01@googlemail.com>
Date: Wed, 20 May 2015 19:42:03 +0200
Subject: [PATCH] small refactoring of string sizing init

---
 AppKit/CPStringDrawing.j | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/AppKit/CPStringDrawing.j b/AppKit/CPStringDrawing.j
index 5ff84fb31..6dceb561f 100644
--- a/AppKit/CPStringDrawing.j
+++ b/AppKit/CPStringDrawing.j
@@ -60,11 +60,13 @@ CPStringSizeCachingEnabled = YES;
 - (void) _initializeStringSizing
 {
 #if PLATFORM(DOM)
-    if (!CPStringSizeMeasuringContext)
-        CPStringSizeMeasuringContext = CGBitmapGraphicsContextCreate();
+    CPStringSizeIsCanvasSizingInvalid = TRUE;
 
     if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
     {
+        if (!CPStringSizeMeasuringContext)
+            CPStringSizeMeasuringContext = CGBitmapGraphicsContextCreate();
+
         var teststring = "0123456879abcdefghiklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ,.-()";
         CPStringSizeMeasuringContext.font = cssString;
         CPStringSizeIsCanvasSizingInvalid = ABS([teststring sizeWithFont:aFont].width - CPStringSizeMeasuringContext.measureText(teststring).width) > 2;
@@ -94,7 +96,7 @@ CPStringSizeCachingEnabled = YES;
         CPStringSizeDidTestCanvasSizingValid = YES;
     }
 
-    if (!CPFeatureIsCompatible(CPHTMLCanvasFeature) || CPStringSizeIsCanvasSizingInvalid || aWidth > 0)
+    if (CPStringSizeIsCanvasSizingInvalid || aWidth > 0)
         size = [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
     else
     {