summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authoregraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-13 06:55:15 +0000
committeregraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-13 06:55:15 +0000
commit845720a13b1e57260f8d0937ef97d613ec7bb98c (patch)
treec6288b7b9ece76cab31af90bf689a3f38b44c5a3 /content
parentb631ffd1c7463c45ccf79448c1ca768fa7d0f1fa (diff)
downloadchromium_src-845720a13b1e57260f8d0937ef97d613ec7bb98c.zip
chromium_src-845720a13b1e57260f8d0937ef97d613ec7bb98c.tar.gz
chromium_src-845720a13b1e57260f8d0937ef97d613ec7bb98c.tar.bz2
cc: remove FontAtlas
After switching the HudLayer to use skia's font rendering the FontAtlas has become obsolete. This change removes the FontAtlas and all the related plumbing. BUG=172284 Review URL: https://chromiumcodereview.appspot.com/12212099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/compositor_impl_android.cc5
-rw-r--r--content/browser/renderer_host/compositor_impl_android.h2
-rw-r--r--content/renderer/gpu/render_widget_compositor.cc15
-rw-r--r--content/renderer/gpu/render_widget_compositor.h1
4 files changed, 0 insertions, 23 deletions
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index db77287..8035ab7 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -11,7 +11,6 @@
#include "base/command_line.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "cc/font_atlas.h"
#include "cc/input_handler.h"
#include "cc/layer.h"
#include "cc/layer_tree_host.h"
@@ -362,10 +361,6 @@ void CompositorImpl::scheduleComposite() {
client_->ScheduleComposite();
}
-scoped_ptr<cc::FontAtlas> CompositorImpl::createFontAtlas() {
- return scoped_ptr<cc::FontAtlas>();
-}
-
void CompositorImpl::OnViewContextSwapBuffersPosted() {
TRACE_EVENT0("compositor", "CompositorImpl::OnViewContextSwapBuffersPosted");
}
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index a3b728e..eeb33e8 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -17,7 +17,6 @@
struct ANativeWindow;
namespace cc {
-class FontAtlas;
class InputHandler;
class Layer;
class LayerTreeHost;
@@ -77,7 +76,6 @@ class CONTENT_EXPORT CompositorImpl
virtual void didCommitAndDrawFrame() OVERRIDE;
virtual void didCompleteSwapBuffers() OVERRIDE;
virtual void scheduleComposite() OVERRIDE;
- virtual scoped_ptr<cc::FontAtlas> createFontAtlas() OVERRIDE;
// WebGraphicsContext3DSwapBuffersClient implementation.
virtual void OnViewContextSwapBuffersPosted() OVERRIDE;
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 066f6e0..d43ea6b 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -8,7 +8,6 @@
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/time.h"
-#include "cc/font_atlas.h"
#include "cc/layer.h"
#include "cc/layer_tree_debug_state.h"
#include "cc/layer_tree_host.h"
@@ -379,18 +378,4 @@ void RenderWidgetCompositor::scheduleComposite() {
client_->scheduleComposite();
}
-scoped_ptr<cc::FontAtlas> RenderWidgetCompositor::createFontAtlas() {
- int font_height;
- WebRect ascii_to_web_rect_table[128];
- gfx::Rect ascii_to_rect_table[128];
- SkBitmap bitmap;
-
- client_->createFontAtlas(bitmap, ascii_to_web_rect_table, font_height);
-
- for (int i = 0; i < 128; ++i)
- ascii_to_rect_table[i] = ascii_to_web_rect_table[i];
-
- return cc::FontAtlas::create(bitmap, ascii_to_rect_table, font_height).Pass();
-}
-
} // namespace content
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index 40ce9da..5cebe9f 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -83,7 +83,6 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView,
virtual void didCommitAndDrawFrame() OVERRIDE;
virtual void didCompleteSwapBuffers() OVERRIDE;
virtual void scheduleComposite() OVERRIDE;
- virtual scoped_ptr<cc::FontAtlas> createFontAtlas() OVERRIDE;
private:
RenderWidgetCompositor(RenderWidget* widget,