wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out c25bc74b7fd3 (bug 798033) for build bustage

Browse Source
This commit is contained in:
Phil Ringnalda 2012-10-26 19:05:18 -07:00
parent cc0bb2727c
commit b6c07f4fe7
9 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/canvas/src/CanvasUtils.cpp
View File

@ -23,8 +23,6 @@
#include "CanvasUtils.h"
#include "mozilla/gfx/Matrix.h"
using namespace mozilla::gfx;
namespace mozilla {
namespace CanvasUtils {

5
content/canvas/src/CanvasUtils.h
View File

@ -21,6 +21,7 @@ class Matrix;
namespace CanvasUtils {
using namespace gfx;
// Check that the rectangle [x,y,w,h] is a subrectangle of [0,0,realWidth,realHeight]
@ -54,11 +55,11 @@ bool CoerceDouble(jsval v, double* d);
bool JSValToMatrix(JSContext* cx, const jsval& val,
gfxMatrix* matrix, nsresult* rv);
bool JSValToMatrix(JSContext* cx, const jsval& val,
gfx::Matrix* matrix, nsresult* rv);
Matrix* matrix, nsresult* rv);
nsresult MatrixToJSVal(const gfxMatrix& matrix,
JSContext* cx, jsval* val);
nsresult MatrixToJSVal(const gfx::Matrix& matrix,
nsresult MatrixToJSVal(const Matrix& matrix,
JSContext* cx, jsval* val);
/* Float validation stuff */

1
content/media/gstreamer/nsGStreamerReader.h
View File

@ -11,6 +11,7 @@
#include <gst/video/video.h>
#include "nsBuiltinDecoderReader.h"
using namespace mozilla;
class nsMediaDecoder;
class nsTimeRanges;

3
content/media/nsAudioAvailableEventManager.h
View File

@ -12,6 +12,7 @@
#include "nsBuiltinDecoder.h"
#include "nsBuiltinDecoderReader.h"
using namespace mozilla;
class nsAudioAvailableEventManager
{
@ -78,7 +79,7 @@ private:
// ReentrantMonitor for shared access to mPendingEvents queue or
// buffer length.
mozilla::ReentrantMonitor mReentrantMonitor;
ReentrantMonitor mReentrantMonitor;
// True if something in the owning document has a listener on the
// "MozAudioAvailable" event. If not, we don't need to bother copying played

6
content/media/nsBuiltinDecoderStateMachine.h
View File

@ -275,7 +275,7 @@ protected:
{
// Don't let Run() (called by media stream graph thread) race with
// Revoke() (called by decoder state machine thread)
mozilla::MutexAutoLock lock(mMutex);
MutexAutoLock lock(mMutex);
if (!mStateMachine)
return NS_OK;
stateMachine = mStateMachine;
@ -285,11 +285,11 @@ protected:
}
void Revoke()
{
mozilla::MutexAutoLock lock(mMutex);
MutexAutoLock lock(mMutex);
mStateMachine = nullptr;
}
mozilla::Mutex mMutex;
Mutex mMutex;
// Protected by mMutex.
// We don't use an owning pointer here, because keeping mStateMachine alive
// would mean in some cases we'd have to destroy mStateMachine from this

1
content/media/ogg/nsOggReader.h
View File

@ -17,6 +17,7 @@
#include "nsOggCodecState.h"
#include "VideoUtils.h"
using namespace mozilla;
class nsMediaDecoder;
class nsTimeRanges;

2
content/media/raw/nsRawReader.cpp
View File

@ -9,8 +9,6 @@
#include "nsRawDecoder.h"
#include "VideoUtils.h"
using namespace mozilla;
nsRawReader::nsRawReader(nsBuiltinDecoder* aDecoder)
: nsBuiltinDecoderReader(aDecoder),
mCurrentFrame(0), mFrameSize(0)

2
content/media/raw/nsRawReader.h
View File

@ -43,7 +43,7 @@ public:
}
private:
bool ReadFromResource(mozilla::MediaResource *aResource, uint8_t *aBuf, uint32_t aLength);
bool ReadFromResource(MediaResource *aResource, uint8_t *aBuf, uint32_t aLength);
nsRawVideoHeader mMetadata;
uint32_t mCurrentFrame;

5
content/xul/document/src/nsXULPrototypeCache.h
View File

@ -21,6 +21,7 @@
#include "mozilla/scache/StartupCache.h"
using namespace mozilla::scache;
class nsCSSStyleSheet;
@ -111,7 +112,7 @@ public:
nsresult FinishOutputStream(nsIURI* aURI);
nsresult HasData(nsIURI* aURI, bool* exists);
static mozilla::scache::StartupCache* GetStartupCache();
static StartupCache* GetStartupCache();
static nsXULPrototypeCache* GetInstance();
@ -143,7 +144,7 @@ protected:
// this is really a hash set, with a dummy data parameter
nsDataHashtable<nsURIHashKey,uint32_t> mCacheURITable;
static mozilla::scache::StartupCache* gStartupCache;
static StartupCache* gStartupCache;
nsInterfaceHashtable<nsURIHashKey, nsIStorageStream> mOutputStreamTable;
nsInterfaceHashtable<nsURIHashKey, nsIObjectInputStream> mInputStreamTable;