FBTF: Even more ctor/virtual deinlining.

(Only 424k off Linux debug .a files).

BUG=none
TEST=compiles

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

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

5 files changed, 36 insertions, 11 deletions

diff --git a/media/base/callback.cc b/media/base/callback.cc
index 1e2b400..484c744 100644
--- a/media/base/callback.cc
+++ b/media/base/callback.cc
@@ -12,6 +12,12 @@ AutoTaskRunner::~AutoTaskRunner() {
   }
 }
 
+AutoCallbackRunner::~AutoCallbackRunner() {
+  if (callback_.get()) {
+    callback_->Run();
+  }
+}
+
 Callback0::Type* TaskToCallbackAdapter::NewCallback(Task* task) {
   return new TaskToCallbackAdapter(task);
 }
diff --git a/media/base/callback.h b/media/base/callback.h
index 2273ace..c21312e 100644
--- a/media/base/callback.h
+++ b/media/base/callback.h
@@ -51,11 +51,7 @@ class AutoCallbackRunner {
       : callback_(callback) {
   }
 
-  ~AutoCallbackRunner() {
-    if (callback_.get()) {
-      callback_->Run();
-    }
-  }
+  ~AutoCallbackRunner();
 
   Callback0::Type* release() { return callback_.release(); }
 
diff --git a/media/base/pts_heap.cc b/media/base/pts_heap.cc
new file mode 100644
index 0000000..84ff5d9
--- /dev/null
+++ b/media/base/pts_heap.cc
@@ -0,0 +1,21 @@
+// 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.
+
+#include "media/base/pts_heap.h"
+
+namespace media {
+
+PtsHeap::PtsHeap() {}
+
+PtsHeap::~PtsHeap() {}
+
+void PtsHeap::Push(const base::TimeDelta& pts) {
+  queue_.push(pts);
+}
+
+void PtsHeap::Pop() {
+  queue_.pop();
+}
+
+}  // namespace media
diff --git a/media/base/pts_heap.h b/media/base/pts_heap.h
index 7795d68..11a3dbc 100644
--- a/media/base/pts_heap.h
+++ b/media/base/pts_heap.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 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.
+// 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 MEDIA_BASE_PTS_HEAP_H_
 #define MEDIA_BASE_PTS_HEAP_H_
@@ -36,10 +36,11 @@ namespace media {
 
 class PtsHeap {
  public:
-  PtsHeap() {}
+  PtsHeap();
+  ~PtsHeap();
 
-  void Push(const base::TimeDelta& pts) { queue_.push(pts); }
-  void Pop() { queue_.pop(); }
+  void Push(const base::TimeDelta& pts);
+  void Pop();
 
   const base::TimeDelta& Top() const { return queue_.top(); }
   bool IsEmpty() const { return queue_.empty(); }
diff --git a/media/media.gyp b/media/media.gyp
index 9dae16a..0afbd79 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -91,6 +91,7 @@
         'base/pipeline.h',
         'base/pipeline_impl.cc',
         'base/pipeline_impl.h',
+        'base/pts_heap.cc',
         'base/pts_heap.h',
         'base/seekable_buffer.cc',
         'base/seekable_buffer.h',