Rework gfx::Font by moving platform-specific code into inner classes.

gfx::Font is a platform-neutral API shim that exists as a wrapper object to allow for the creation and lifetime of gfx::Font objects to remain consistent with past usage.

gfx::PlatformFont is an interface implemented by the platform-specific inner classes (gfx::PlatformFontWin,Mac,Gtk).

BUG=none
TEST=existing unittests

Review URL: http://codereview.chromium.org/3083022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56040 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 57 insertions, 0 deletions

diff --git a/gfx/platform_font_mac.h b/gfx/platform_font_mac.h
new file mode 100644
index 0000000..71a8262
--- /dev/null
+++ b/gfx/platform_font_mac.h
@@ -0,0 +1,57 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef GFX_PLATFORM_FONT_MAC_
+#define GFX_PLATFORM_FONT_MAC_
+#pragma once
+
+#include "gfx/platform_font.h"
+
+namespace gfx {
+
+class PlatformFontMac : public PlatformFont {
+ public:
+  PlatformFontMac();
+  explicit PlatformFontMac(const Font& other);
+  explicit PlatformFontMac(NativeFont native_font);
+  PlatformFontMac(const std::wstring& font_name,
+                  int font_size);
+
+  // Overridden from PlatformFont:
+  virtual Font DeriveFont(int size_delta, int style) const;
+  virtual int GetHeight() const;
+  virtual int GetBaseline() const;
+  virtual int GetAverageCharacterWidth() const;
+  virtual int GetStringWidth(const std::wstring& text) const;
+  virtual int GetExpectedTextWidth(int length) const;
+  virtual int GetStyle() const;
+  virtual const std::wstring& GetFontName() const;
+  virtual int GetFontSize() const;
+  virtual NativeFont GetNativeFont() const;
+
+ private:
+  PlatformFontMac(const std::wstring& font_name, int font_size, int style);
+  virtual ~PlatformFontMac() {}
+
+  // Initialize the object with the specified parameters.
+  void InitWithNameSizeAndStyle(const std::wstring& font_name,
+                                int font_size,
+                                int style);
+
+  // Calculate and cache the font metrics.
+  void CalculateMetrics();
+
+  std::wstring font_name_;
+  int font_size_;
+  int style_;
+
+  // Cached metrics, generated at construction
+  int height_;
+  int ascent_;
+  int average_width_;
+};
+
+}  // namespace gfx
+
+#endif  // GFX_PLATFORM_FONT_MAC_