author | Nicolas Silva <nical@mozilla.com> |
Tue, 01 Apr 2014 14:28:36 +0800 | |
changeset 194980 | ba93b2f34a3f37931e5042f31d4cf8eb61bbf956 |
parent 194979 | 148af619f72d33ccce74c8cbcac0a185e75fa515 |
child 194981 | ecda58bb90a7e21f28a8aabbc64931ccb9728d37 |
push id | 3624 |
push user | asasaki@mozilla.com |
push date | Mon, 09 Jun 2014 21:49:01 +0000 |
treeherder | mozilla-beta@b1a5da15899a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mattwoodrow |
bugs | 982413 |
milestone | 31.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/gfx/layers/ImageContainer.cpp +++ b/gfx/layers/ImageContainer.cpp @@ -127,21 +127,17 @@ ImageContainer::ImageContainer(int flag) mRemoteData(nullptr), mRemoteDataMutex(nullptr), mCompositionNotifySink(nullptr), mImageClient(nullptr) { if (flag == ENABLE_ASYNC && ImageBridgeChild::IsCreated()) { // the refcount of this ImageClient is 1. we don't use a RefPtr here because the refcount // of this class must be done on the ImageBridge thread. - if (gfxPlatform::GetPlatform()->UseDeprecatedTextures()) { - mImageClient = ImageBridgeChild::GetSingleton()->CreateImageClient(BUFFER_IMAGE_BUFFERED).drop(); - } else { - mImageClient = ImageBridgeChild::GetSingleton()->CreateImageClient(BUFFER_IMAGE_SINGLE).drop(); - } + mImageClient = ImageBridgeChild::GetSingleton()->CreateImageClient(BUFFER_IMAGE_SINGLE).drop(); MOZ_ASSERT(mImageClient); } } ImageContainer::~ImageContainer() { if (IsAsync()) { ImageBridgeChild::DispatchReleaseImageClient(mImageClient);
--- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -265,25 +265,16 @@ gfxPlatform::gfxPlatform() mWordCacheCharLimit = UNINITIALIZED_VALUE; mWordCacheMaxEntries = UNINITIALIZED_VALUE; mGraphiteShapingEnabled = UNINITIALIZED_VALUE; mOpenTypeSVGEnabled = UNINITIALIZED_VALUE; mBidiNumeralOption = UNINITIALIZED_VALUE; mLayersPreferMemoryOverShmem = XRE_GetProcessType() == GeckoProcessType_Default; -#ifdef XP_WIN - // XXX - When 957560 is fixed, the pref can go away entirely - mLayersUseDeprecated = - Preferences::GetBool("layers.use-deprecated-textures", true) - && !gfxPrefs::LayersPreferOpenGL(); -#else - mLayersUseDeprecated = false; -#endif - mSkiaGlue = nullptr; uint32_t canvasMask = BackendTypeBit(BackendType::CAIRO) | BackendTypeBit(BackendType::SKIA); uint32_t contentMask = BackendTypeBit(BackendType::CAIRO); InitBackendPrefs(canvasMask, BackendType::CAIRO, contentMask, BackendType::CAIRO); }
--- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -581,17 +581,16 @@ public: /** * Returns true if we should use raw memory to send data to the compositor * rather than using shmems. * * This method should not be called from the compositor thread. */ bool PreferMemoryOverShmem() const; - bool UseDeprecatedTextures() const { return mLayersUseDeprecated; } mozilla::gl::SkiaGLGlue* GetSkiaGLGlue(); void PurgeSkiaCache(); protected: gfxPlatform(); virtual ~gfxPlatform(); @@ -694,13 +693,12 @@ private: mozilla::gfx::BackendType mContentBackend; // Bitmask of backend types we can use to render content uint32_t mContentBackendBitmask; mozilla::widget::GfxInfoCollector<gfxPlatform> mAzureCanvasBackendCollector; mozilla::RefPtr<mozilla::gfx::DrawEventRecorder> mRecorder; bool mLayersPreferMemoryOverShmem; - bool mLayersUseDeprecated; mozilla::RefPtr<mozilla::gl::SkiaGLGlue> mSkiaGlue; }; #endif /* GFX_PLATFORM_H */
--- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -3997,23 +3997,21 @@ pref("layers.scroll-graph", false); // Set the default values, and then override per-platform as needed pref("layers.offmainthreadcomposition.enabled", false); // Compositor target frame rate. NOTE: If vsync is enabled the compositor // frame rate will still be capped. // -1 -> default (match layout.frame_rate or 60 FPS) // 0 -> full-tilt mode: Recomposite even if not transaction occured. pref("layers.offmainthreadcomposition.frame-rate", -1); -// Whether to use the deprecated texture architecture rather than the new one. #ifndef XP_WIN // Asynchonous video compositing using the ImageBridge IPDL protocol. // requires off-main-thread compositing. // Never works on Windows, so no point pref'ing it on. pref("layers.async-video.enabled",false); -pref("layers.use-deprecated-textures", true); #endif #ifdef MOZ_X11 // OMTC off by default on Linux, but if activated, use new textures and async-video. pref("layers.async-video.enabled", true); #endif #ifdef XP_MACOSX