webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 21 insertions, 3 deletions

diff --git a/Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp b/Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp
index 4b28f0e0e..819441efa 100644
--- a/Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp
+++ b/Source/WebCore/platform/graphics/gtk/GdkCairoUtilities.cpp
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -31,8 +31,25 @@
 #include "IntSize.h"
 #include <cairo.h>
 #include <gtk/gtk.h>
+#include <mutex>
+#include <wtf/NeverDestroyed.h>
 
-using namespace WebCore;
+namespace WebCore {
+
+const cairo_font_options_t* getDefaultCairoFontOptions()
+{
+    if (auto* screen = gdk_screen_get_default()) {
+        if (auto* options = gdk_screen_get_font_options(screen))
+            return options;
+    }
+
+    static LazyNeverDestroyed<cairo_font_options_t*> options;
+    static std::once_flag flag;
+    std::call_once(flag, [] {
+        options.construct(cairo_font_options_create());
+    });
+    return options;
+}
 
 GdkPixbuf* cairoSurfaceToGdkPixbuf(cairo_surface_t* surface)
 {
@@ -40,3 +57,4 @@ GdkPixbuf* cairoSurfaceToGdkPixbuf(cairo_surface_t* surface)
     return gdk_pixbuf_get_from_surface(surface, 0, 0, size.width(), size.height());
 }
 
+}