corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1368776 - Part 11. Add ImageResource::GetImageContainerSize to determine the appropriate size for a requested container. r=tnikkel

Browse Source
This commit is contained in:
Andrew Osmond
2017-11-17 06:45:26 -05:00
parent 5202edf295
commit 4a14091623
4 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
image/Image.cpp
View File

@@ -108,7 +108,8 @@ ImageResource::GetImageContainerImpl(LayerManager* aManager,
== FLAG_NONE,
"Unsupported flag passed to GetImageContainer");
if (!IsImageContainerAvailable(aManager, aFlags)) {
IntSize size = GetImageContainerSize(aManager, aSize, aFlags);
if (size.IsEmpty()) {
return nullptr;
}
@@ -122,7 +123,7 @@ ImageResource::GetImageContainerImpl(LayerManager* aManager,
for (; i >= 0; --i) {
entry = &mImageContainers[i];
container = entry->mContainer.get();
if (aSize == entry->mSize) {
if (size == entry->mSize) {
// Lack of a container is handled below.
break;
} else if (!container) {
@@ -156,7 +157,7 @@ ImageResource::GetImageContainerImpl(LayerManager* aManager,
entry->mContainer = container;
} else {
entry = mImageContainers.AppendElement(
ImageContainerEntry(aSize, container.get()));
ImageContainerEntry(size, container.get()));
}
}
@@ -165,7 +166,7 @@ ImageResource::GetImageContainerImpl(LayerManager* aManager,
#endif
entry->mLastDrawResult =
AddCurrentImage(container, aSize, aFlags, true);
AddCurrentImage(container, size, aFlags, true);
return container.forget();
}