Bug 1178513 - Export libxul symbols needed by ACL. r=mattwoodrow

This commit is contained in:
Hamzata Diallo 2015-07-02 15:19:35 -07:00
parent e11df26880
commit 9a79d7372b
12 changed files with 26 additions and 20 deletions

View File

@ -217,7 +217,7 @@ public:
// Called by the media decoder and the video frame to get the // Called by the media decoder and the video frame to get the
// ImageContainer containing the video data. // ImageContainer containing the video data.
virtual VideoFrameContainer* GetVideoFrameContainer() final override; B2G_ACL_EXPORT virtual VideoFrameContainer* GetVideoFrameContainer() final override;
layers::ImageContainer* GetImageContainer(); layers::ImageContainer* GetImageContainer();
// Dispatch events // Dispatch events

View File

@ -34,7 +34,7 @@ class ImageContainer;
* confusing. * confusing.
*/ */
class VideoFrameContainer { class VideoFrameContainer {
~VideoFrameContainer(); B2G_ACL_EXPORT ~VideoFrameContainer();
public: public:
typedef layers::ImageContainer ImageContainer; typedef layers::ImageContainer ImageContainer;
@ -46,7 +46,7 @@ public:
already_AddRefed<ImageContainer> aContainer); already_AddRefed<ImageContainer> aContainer);
// Call on any thread // Call on any thread
void SetCurrentFrame(const gfxIntSize& aIntrinsicSize, Image* aImage, B2G_ACL_EXPORT void SetCurrentFrame(const gfxIntSize& aIntrinsicSize, Image* aImage,
TimeStamp aTargetTime); TimeStamp aTargetTime);
void ClearCurrentFrame(bool aResetSize = false); void ClearCurrentFrame(bool aResetSize = false);
// Reset the VideoFrameContainer // Reset the VideoFrameContainer
@ -61,8 +61,8 @@ public:
INVALIDATE_FORCE INVALIDATE_FORCE
}; };
void Invalidate() { InvalidateWithFlags(INVALIDATE_DEFAULT); } void Invalidate() { InvalidateWithFlags(INVALIDATE_DEFAULT); }
void InvalidateWithFlags(uint32_t aFlags); B2G_ACL_EXPORT void InvalidateWithFlags(uint32_t aFlags);
ImageContainer* GetImageContainer(); B2G_ACL_EXPORT ImageContainer* GetImageContainer();
void ForgetElement() { mElement = nullptr; } void ForgetElement() { mElement = nullptr; }
protected: protected:

View File

@ -303,7 +303,7 @@ public:
* Can be called on any thread. This method takes mReentrantMonitor * Can be called on any thread. This method takes mReentrantMonitor
* when accessing thread-shared state. * when accessing thread-shared state.
*/ */
already_AddRefed<Image> CreateImage(ImageFormat aFormat); B2G_ACL_EXPORT already_AddRefed<Image> CreateImage(ImageFormat aFormat);
/** /**
* Set an Image as the current image to display. The Image must have * Set an Image as the current image to display. The Image must have
@ -523,7 +523,7 @@ private:
typedef mozilla::ReentrantMonitor ReentrantMonitor; typedef mozilla::ReentrantMonitor ReentrantMonitor;
// Private destructor, to discourage deletion outside of Release(): // Private destructor, to discourage deletion outside of Release():
~ImageContainer(); B2G_ACL_EXPORT ~ImageContainer();
void SetCurrentImageInternal(Image* aImage); void SetCurrentImageInternal(Image* aImage);

View File

@ -485,7 +485,7 @@ private:
* Here goes the shut-down code that uses virtual methods. * Here goes the shut-down code that uses virtual methods.
* Must only be called by Release(). * Must only be called by Release().
*/ */
void Finalize(); B2G_ACL_EXPORT void Finalize();
friend class AtomicRefCountedWithFinalize<TextureClient>; friend class AtomicRefCountedWithFinalize<TextureClient>;

View File

@ -109,7 +109,7 @@ public:
// NOTE: These methods may be called on any thread. The Task will be invoked // NOTE: These methods may be called on any thread. The Task will be invoked
// on the thread that executes MessageLoop::Run(). // on the thread that executes MessageLoop::Run().
void PostTask( B2G_ACL_EXPORT void PostTask(
const tracked_objects::Location& from_here, Task* task); const tracked_objects::Location& from_here, Task* task);
void PostDelayedTask( void PostDelayedTask(

View File

@ -18,7 +18,7 @@
class Task : public tracked_objects::Tracked { class Task : public tracked_objects::Tracked {
public: public:
Task() {} Task() {}
virtual ~Task() {} virtual B2G_ACL_EXPORT ~Task() {}
// Tasks are automatically deleted after Run is called. // Tasks are automatically deleted after Run is called.
virtual void Run() = 0; virtual void Run() = 0;

View File

@ -94,8 +94,8 @@ class Births;
class Tracked { class Tracked {
public: public:
Tracked(); B2G_ACL_EXPORT Tracked();
virtual ~Tracked(); B2G_ACL_EXPORT virtual ~Tracked();
// Used to record the FROM_HERE location of a caller. // Used to record the FROM_HERE location of a caller.
void SetBirthPlace(const Location& from_here); void SetBirthPlace(const Location& from_here);

View File

@ -69,7 +69,7 @@ public:
// getBufferQueue returns the GonkBufferQueue object to which this // getBufferQueue returns the GonkBufferQueue object to which this
// GonkConsumerBase is connected. // GonkConsumerBase is connected.
sp<GonkBufferQueue> getBufferQueue() const; B2G_ACL_EXPORT sp<GonkBufferQueue> getBufferQueue() const;
// dump writes the current state to a string. Child classes should add // dump writes the current state to a string. Child classes should add
// their state to the dump by overriding the dumpLocked method, which is // their state to the dump by overriding the dumpLocked method, which is

View File

@ -67,7 +67,7 @@ class GonkNativeWindow: public GonkConsumerBase
// access at the same time. // access at the same time.
// controlledByApp tells whether this consumer is controlled by the // controlledByApp tells whether this consumer is controlled by the
// application. // application.
GonkNativeWindow(int bufferCount = GonkBufferQueue::MIN_UNDEQUEUED_BUFFERS); B2G_ACL_EXPORT GonkNativeWindow(int bufferCount = GonkBufferQueue::MIN_UNDEQUEUED_BUFFERS);
GonkNativeWindow(const sp<GonkBufferQueue>& bq, uint32_t consumerUsage, GonkNativeWindow(const sp<GonkBufferQueue>& bq, uint32_t consumerUsage,
int bufferCount = GonkBufferQueue::MIN_UNDEQUEUED_BUFFERS, int bufferCount = GonkBufferQueue::MIN_UNDEQUEUED_BUFFERS,
bool controlledByApp = false); bool controlledByApp = false);
@ -112,7 +112,7 @@ class GonkNativeWindow: public GonkConsumerBase
status_t setDefaultBufferFormat(uint32_t defaultFormat); status_t setDefaultBufferFormat(uint32_t defaultFormat);
// Get next frame from the queue, caller owns the returned buffer. // Get next frame from the queue, caller owns the returned buffer.
already_AddRefed<TextureClient> getCurrentBuffer(); B2G_ACL_EXPORT already_AddRefed<TextureClient> getCurrentBuffer();
// Return the buffer to the queue and mark it as FREE. After that // Return the buffer to the queue and mark it as FREE. After that
// the buffer is useable again for the decoder. // the buffer is useable again for the decoder.
@ -120,7 +120,7 @@ class GonkNativeWindow: public GonkConsumerBase
already_AddRefed<TextureClient> getTextureClientFromBuffer(ANativeWindowBuffer* buffer); already_AddRefed<TextureClient> getTextureClientFromBuffer(ANativeWindowBuffer* buffer);
void setNewFrameCallback(GonkNativeWindowNewFrameCallback* callback); B2G_ACL_EXPORT void setNewFrameCallback(GonkNativeWindowNewFrameCallback* callback);
static void RecycleCallback(TextureClient* client, void* closure); static void RecycleCallback(TextureClient* client, void* closure);

View File

@ -121,6 +121,12 @@
#endif #endif
#ifdef MOZ_WIDGET_GONK
#define B2G_ACL_EXPORT NS_EXPORT
#else
#define B2G_ACL_EXPORT
#endif
/** /**
* Macro for creating typedefs for pointer-to-member types which are * Macro for creating typedefs for pointer-to-member types which are
* declared with stdcall. It is important to use this for any type which is * declared with stdcall. It is important to use this for any type which is

View File

@ -119,7 +119,7 @@ char* ToNewCString(const nsACString& aSource);
* @return a new |char| buffer you must free with |free|. * @return a new |char| buffer you must free with |free|.
*/ */
char* ToNewUTF8String(const nsAString& aSource, uint32_t* aUTF8Count = nullptr); B2G_ACL_EXPORT char* ToNewUTF8String(const nsAString& aSource, uint32_t* aUTF8Count = nullptr);
/** /**

View File

@ -311,13 +311,13 @@ public:
* for wide strings. Call this version when you know the * for wide strings. Call this version when you know the
* length of 'data'. * length of 'data'.
*/ */
bool NS_FASTCALL EqualsASCII(const char* aData, size_type aLen) const; bool NS_FASTCALL B2G_ACL_EXPORT EqualsASCII(const char* aData, size_type aLen) const;
/** /**
* An efficient comparison with ASCII that can be used even * An efficient comparison with ASCII that can be used even
* for wide strings. Call this version when 'data' is * for wide strings. Call this version when 'data' is
* null-terminated. * null-terminated.
*/ */
bool NS_FASTCALL EqualsASCII(const char* aData) const; bool NS_FASTCALL B2G_ACL_EXPORT EqualsASCII(const char* aData) const;
// EqualsLiteral must ONLY be applied to an actual literal string, or // EqualsLiteral must ONLY be applied to an actual literal string, or
// a char array *constant* declared without an explicit size. // a char array *constant* declared without an explicit size.
@ -952,7 +952,7 @@ protected:
* any of its member variables. in other words, this function acts * any of its member variables. in other words, this function acts
* like a destructor. * like a destructor.
*/ */
void NS_FASTCALL Finalize(); void NS_FASTCALL B2G_ACL_EXPORT Finalize();
/** /**
* this function prepares mData to be mutated. * this function prepares mData to be mutated.