Bug 933638 - move nsTextFrameTextRunCache to nsTextFrame.h r=heycam

layout/build/nsLayoutStatics.cpp

@@ -43,7 +43,7 @@
 #include "txMozillaXSLTProcessor.h"
 #include "nsTreeSanitizer.h"
 #include "nsCellMap.h"
-#include "nsTextFrameTextRunCache.h"
+#include "nsTextFrame.h"
 #include "nsCCUncollectableMarker.h"
 #include "nsTextFragment.h"
 #include "nsCSSRuleProcessor.h"

layout/generic/nsTextFrame.cpp

@@ -41,7 +41,6 @@
 #include "nsPlaceholderFrame.h"
 #include "nsTextFrameUtils.h"
 #include "nsTextRunTransformations.h"
-#include "nsTextFrameTextRunCache.h"
 #include "nsExpirationTracker.h"
 #include "nsUnicodeProperties.h"
 

layout/generic/nsTextFrame.h

@@ -31,6 +31,12 @@ typedef nsFrame nsTextFrameBase;
 class nsDisplayTextGeometry;
 class nsDisplayText;
 
+class nsTextFrameTextRunCache {
+public:
+  static void Init();
+  static void Shutdown();
+};
+
 class nsTextFrame : public nsTextFrameBase {
 public:
   NS_DECL_QUERYFRAME_TARGET(nsTextFrame)

layout/generic/nsTextFrameTextRunCache.h

@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef NSTEXTFRAMETEXTRUNCACHE_H_
-#define NSTEXTFRAMETEXTRUNCACHE_H_
-
-#include "nscore.h"
-
-/**
- * This is implemented by both nsTextFrame.cpp and nsTextFrameThebes.cpp. Which
- * implementation gets used depends on which file gets built.
- */
-class nsTextFrameTextRunCache {
-public:
-  static void Init();
-  static void Shutdown();
-};
-
-#endif