Attachment 165461 Details for Bug 97360 – Patch

[patch] Patch

bug-97360-20120924191228.patch (text/plain), 4.98 KB, created by Mark Pilgrim (Google) on 2012-09-24 16:13:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-09-24 16:13:07 PDT

Size: 4.98 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 129425)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2012-09-21  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium][Mac] Remove loadFont from PlatformSupport
>+        https://bugs.webkit.org/show_bug.cgi?id=97360
>+
>+        Reviewed by Adam Barth.
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * platform/chromium/PlatformSupport.h:
>+        (PlatformSupport):
>+        * platform/graphics/chromium/CrossProcessFontLoading.mm:
>+
> 2012-09-21  Kenneth Russell  <kbr@google.com>
> 
>         [V8] ArrayBuffer code should not pass a negative length to SetIndexedPropertiesToExternalArrayData()
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 129425)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -49,15 +49,6 @@ typedef struct NPObject NPObject;
> typedef struct _NPP NPP_t;
> typedef NPP_t* NPP;
> 
>-#if OS(DARWIN)
>-typedef struct CGFont* CGFontRef;
>-#ifdef __OBJC__
>-@class NSFont;
>-#else
>-class NSFont;
>-#endif
>-#endif // OS(DARWIN)
>-
> #if OS(WINDOWS)
> typedef struct HFONT__* HFONT;
> #endif
>@@ -99,9 +90,6 @@ public:
> #if OS(WINDOWS)
>     static bool ensureFontLoaded(HFONT);
> #endif
>-#if OS(DARWIN)
>-    static bool loadFont(NSFont* srcFont, CGFontRef*, uint32_t* fontID);
>-#endif
> 
>     // IndexedDB ----------------------------------------------------------
>     static PassRefPtr<IDBFactoryBackendInterface> idbFactory();
>Index: Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm
>===================================================================
>--- Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm	(revision 129425)
>+++ Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm	(working copy)
>@@ -30,8 +30,10 @@
> #import "CrossProcessFontLoading.h"
> 
> #import "../graphics/FontPlatformData.h"
>-#import "PlatformSupport.h"
>+#include "LinkHash.h"
> #import <AppKit/NSFont.h>
>+#import <public/Platform.h>
>+#import <public/mac/WebSandboxSupport.h>
> #import <wtf/HashMap.h>
> 
> namespace WebCore {
>@@ -121,7 +123,15 @@ PassRefPtr<MemoryActivatedFont> loadFont
>     CGFontRef tmpCGFont;
>     uint32_t fontID;
>     // Send cross-process request to load font.
>-    if (!PlatformSupport::loadFont(nsFont, &tmpCGFont, &fontID))
>+    WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->sandboxSupport();
>+    if (!sandboxSupport) {
>+        // This function should only be called in response to an error loading a
>+        // font due to being blocked by the sandbox.
>+        // This by definition shouldn't happen if there is no sandbox support.
>+        ASSERT_NOT_REACHED();
>+        return 0;
>+    }
>+    if (!sandboxSupport->loadFont(nsFont, &tmpCGFont, &fontID))
>         return 0;
> 
>     RetainPtr<CGFontRef> cgFont(tmpCGFont);
>@@ -129,7 +139,7 @@ PassRefPtr<MemoryActivatedFont> loadFont
>     // the ID cache.
>     font = fontCacheByFontID().get(fontID);
>     if (font)
>-        // FIXME: PlatformSupport::loadFont() should consult the id cache
>+        // FIXME: WebSandboxSupport::loadFont() should consult the id cache
>         // before activating the font.
>         return font;
> 
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 129425)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2012-09-21  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium][Mac] Remove loadFont from PlatformSupport
>+        https://bugs.webkit.org/show_bug.cgi?id=97360
>+
>+        Reviewed by Adam Barth.
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * src/PlatformSupport.cpp:
>+        (WebCore):
>+
> 2012-09-24  Tony Chang  <tony@chromium.org>
> 
>         Unreviewed.  Rolled DEPS.
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 129425)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -217,24 +217,6 @@ bool PlatformSupport::ensureFontLoaded(H
> }
> #endif
> 
>-#if OS(DARWIN)
>-bool PlatformSupport::loadFont(NSFont* srcFont, CGFontRef* out, uint32_t* fontID)
>-{
>-    WebSandboxSupport* ss = WebKit::Platform::current()->sandboxSupport();
>-    if (ss)
>-        return ss->loadFont(srcFont, out, fontID);
>-
>-    // This function should only be called in response to an error loading a
>-    // font due to being blocked by the sandbox.
>-    // This by definition shouldn't happen if there is no sandbox support.
>-    ASSERT_NOT_REACHED();
>-    *out = 0;
>-    *fontID = 0;
>-    return false;
>-}
>-#elif OS(UNIX)
>-#endif
>-
> // Indexed Database -----------------------------------------------------------
> 
> PassRefPtr<IDBFactoryBackendInterface> PlatformSupport::idbFactory()

Actions: View | Formatted Diff | Diff

Attachments on bug 97360: 165184 | 165233 | 165242 | 165461