Changeset 135929 in webkit

Timestamp:

Nov 27, 2012, 3:17:02 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Add WebLayerTreeViewClient API to request font atlas
​https://bugs.webkit.org/show_bug.cgi?id=102958

Patch by Eberhard Graether <​egraether@google.com> on 2012-11-27
Reviewed by James Robinson.

This change makes the font atlas creation accessible to the WebLayerTreeView.

Source/Platform:

• chromium/public/WebLayerTreeViewClient.h:

(WebKit):
(WebLayerTreeViewClient):
(WebKit::WebLayerTreeViewClient::createFontAtlas):

Source/WebKit/chromium:

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::createFontAtlas):
(WebKit):

• src/WebViewImpl.h:

(WebViewImpl):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/WebLayerTreeViewClient.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.h (modified) (1 diff)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-11-27  Eberhard Graether  <egraether@google.com>
+
+        [chromium] Add WebLayerTreeViewClient API to request font atlas
+        https://bugs.webkit.org/show_bug.cgi?id=102958
+
+        Reviewed by James Robinson.
+
+        This change makes the font atlas creation accessible to the WebLayerTreeView.
+
+        * chromium/public/WebLayerTreeViewClient.h:
+        (WebKit):
+        (WebLayerTreeViewClient):
+        (WebKit::WebLayerTreeViewClient::createFontAtlas):
+
 2012-11-27  Eberhard Graether  <egraether@google.com>
 

trunk/Source/Platform/chromium/public/WebLayerTreeViewClient.h

@@ -27 +27 @@
 #define WebLayerTreeViewClient_h
 
+class SkBitmap;
+
 namespace WebKit {
 class WebCompositorOutputSurface;
 class WebInputHandler;
 class WebThread;
+struct WebRect;
 struct WebSize;
 
@@ -91 +94 @@
     virtual void scheduleComposite() = 0;
 
+    // Creates a font atlas to use for debug visualizations. The atlas is a bitmap
+    // containing glyph data, a table of ASCII character values to a subrectangle
+    // of the atlas representing the corresponding glyph, and the glyph height.
+    virtual void createFontAtlas(SkBitmap&, WebRect asciiToRectTable[128], int& fontHeight) { }
+
 protected:
     virtual ~WebLayerTreeViewClient() { }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-11-27  Eberhard Graether  <egraether@google.com>
+
+        [chromium] Add WebLayerTreeViewClient API to request font atlas
+        https://bugs.webkit.org/show_bug.cgi?id=102958
+
+        Reviewed by James Robinson.
+
+        This change makes the font atlas creation accessible to the WebLayerTreeView.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::createFontAtlas):
+        (WebKit):
+        * src/WebViewImpl.h:
+        (WebViewImpl):
+
 2012-11-27  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -4213 +4213 @@
 }
 
+void WebViewImpl::createFontAtlas(SkBitmap& bitmap, WebRect asciiToRectTable[128], int& fontHeight)
+{
+    TRACE_EVENT0("webkit", "WebViewImpl::loadFontAtlas");
+    bitmap = WebCore::CompositorHUDFontAtlas::generateFontAtlas(asciiToRectTable, fontHeight);
+}
+
 void WebViewImpl::updateLayerTreeViewport()
 {

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -326 +326 @@
     virtual void didCompleteSwapBuffers();
     virtual void scheduleComposite();
+    virtual void createFontAtlas(SkBitmap&, WebRect[128], int&);
 
     // WebViewImpl