Title: [129697] trunk/Source
- Revision
- 129697
- Author
- [email protected]
- Date
- 2012-09-26 13:34:51 -0700 (Wed, 26 Sep 2012)
Log Message
Unreviewed, rolling out r129673.
http://trac.webkit.org/changeset/129673
https://bugs.webkit.org/show_bug.cgi?id=97723
Causing window build breakage (Requested by alecf on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-09-26
Source/WebCore:
* platform/chromium/PlatformSupport.h:
(PlatformSupport):
* platform/graphics/skia/SkiaFontWin.cpp:
(WebCore::paintSkiaText):
Source/WebKit/chromium:
* src/PlatformSupport.cpp:
(WebCore::PlatformSupport::ensureFontLoaded):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129696 => 129697)
--- trunk/Source/WebCore/ChangeLog 2012-09-26 20:30:20 UTC (rev 129696)
+++ trunk/Source/WebCore/ChangeLog 2012-09-26 20:34:51 UTC (rev 129697)
@@ -1,3 +1,16 @@
+2012-09-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r129673.
+ http://trac.webkit.org/changeset/129673
+ https://bugs.webkit.org/show_bug.cgi?id=97723
+
+ Causing window build breakage (Requested by alecf on #webkit).
+
+ * platform/chromium/PlatformSupport.h:
+ (PlatformSupport):
+ * platform/graphics/skia/SkiaFontWin.cpp:
+ (WebCore::paintSkiaText):
+
2012-09-26 David Barton <[email protected]>
[MathML] Implement <mtd> rowspan and columnspan attributes
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (129696 => 129697)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-09-26 20:30:20 UTC (rev 129696)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-09-26 20:34:51 UTC (rev 129697)
@@ -49,6 +49,10 @@
typedef struct _NPP NPP_t;
typedef NPP_t* NPP;
+#if OS(WINDOWS)
+typedef struct HFONT__* HFONT;
+#endif
+
namespace WebCore {
class Color;
@@ -82,6 +86,11 @@
static void deleteCookie(const Document*, const KURL&, const String& cookieName);
static bool cookiesEnabled(const Document*);
+ // Font ---------------------------------------------------------------
+#if OS(WINDOWS)
+ static bool ensureFontLoaded(HFONT);
+#endif
+
// IndexedDB ----------------------------------------------------------
static PassRefPtr<IDBFactoryBackendInterface> idbFactory();
Modified: trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp (129696 => 129697)
--- trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2012-09-26 20:30:20 UTC (rev 129696)
+++ trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2012-09-26 20:34:51 UTC (rev 129697)
@@ -35,6 +35,7 @@
#include "Gradient.h"
#include "Pattern.h"
#include "PlatformContextSkia.h"
+#include "PlatformSupport.h"
#include "SimpleFontData.h"
#include "SkCanvas.h"
#include "SkDevice.h"
@@ -42,9 +43,6 @@
#include "SkShader.h"
#include "SkTemplates.h"
-#include <public/Platform.h>
-#include <public/win/WebSandboxSupport.h>
-
namespace WebCore {
#if !USE(SKIA_TEXT)
@@ -223,15 +221,9 @@
SkCanvas* canvas = platformContext->canvas();
TextDrawingModeFlags textMode = platformContext->getTextDrawingMode();
// Ensure font load for printing, because PDF device needs it.
- if (canvas->getTopDevice()->getDeviceCapabilities() & SkDevice::kVector_Capability) {
- WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->sandboxSupport();
+ if (canvas->getTopDevice()->getDeviceCapabilities() & SkDevice::kVector_Capability)
+ PlatformSupport::ensureFontLoaded(hfont);
- // if there is no sandbox, then we can assume the font
- // was able to be loaded successfully already
- if (sandboxSupport)
- sandboxSupport->ensureFontLoaded(font);
- }
-
// Filling (if necessary). This is the common case.
SkPaint paint;
platformContext->setupPaintForFilling(&paint);
Modified: trunk/Source/WebKit/chromium/ChangeLog (129696 => 129697)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-26 20:30:20 UTC (rev 129696)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-26 20:34:51 UTC (rev 129697)
@@ -1,3 +1,14 @@
+2012-09-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r129673.
+ http://trac.webkit.org/changeset/129673
+ https://bugs.webkit.org/show_bug.cgi?id=97723
+
+ Causing window build breakage (Requested by alecf on #webkit).
+
+ * src/PlatformSupport.cpp:
+ (WebCore::PlatformSupport::ensureFontLoaded):
+
2012-09-26 Sadrul Habib Chowdhury <[email protected]>
[chromium] Do not dispatch touch-events to plugins unless they explicitly request for touch-events.
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (129696 => 129697)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-09-26 20:30:20 UTC (rev 129696)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-09-26 20:34:51 UTC (rev 129697)
@@ -209,6 +209,11 @@
#if OS(WINDOWS)
bool PlatformSupport::ensureFontLoaded(HFONT font)
{
+ WebSandboxSupport* ss = WebKit::Platform::current()->sandboxSupport();
+
+ // if there is no sandbox, then we can assume the font
+ // was able to be loaded successfully already
+ return ss ? ss->ensureFontLoaded(font) : true;
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
