diff options
author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 00:28:14 +0000 |
---|---|---|
committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 00:28:14 +0000 |
commit | 03ff5e59b44cc3ad7bfc80e01af2d8bf53dcc34b (patch) | |
tree | 4890392665cbbec1941db05fa7b1ed68d9b79c46 /content/renderer | |
parent | 1347570839022dfc6b51ad0580352a7585b21562 (diff) | |
download | chromium_src-03ff5e59b44cc3ad7bfc80e01af2d8bf53dcc34b.zip chromium_src-03ff5e59b44cc3ad7bfc80e01af2d8bf53dcc34b.tar.gz chromium_src-03ff5e59b44cc3ad7bfc80e01af2d8bf53dcc34b.tar.bz2 |
Here are more exports needed for content_unittests to link in the component build.
R=jam@chromium.org, darin@chromium.org
BUG=90442
TEST=
Review URL: http://codereview.chromium.org/8054037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r-- | content/renderer/active_notification_tracker.h | 5 | ||||
-rw-r--r-- | content/renderer/media/audio_message_filter.h | 6 | ||||
-rw-r--r-- | content/renderer/media/audio_renderer_impl.h | 3 | ||||
-rw-r--r-- | content/renderer/media/capture_video_decoder.h | 3 | ||||
-rw-r--r-- | content/renderer/media/media_stream_dispatcher.h | 3 | ||||
-rw-r--r-- | content/renderer/media/media_stream_dispatcher_eventhandler.h | 3 | ||||
-rw-r--r-- | content/renderer/media/rtc_video_decoder.h | 6 | ||||
-rw-r--r-- | content/renderer/media/video_capture_impl.h | 6 | ||||
-rw-r--r-- | content/renderer/media/video_capture_impl_manager.h | 3 | ||||
-rw-r--r-- | content/renderer/media/video_capture_message_filter.h | 6 | ||||
-rw-r--r-- | content/renderer/paint_aggregator.h | 7 |
11 files changed, 32 insertions, 19 deletions
diff --git a/content/renderer/active_notification_tracker.h b/content/renderer/active_notification_tracker.h index 7cfb5ae..4a445a8 100644 --- a/content/renderer/active_notification_tracker.h +++ b/content/renderer/active_notification_tracker.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,6 +11,7 @@ #include "base/basictypes.h" #include "base/id_map.h" #include "base/hash_tables.h" +#include "content/common/content_export.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h" namespace WebKit { @@ -20,7 +21,7 @@ class WebNotificationPermissionCallback; // This class manages the set of active Notification objects in either // a render or worker process. This class should be accessed only on // the main thread. -class ActiveNotificationTracker { +class CONTENT_EXPORT ActiveNotificationTracker { public: ActiveNotificationTracker(); ~ActiveNotificationTracker(); diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h index 68b8460..0f98cfa 100644 --- a/content/renderer/media/audio_message_filter.h +++ b/content/renderer/media/audio_message_filter.h @@ -16,6 +16,7 @@ #include "base/shared_memory.h" #include "base/sync_socket.h" #include "content/common/media/audio_stream_state.h" +#include "content/common/content_export.h" #include "ipc/ipc_channel_proxy.h" #include "media/audio/audio_buffers_state.h" @@ -25,9 +26,10 @@ namespace base { class Time; } -class AudioMessageFilter : public IPC::ChannelProxy::MessageFilter { +class CONTENT_EXPORT AudioMessageFilter + : public IPC::ChannelProxy::MessageFilter { public: - class Delegate { + class CONTENT_EXPORT Delegate { public: // Called when an audio packet is requested from the browser process. virtual void OnRequestPacket(AudioBuffersState buffers_state) = 0; diff --git a/content/renderer/media/audio_renderer_impl.h b/content/renderer/media/audio_renderer_impl.h index 802e1ae..22d4b6f 100644 --- a/content/renderer/media/audio_renderer_impl.h +++ b/content/renderer/media/audio_renderer_impl.h @@ -44,6 +44,7 @@ #include "base/shared_memory.h" #include "base/synchronization/lock.h" #include "base/threading/simple_thread.h" +#include "content/common/content_export.h" #include "content/renderer/media/audio_message_filter.h" #include "media/audio/audio_io.h" #include "media/audio/audio_manager.h" @@ -52,7 +53,7 @@ class AudioMessageFilter; -class AudioRendererImpl +class CONTENT_EXPORT AudioRendererImpl : public media::AudioRendererBase, public AudioMessageFilter::Delegate, public base::DelegateSimpleThread::Delegate, diff --git a/content/renderer/media/capture_video_decoder.h b/content/renderer/media/capture_video_decoder.h index f616700..0c874ab 100644 --- a/content/renderer/media/capture_video_decoder.h +++ b/content/renderer/media/capture_video_decoder.h @@ -8,6 +8,7 @@ #include <deque> #include "base/time.h" +#include "content/common/content_export.h" #include "media/base/demuxer_stream.h" #include "media/base/filters.h" #include "media/base/video_frame.h" @@ -20,7 +21,7 @@ class VideoCaptureImplManager; // A filter takes raw frames from video capture engine and passes them to media // engine as a video decoder filter. -class CaptureVideoDecoder +class CONTENT_EXPORT CaptureVideoDecoder : public media::VideoDecoder, public media::VideoCapture::EventHandler { public: diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h index d154c8b..deb543c 100644 --- a/content/renderer/media/media_stream_dispatcher.h +++ b/content/renderer/media/media_stream_dispatcher.h @@ -11,6 +11,7 @@ #include "base/basictypes.h" #include "base/message_loop.h" +#include "content/common/content_export.h" #include "content/common/media/media_stream_options.h" #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" #include "content/renderer/render_view_observer.h" @@ -20,7 +21,7 @@ // and Audio input devices. // It's the complement of MediaStreamDispatcherHost (owned by // BrowserRenderProcessHost). -class MediaStreamDispatcher : public RenderViewObserver { +class CONTENT_EXPORT MediaStreamDispatcher : public RenderViewObserver { public: explicit MediaStreamDispatcher(RenderView* render_view); virtual ~MediaStreamDispatcher(); diff --git a/content/renderer/media/media_stream_dispatcher_eventhandler.h b/content/renderer/media/media_stream_dispatcher_eventhandler.h index 4388eea..134801e 100644 --- a/content/renderer/media/media_stream_dispatcher_eventhandler.h +++ b/content/renderer/media/media_stream_dispatcher_eventhandler.h @@ -7,9 +7,10 @@ #include <string> +#include "content/common/content_export.h" #include "content/common/media/media_stream_options.h" -class MediaStreamDispatcherEventHandler { +class CONTENT_EXPORT MediaStreamDispatcherEventHandler { public: // A new media stream have been created. virtual void OnStreamGenerated( diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h index d5ffb7b..eb59e22 100644 --- a/content/renderer/media/rtc_video_decoder.h +++ b/content/renderer/media/rtc_video_decoder.h @@ -8,9 +8,11 @@ #include <deque> #include <string> +#include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/synchronization/lock.h" #include "base/time.h" +#include "content/common/content_export.h" #include "media/base/filters.h" #include "media/base/video_frame.h" #include "third_party/libjingle/source/talk/session/phone/mediachannel.h" @@ -22,9 +24,9 @@ namespace cricket { class VideoFrame; } // namespace cricket -class RTCVideoDecoder +class CONTENT_EXPORT RTCVideoDecoder : public media::VideoDecoder, - public cricket::VideoRenderer { + NON_EXPORTED_BASE(public cricket::VideoRenderer) { public: RTCVideoDecoder(MessageLoop* message_loop, const std::string& url); virtual ~RTCVideoDecoder(); diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h index 7cb76af..8e3f690 100644 --- a/content/renderer/media/video_capture_impl.h +++ b/content/renderer/media/video_capture_impl.h @@ -12,6 +12,7 @@ #include <list> #include <map> +#include "content/common/content_export.h" #include "content/renderer/media/video_capture_message_filter.h" #include "media/video/capture/video_capture.h" @@ -19,9 +20,8 @@ namespace base { class MessageLoopProxy; } -class VideoCaptureImpl - : public media::VideoCapture, - public VideoCaptureMessageFilter::Delegate { +class CONTENT_EXPORT VideoCaptureImpl + : public media::VideoCapture, public VideoCaptureMessageFilter::Delegate { public: // media::VideoCapture interface. virtual void StartCapture(media::VideoCapture::EventHandler* handler, diff --git a/content/renderer/media/video_capture_impl_manager.h b/content/renderer/media/video_capture_impl_manager.h index 282eb3c..8427957f 100644 --- a/content/renderer/media/video_capture_impl_manager.h +++ b/content/renderer/media/video_capture_impl_manager.h @@ -16,12 +16,13 @@ #include "base/threading/thread.h" #include "base/message_loop_proxy.h" #include "base/synchronization/lock.h" +#include "content/common/content_export.h" #include "media/video/capture/video_capture.h" class VideoCaptureImpl; class VideoCaptureMessageFilter; -class VideoCaptureImplManager +class CONTENT_EXPORT VideoCaptureImplManager : public base::RefCountedThreadSafe<VideoCaptureImplManager> { public: VideoCaptureImplManager(); diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h index eecb339..6c67f8e 100644 --- a/content/renderer/media/video_capture_message_filter.h +++ b/content/renderer/media/video_capture_message_filter.h @@ -14,12 +14,14 @@ #include "base/message_loop_proxy.h" #include "base/shared_memory.h" +#include "content/common/content_export.h" #include "ipc/ipc_channel_proxy.h" #include "media/video/capture/video_capture.h" -class VideoCaptureMessageFilter : public IPC::ChannelProxy::MessageFilter { +class CONTENT_EXPORT VideoCaptureMessageFilter + : public IPC::ChannelProxy::MessageFilter { public: - class Delegate { + class CONTENT_EXPORT Delegate { public: // Called when a video frame buffer is created in the browser process. virtual void OnBufferCreated(base::SharedMemoryHandle handle, diff --git a/content/renderer/paint_aggregator.h b/content/renderer/paint_aggregator.h index 84d36907..23642a0 100644 --- a/content/renderer/paint_aggregator.h +++ b/content/renderer/paint_aggregator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,11 +9,12 @@ #include <vector> #include "base/basictypes.h" +#include "content/common/content_export.h" #include "ui/gfx/rect.h" // This class is responsible for aggregating multiple invalidation and scroll // commands to produce a scroll and repaint sequence. -class PaintAggregator { +class CONTENT_EXPORT PaintAggregator { public: // This structure describes an aggregation of InvalidateRect and ScrollRect // calls. If |scroll_rect| is non-empty, then that rect should be scrolled @@ -22,7 +23,7 @@ class PaintAggregator { // are non-empty, then scrolling should be performed before repainting. // |scroll_delta| can only specify scrolling in one direction (i.e., the x // and y members cannot both be non-zero). - struct PendingUpdate { + struct CONTENT_EXPORT PendingUpdate { PendingUpdate(); ~PendingUpdate(); |