mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1165518 - Part 2: Replace prlog.h with Logging.h. rs=froydnj (342dfd711) - Bug 1085567 - Fixup synth events within pointer lock implementation for e10s. r=billm (45c50a0e6) - Bug 1128238 - Ajust NPP_SetWindow and synth native event coords to account for the chrome offset of remote tabs. Prior to this the content process always assumed the tab was the window origin. r=aklotz (202ffc006) - Bug 1128934 - Avoid calling GetClientBounds from BasicComposior. r=roc, karlt (5e98232bd) - Bug 1149041 - Make nsIWidget::SizeConstraints use LayoutDeviceIntSize instead of unit-less nsIntSize. r=roc (d0b345926) - shuffle around (fcdc51510) - Bug 1142852 P1 Fix NS_NewNonOwningRunnableMethodWithArgs() so that it compiles. r=froydnj (394d2b200) - Bug 1142852 P2 Make Cache Action use non-threadsafe ref-counting. r=ehsan (0b2b91d86) - Bug 1146349 - Allow NS_NewRunnableMethodWithArgs to take up to 8 arguments. r=froydnj (7207e74d0) - Bug 1146349 - Make the native event synthesization functions in DOMWindowUtils async. r=smaug (e43579a1d) - Bug 949614 - Use === for SimpleTest.is; r=Waldo (9f54faca4) - Bug 1146349 - Update some widget tests to deal with async native key event synthesization. r=smaug,masayuki (f1e82df79) - Bug 920013 - Rewrite test_cocoa_focus.html to use SpecialPowers. r=smichaud (8708d6a71) - Bug 1146349 - Update DOM mochitests to deal with async native event synthesization. r=smaug (a4eceb9f6) - Bug 1146349 - Update browser-chrome mochitests to deal with async native event synthesization. r=Gijs (c864ad939) - Bug 1146349 - Wire up native event synthesization in child processes. r=smaug (e8574457e) - Bug 1146349 - Mark SynthesizedEventObserver::Observe() as override (9063f04b5) - Bug 1149613 - Remove unneded field. r=botond (9aa7155e2) - Bug 1153613 - [e10s], ensure the buffer for the drag image is large enough for SourceSurfaceRawData::GuaranteePersistance() to succeed, r=mattwoodrow (aa885dae7) - remove spurious file (ff199d3ae) - Bug 1043013 - Generalize nsIntRegion into a BaseIntRegion template. r=jrmuizel (9d3e02820) - Bug 1043013 - Introduce IntRegionTyped. r=jrmuizel (f73902921) - Bug 1043013 - Use strongly-typed regions in HitTestingTreeNode. r=kats (7b8c8ae44) - Bug 913443 - Remove mention of the word ThebesLayer in a comment. r=roc (e9706e025) - Bug 913443 - Remove some #ifdefs. r=roc (da76f831b) - Bug 913443 - Break up CreateOrRecyclePaintedLayer into more parts. r=roc (dd94560fe) - Bug 913443 - Extract layer hint calculation. r=roc (5c7806a95) - Bug 913443 - Break CreateOrRecyclePaintedLayer up even more. r=roc (9e5edab17) - Bug 913443 - Remove unused aItemVisibleRect argument. r=roc (f3d1a5195) - Bug 913443 - Move IsWidgetLayerManager() check out of UpdateCommonClipCount. r=roc (3be7b19a6) - Bug 913443 - Change the order of these calls. r=roc (c7bc59fee) - Bug 913443 - Add a display item buffer for PaintedLayerData so that we can assign items without needing to know the actual Layer. r=roc (674df6aa8) - Bug 913443 - Delay PaintedLayer recycling until PopPaintedLayerData() r=roc (9d6de961a) - Bug 913443 - When determining the layer to recycle, only consider layers that have display items in common with the layer we need. r=roc (3327c31c5) - Bug 913443 - Recycle PaintedLayers as soon as possible. r=roc (37ef6d530) - Bug 913443 - Remove duplicated argument variables. r=roc (19c5af270) - Bug 1141408 - Don't include the display item's memory address in the profile label. r=BenWa (5bb1d73c1) - Bug 1141281 - Don't put empty Info: lines into the layers dump. r=BenWa (85f4b28be) - Bug 1035611 - Part 1: Updated Matrix4x4::ProjectRectBounds to properly handle infinite values when untransformed rects cross the w=0 plane. r=mattwoodrow (f47ed4383) - Bug 1035611 - Part 2: Test to ensure that transformed rects crossing the w=0 plane are clipped correctly. r=mattwoodrow (5701b435f) - Bug 1141089 - Add some release assertions to gather more data. r=roc (805c2994d) - Bug 1141595 - Make scroll info display item hoisting work after bug 913443. r=tn (1efcaf164) - Bug 1144307 - Destroy scroll info layer items when we're done with them. r=tn (3ffd3b1f2) - Bug 1148855 - Mark some ContainerState methods as const. r=roc (791585baf) - Bug 1144820 - Use rvalue reference in AddProfileTimelineMarker. r=smaug (12316b65f) - Bug 1148855 - Set overflow:hidden on scrollbar tracks so that layerization knows that the scrollbar thumb won't leave the scrollbar. r=roc (082ec87bf) - Bug 1148855 - Intermediate state that unifies APZ and non-APZ layerization behavior somewhat. (3da45ab96) - Bug 1148855 - Rework how display items are assigned to PaintedLayers and make it work the same way with and without APZ. r=roc (7258f9c90) - Bug 913443 - Add some tests. r=roc (9977682da) - Bug 1039926 - Add a test for not invalidating stuff inside mask layers. (1f8aef65e) - Bug 1148855 - Add some tests. r=roc (2ba1f7f18) - Bug 1148855 - Tweak reftest fuzziness. (a600be7d5) - Bug 1151306 - Add a missing check during background color pulling. r=roc (b3a6c886b) - Bug 1150774 (Part 1) - Add helpers to simplify using typed units in ConfigureLayer. r=botond (baecb2c2e) - Bug 1150774 (Part 2) - Use the correct units in nsDisplayImageContainer::ConfigureLayer and related code. r=botond (a79beb1fb) - Bug 1141089 - Initialize DisplayItemData with a non-null mLayer, so that mLayer is non-null throughout the object's whole lifetime. r=roc (7c2f9eb09) - Bug 1141089 - Remove unused DisplayItemData copy constructor. r=roc (ba5c46c45) - Bug 1141089 - Add a few more MOZ_RELEASE_ASSERT(mLayer) checks, just for fun. r=roc (50a8f2db7) - Bug 1141089 - Use const nsTArray* in all the places where we don't change the array's contents. r=roc (cd07a5bbd) - Bug 1141089 - Turn these two assertions into release assertions. r=roc (71daf5ef3) - Bug 1141089 - Check that we're unsetting sDestroyedFrame correctly. r=roc (6c7da67e7) - Bug 1143522 - Convert Layer::mClipRect to ParentLayerIntRect. r=botond (ddab1c0ff) - Bug 1144951. Warn if the result of ConvertAppUnits is unused. r=mats (e1d79c6ca) - Bug 1144951. Rename ConvertAppUnits to ScaleToOtherAppUnits. r=mats (675c918c3) - Bug 1149035 - Make nsXULPopupManager::PopupResized take a LayoutDeviceIntSize param instead of a unit-less nsIntSize. r=roc (eb9529af7) - missing bit of Bug 1156110 - Make nsView::mWindow an nsCOMPtr; r=roc (972255b4f) - Bug 1147706 - Warn if we don't use the result of const methods on BaseRect and its subclasses. r=tn (9e91deada) - Bug 1152838 - Fix BaseRect::InflateToMultiple and move it to nsIntRect. r=mattwoodrow, r=jrmuizel (5a942df29) - Bug 1125055 - Sync decode layerized images if necessary. r=roc,tn (1379db5c7) - Bug 1145167 - make imgIContainer::type getter infallible; r=seth (7b7091b89) - Bug 1148213 - Implement image locking for VectorImage. r=dholbert (240e14cb3) - Bug 1143653 - Crash in CompositorD3D9 rather than TextureD3D9 if device reset fails, after a few attemps. r=jrmuizel (76607ddc3) - Bug 1147894 - Only use non-null compositors with TextureHost::SetCompositor. r=sotaro (605bf34f6) - Bug 1146912 - Finish replacing TextureHost::GetTextureSource by BindTextureSource. r=sotaro (cf3763879) - Bug 1132854 - Remove useless ThebesIntSize conversion helper. r=Bas (78cdfee14) - Bug 1068881 - Inflate the dest rect to at least one device pixel when computing the optimal image size for drawing. r=roc (3d5644913)
This commit is contained in:
+57
-47
@@ -260,6 +260,7 @@ RasterImage::RasterImage(ProgressTracker* aProgressTracker,
|
||||
mLockCount(0),
|
||||
mDecodeCount(0),
|
||||
mRequestedSampleSize(0),
|
||||
mLastImageContainerDrawResult(DrawResult::NOT_READY),
|
||||
#ifdef DEBUG
|
||||
mFramesNotified(0),
|
||||
#endif
|
||||
@@ -464,18 +465,10 @@ RasterImage::GetType(uint16_t *aType)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aType);
|
||||
|
||||
*aType = GetType();
|
||||
*aType = imgIContainer::TYPE_RASTER;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//******************************************************************************
|
||||
/* [noscript, notxpcom] uint16_t GetType(); */
|
||||
NS_IMETHODIMP_(uint16_t)
|
||||
RasterImage::GetType()
|
||||
{
|
||||
return imgIContainer::TYPE_RASTER;
|
||||
}
|
||||
|
||||
DrawableFrameRef
|
||||
RasterImage::LookupFrameInternal(uint32_t aFrameNum,
|
||||
const IntSize& aSize,
|
||||
@@ -540,7 +533,7 @@ RasterImage::LookupFrame(uint32_t aFrameNum,
|
||||
// The OS threw this frame away. We need to redecode if we can.
|
||||
MOZ_ASSERT(!mAnim, "Animated frames should be locked");
|
||||
|
||||
Decode(Some(ThebesIntSize(requestedSize)), aFlags);
|
||||
Decode(Some(requestedSize), aFlags);
|
||||
|
||||
// If we can sync decode, we should already have the frame.
|
||||
if (aFlags & FLAG_SYNC_DECODE) {
|
||||
@@ -744,19 +737,21 @@ NS_IMETHODIMP_(already_AddRefed<SourceSurface>)
|
||||
RasterImage::GetFrame(uint32_t aWhichFrame,
|
||||
uint32_t aFlags)
|
||||
{
|
||||
return GetFrameInternal(aWhichFrame, aFlags);
|
||||
return GetFrameInternal(aWhichFrame, aFlags).second().forget();
|
||||
}
|
||||
|
||||
already_AddRefed<SourceSurface>
|
||||
Pair<DrawResult, RefPtr<SourceSurface>>
|
||||
RasterImage::GetFrameInternal(uint32_t aWhichFrame, uint32_t aFlags)
|
||||
{
|
||||
MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE);
|
||||
|
||||
if (aWhichFrame > FRAME_MAX_VALUE)
|
||||
return nullptr;
|
||||
if (aWhichFrame > FRAME_MAX_VALUE) {
|
||||
return MakePair(DrawResult::BAD_ARGS, RefPtr<SourceSurface>());
|
||||
}
|
||||
|
||||
if (mError)
|
||||
return nullptr;
|
||||
if (mError) {
|
||||
return MakePair(DrawResult::BAD_IMAGE, RefPtr<SourceSurface>());
|
||||
}
|
||||
|
||||
// Get the frame. If it's not there, it's probably the caller's fault for
|
||||
// not waiting for the data to be loaded from the network or not passing
|
||||
@@ -765,7 +760,7 @@ RasterImage::GetFrameInternal(uint32_t aWhichFrame, uint32_t aFlags)
|
||||
LookupFrame(GetRequestedFrameIndex(aWhichFrame), mSize, aFlags);
|
||||
if (!frameRef) {
|
||||
// The OS threw this frame away and we couldn't redecode it.
|
||||
return nullptr;
|
||||
return MakePair(DrawResult::TEMPORARY_ERROR, RefPtr<SourceSurface>());
|
||||
}
|
||||
|
||||
// If this frame covers the entire image, we can just reuse its existing
|
||||
@@ -784,50 +779,57 @@ RasterImage::GetFrameInternal(uint32_t aWhichFrame, uint32_t aFlags)
|
||||
frameSurf = CopyFrame(aWhichFrame, aFlags);
|
||||
}
|
||||
|
||||
return frameSurf.forget();
|
||||
if (!frameRef->IsImageComplete()) {
|
||||
return MakePair(DrawResult::INCOMPLETE, Move(frameSurf));
|
||||
}
|
||||
|
||||
return MakePair(DrawResult::SUCCESS, Move(frameSurf));
|
||||
}
|
||||
|
||||
already_AddRefed<layers::Image>
|
||||
RasterImage::GetCurrentImage(ImageContainer* aContainer)
|
||||
Pair<DrawResult, nsRefPtr<layers::Image>>
|
||||
RasterImage::GetCurrentImage(ImageContainer* aContainer, uint32_t aFlags)
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
MOZ_ASSERT(aContainer);
|
||||
|
||||
RefPtr<SourceSurface> surface =
|
||||
GetFrameInternal(FRAME_CURRENT, FLAG_ASYNC_NOTIFY);
|
||||
if (!surface) {
|
||||
auto result = GetFrameInternal(FRAME_CURRENT, aFlags | FLAG_ASYNC_NOTIFY);
|
||||
if (!result.second()) {
|
||||
// The OS threw out some or all of our buffer. We'll need to wait for the
|
||||
// redecode (which was automatically triggered by GetFrame) to complete.
|
||||
return nullptr;
|
||||
return MakePair(result.first(), nsRefPtr<layers::Image>());
|
||||
}
|
||||
|
||||
CairoImage::Data cairoData;
|
||||
GetWidth(&cairoData.mSize.width);
|
||||
GetHeight(&cairoData.mSize.height);
|
||||
cairoData.mSourceSurface = surface;
|
||||
cairoData.mSourceSurface = result.second();
|
||||
|
||||
nsRefPtr<layers::Image> image =
|
||||
aContainer->CreateImage(ImageFormat::CAIRO_SURFACE);
|
||||
NS_ASSERTION(image, "Failed to create Image");
|
||||
MOZ_ASSERT(image);
|
||||
|
||||
static_cast<CairoImage*>(image.get())->SetData(cairoData);
|
||||
|
||||
return image.forget();
|
||||
return MakePair(result.first(), Move(image));
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
RasterImage::GetImageContainer(LayerManager* aManager, ImageContainer **_retval)
|
||||
NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
|
||||
RasterImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
MOZ_ASSERT(aManager);
|
||||
MOZ_ASSERT((aFlags & ~(FLAG_SYNC_DECODE |
|
||||
FLAG_SYNC_DECODE_IF_FAST |
|
||||
FLAG_ASYNC_NOTIFY))
|
||||
== FLAG_NONE,
|
||||
"Unsupported flag passed to GetImageContainer");
|
||||
|
||||
int32_t maxTextureSize = aManager->GetMaxTextureSize();
|
||||
if (!mHasSize ||
|
||||
mSize.width > maxTextureSize ||
|
||||
mSize.height > maxTextureSize) {
|
||||
*_retval = nullptr;
|
||||
return NS_OK;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (IsUnlocked() && mProgressTracker) {
|
||||
@@ -835,28 +837,34 @@ RasterImage::GetImageContainer(LayerManager* aManager, ImageContainer **_retval)
|
||||
}
|
||||
|
||||
nsRefPtr<layers::ImageContainer> container = mImageContainer.get();
|
||||
if (container) {
|
||||
container.forget(_retval);
|
||||
return NS_OK;
|
||||
|
||||
bool mustRedecode =
|
||||
(aFlags & (FLAG_SYNC_DECODE | FLAG_SYNC_DECODE_IF_FAST)) &&
|
||||
mLastImageContainerDrawResult != DrawResult::SUCCESS &&
|
||||
mLastImageContainerDrawResult != DrawResult::BAD_IMAGE;
|
||||
|
||||
if (container && !mustRedecode) {
|
||||
return container.forget();
|
||||
}
|
||||
|
||||
// We need a new ImageContainer, so create one.
|
||||
container = LayerManager::CreateImageContainer();
|
||||
|
||||
nsRefPtr<layers::Image> image = GetCurrentImage(container);
|
||||
if (!image) {
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
auto result = GetCurrentImage(container, aFlags);
|
||||
if (!result.second()) {
|
||||
// We couldn't get an Image.
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// |image| holds a reference to a SourceSurface which in turn holds a lock on
|
||||
// the current frame's VolatileBuffer, ensuring that it doesn't get freed as
|
||||
// long as the layer system keeps this ImageContainer alive.
|
||||
container->SetCurrentImageInTransaction(image);
|
||||
// |result.second()| holds a reference to a SourceSurface which in turn holds
|
||||
// a lock on the current frame's VolatileBuffer, ensuring that it doesn't get
|
||||
// freed as long as the layer system keeps this ImageContainer alive.
|
||||
container->SetCurrentImageInTransaction(result.second());
|
||||
|
||||
mLastImageContainerDrawResult = result.first();
|
||||
mImageContainer = container;
|
||||
container.forget(_retval);
|
||||
|
||||
return NS_OK;
|
||||
return container.forget();
|
||||
}
|
||||
|
||||
void
|
||||
@@ -869,12 +877,14 @@ RasterImage::UpdateImageContainer()
|
||||
return;
|
||||
}
|
||||
|
||||
nsRefPtr<layers::Image> image = GetCurrentImage(container);
|
||||
if (!image) {
|
||||
auto result = GetCurrentImage(container, FLAG_NONE);
|
||||
if (!result.second()) {
|
||||
// We couldn't get an Image.
|
||||
return;
|
||||
}
|
||||
|
||||
container->SetCurrentImage(image);
|
||||
mLastImageContainerDrawResult = result.first();
|
||||
container->SetCurrentImage(result.second());
|
||||
}
|
||||
|
||||
size_t
|
||||
@@ -1781,7 +1791,7 @@ RasterImage::DrawWithPreDownscaleIfNeeded(DrawableFrameRef&& aFrameRef,
|
||||
// adjust the drawing parameters accordingly.
|
||||
IntSize finalSize = frameRef->GetImageSize();
|
||||
bool couldRedecodeForBetterFrame = false;
|
||||
if (ThebesIntSize(finalSize) != aSize) {
|
||||
if (finalSize != aSize) {
|
||||
gfx::Size scale(double(aSize.width) / finalSize.width,
|
||||
double(aSize.height) / finalSize.height);
|
||||
aContext->Multiply(gfxMatrix::Scaling(scale.width, scale.height));
|
||||
|
||||
Reference in New Issue
Block a user