diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-03 01:08:20 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-03 01:08:20 +0000 |
| commit | 640962e3dfae9c43aff3b78e6b3b710bcdace270 (patch) | |
| tree | 3e0482aec256810f2f6dd9ff0361dd34206144f8 /webkit/compositor_bindings | |
| parent | b755ebba29dd405d6f1e4cf70f5bc81ffd33b0f6 (diff) | |
| download | chromium_src-640962e3dfae9c43aff3b78e6b3b710bcdace270.zip chromium_src-640962e3dfae9c43aff3b78e6b3b710bcdace270.tar.gz chromium_src-640962e3dfae9c43aff3b78e6b3b710bcdace270.tar.bz2 | |
Prepare for WebLayerTreeView::setFontAtlas interface change
Chromium side for https://bugs.webkit.org/show_bug.cgi?id=101016 to
make it easier for some android code to use WebLayerTreeView.h
BUG=
Review URL: https://chromiumcodereview.appspot.com/11312058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index 742ad11..9f3e893 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -193,7 +193,11 @@ void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const stats.numMainThreadScrolls = ccStats.numMainThreadScrolls; } -void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) +void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) { + setFontAtlas(asciiToWebRectTable, bitmap, fontHeight); +} + +void WebLayerTreeViewImpl::setFontAtlas(WebRect asciiToWebRectTable[128], const SkBitmap& bitmap, int fontHeight) { gfx::Rect asciiToRectTable[128]; for (int i = 0; i < 128; ++i) diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h index ae2e45d..42d4a49 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.h +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h @@ -49,7 +49,8 @@ public: virtual void finishAllRendering() OVERRIDE; virtual void setDeferCommits(bool deferCommits) OVERRIDE; virtual void renderingStats(WebRenderingStats&) const OVERRIDE; - virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontHeight) OVERRIDE; + virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontHeight); + virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, int fontHeight); virtual void loseCompositorContext(int numTimes) OVERRIDE; // cc::LayerTreeHostClient implementation. |