mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-07 20:17:37 +00:00
974d8120f2
This conversion was done with the script:
find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl' | \
egrep -v 'cairo-win32-refptr.h|RefPtr.h|TestRefPtr.cpp' | \
xargs sed -i -e 's/mozilla::TemporaryRef</already_AddRefed</g' \
-e 's/TemporaryRef</already_AddRefed</g'
Manual fixups were performed in the following instances:
- We handled mfbt/RefPtr.h manually so as to not convert TemporaryRef itself
into already_AddRefed.
- The following files had explicit Move() calls added to make up for the lack
of a copy constructor on already_AddRefed:
dom/base/ImageEncoder.cpp
dom/media/MediaTaskQueue.{h,cpp}
dom/media/webaudio/PannerNode.cpp
- A redundant overload for MediaTaskQueue::Dispatch was deleted.
- A few manual fixups were required in mfbt/tests/TestRefPtr.cpp.
- Comments, using declarations, and forward declarations relating to
TemporaryRef in dom/canvas/ and gfx/layers/ were changed to refer to
already_AddRefed.
56 lines
1.8 KiB
C++
56 lines
1.8 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "MacIOSurfaceImage.h"
|
|
#include "mozilla/layers/CompositableClient.h"
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
#include "mozilla/layers/MacIOSurfaceTextureClientOGL.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::layers;
|
|
|
|
TextureClient*
|
|
MacIOSurfaceImage::GetTextureClient(CompositableClient* aClient)
|
|
{
|
|
if (!mTextureClient) {
|
|
mTextureClient = MacIOSurfaceTextureClientOGL::Create(aClient->GetForwarder(),
|
|
TextureFlags::DEFAULT,
|
|
mSurface);
|
|
}
|
|
return mTextureClient;
|
|
}
|
|
|
|
already_AddRefed<gfx::SourceSurface>
|
|
MacIOSurfaceImage::GetAsSourceSurface()
|
|
{
|
|
mSurface->Lock();
|
|
size_t bytesPerRow = mSurface->GetBytesPerRow();
|
|
size_t ioWidth = mSurface->GetDevicePixelWidth();
|
|
size_t ioHeight = mSurface->GetDevicePixelHeight();
|
|
|
|
unsigned char* ioData = (unsigned char*)mSurface->GetBaseAddress();
|
|
|
|
RefPtr<gfx::DataSourceSurface> dataSurface
|
|
= gfx::Factory::CreateDataSourceSurface(gfx::IntSize(ioWidth, ioHeight), gfx::SurfaceFormat::B8G8R8A8);
|
|
if (NS_WARN_IF(!dataSurface)) {
|
|
return nullptr;
|
|
}
|
|
|
|
gfx::DataSourceSurface::MappedSurface mappedSurface;
|
|
if (!dataSurface->Map(gfx::DataSourceSurface::WRITE, &mappedSurface))
|
|
return nullptr;
|
|
|
|
for (size_t i = 0; i < ioHeight; ++i) {
|
|
memcpy(mappedSurface.mData + i * mappedSurface.mStride,
|
|
ioData + i * bytesPerRow,
|
|
ioWidth * 4);
|
|
}
|
|
|
|
dataSurface->Unmap();
|
|
mSurface->Unlock();
|
|
|
|
return dataSurface.forget();
|
|
}
|