Changeset 133516 in webkit

Timestamp:

Nov 5, 2012, 12:49:05 PM (13 years ago)

Author:

jamesr@google.com

Message:

[chromium] Use const SkBitmap& parameter for WebLayerTreeView::setFontAtlas
​https://bugs.webkit.org/show_bug.cgi?id=101016

Reviewed by Adrienne Walker.

Passing SkBitmap by value requires including SkBitmap.h, which is tricky for some clients to do since it
requires having the rest of skia's headers on the include path and setting up the correct config to set
preprocessor defines. Also shuffles the parameter order around to make rolling easier since you can't override
just by const ref-ness.

• chromium/public/WebLayerTreeView.h:

(WebKit::WebLayerTreeView::setFontAtlas):

Location:

trunk/Source

Files:

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

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-11-05  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Use const SkBitmap& parameter for WebLayerTreeView::setFontAtlas
+        https://bugs.webkit.org/show_bug.cgi?id=101016
+
+        Reviewed by Adrienne Walker.
+
+        Passing SkBitmap by value requires including SkBitmap.h, which is tricky for some clients to do since it
+        requires having the rest of skia's headers on the include path and setting up the correct config to set
+        preprocessor defines.  Also shuffles the parameter order around to make rolling easier since you can't override
+        just by const ref-ness.
+
+        * chromium/public/WebLayerTreeView.h:
+        (WebKit::WebLayerTreeView::setFontAtlas):
+
 2012-11-05  Alok Priyadarshi  <alokp@chromium.org>
 

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

@@ -27 +27 @@
 #define WebLayerTreeView_h
 
-#include "SkBitmap.h"
 #include "WebColor.h"
 #include "WebCommon.h"
@@ -34 +33 @@
 #include "WebPrivateOwnPtr.h"
 #include "WebSize.h"
+
+class SkBitmap;
 
 namespace WebKit {
@@ -171 +172 @@
     // Provides a font atlas to use for debug visualizations. The atlas must be 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 setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontHeight) = 0;
+    virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, int fontHeight) { }
 
     // Simulates a lost context. For testing only.

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

@@ -4004 +4004 @@
                 int fontHeight;
                 SkBitmap bitmap = WebCore::CompositorHUDFontAtlas::generateFontAtlas(asciiToRectTable, fontHeight);
-                m_layerTreeView->setFontAtlas(bitmap, asciiToRectTable, fontHeight);
+                m_layerTreeView->setFontAtlas(asciiToRectTable, bitmap, fontHeight);
             }
         } else {