mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
ee05861206
- Bug 1187056 - Dispatch the meta tag mutation events sooner so that any meta-viewport changes can be processed before scripts continue running. r=smaug (2e6f76079f)
- Bug 1238804. Make <base> actually work in a srcdoc document. r=smaug (a421e7c598)
- Bug 1239585 - Remove eSupportSVG from nsObjectLoadingContent capabilities; r=bz (68a79ef21b)
- Bug 1170572 - MQ CSS change not observed by picture source elements r=jdm (efc0be616e)
- Bug 1206720 - Remove invalid assertions during response image loading. r=jdm (0b6485de95)
- Bug 1229032 - don't copy arrays in PerformanceObserver::Observe; r=baku (f1b70e0bd2)
- Bug 1241840 - Set table cell colspan=0 to 1 instead per the HTML spec. r=bz (1900962d4c)
- Bug 812899 part 1. Split the "image is overflow" concept in ImageDocument into two separate booleans for vertical and horizontal overflow. r=khuey (8735b610f3)
- Bug 812899 part 2. Change the centering code in nsImageDocument to only try vertically centering via auto margins when we're not overflowing in the vertical direction, because if we _are_ overflowing that should cut off part of the image per spec. r=khuey (c3b84a8048)
- Bug 812899 part 3 - Make vertical 'auto' margins on absolutely positioned elements always center, even when the margins are negative. r=dbaron (e345fb9383)
- Bug 1238427 - Avoid a strong reference from the timeout timer to nsGeolocationRequest. r=jdm (2ad4dd3955)
- Bug 1240906 - Shut down geolocation service at xpcom-shutdown instead of quit-application. r=dougt (1e7fc9e624)
- Bug 1129633 - part1. Use win8 geolocation with a fallback to MLS - r=m_kato (3323b4a120)
- Bug 1145111: ensure the pos. cache isn't reset when nsGeolocationService shuts down provider. r=jdm (e69cab889a)
- Bug 1240664 - Only enable bug 1216148's behavior when there is a wakelock support. r=kanru (543a3a55b4)
- Bug 1240766 - Fix startup crash in Geolocation::Init() when principal URI is null r=jdm (1ece684418)
- Bug 1238873 - Handle the bug that if we take cached data, we might not get any update later. r=kchen. r=jdm. (ca186e89b3)
- Bug 1240666 - Follow-up to bug 1216148. r=kchen. (3f650b5f72)
- Bug 1227119 - Set a default value for variable ret. r=dougt (5b68dd1a22)
- Bug 1027734 - Convert mozPay to WebIDL. r=bzbarsky. (a4fd10d539)
- Bug 1214488 - Allow native callers in GetEntryGlobal. r=me (ca68cc8896)
- Bug 1248719. Fix things so that taking ownership of error reporting on an AutoJSAPI on a worker is OK even if that AutoJSAPI was initialized without an explicit global. r=bholley (b8e59eebc6)
- Bug 1156065 - Send cloneable messages from SiteSpecificUserAgent.js to fix UA overrides r=billm (e5cdbe96f6)
- Bug 1210099 - Fix structured clone of expanded principal (r=bholley) (01a5fd4e47)
- Bug 1230351: Replace ThirdPartyUtil::IsThirdPartyInternal's warning-spammy NS_ENSURE_ARG with an equivalent check that lacks the warning. r=mrbkap (037c39472c)
- Bug 1184293 - Don't call ThirdPartyUtil::GetBaseDomain if aUri is null. r=jduell (4853c0e9e0)
- Bug 862147 - instrument usage of window.sidebar.addSearchEngine, r=froydnj,smaug. (ef52ded1c0)
- Bug 1214764 - Convert NS_ENSURE to a plain return in nsDocument::IsScriptEnabled. r=bholley (0f3b6d63b4)
- Bug 1245950: Privately inherit from legacy interfaces nsIDOMWindow/nsIDOMWindowInternal. r=smaug (ff1d431d0d)
- Bug 1245950: Followup to null check before asserting. r=me CLOSED TREE (6e93af4a4a)
- Bug 1236607, pointerlock code should null check inner window before using it, r=xidorn (896d9723d5)
- Bug 1245245 - Fix typo in error string URL. r=botond (58c9548f15)
- Bug 1220604 - Remove dead code from nsGlobalWindow::SetNewDocument. r=baku (fc875db5e4)
- Bug 1247049 - Optimize GetScreenXY by using the new nsDeviceContext method to get desktop scale factor. r=emk (de66d59631)
- missing bit of Bug 962249 part 3 (0b15f8b670)
- Bug 1240978 - Shorten timeout for black screen in fullscreen transition. r=smaug (2554a8e5a7)
- Bug 1246346 - patch 1 - Expose a DesktopToDevice scale factor on nsDeviceContext. r=emk (03856ec7b4)
- Bug 1246346 - patch 2 - Correct the origin of the DOM screen coordinates (screen.left, screen.top) for secondary display on a mixed-DPI configuration. r=emk (15ac2d3be6)
- Bug 1196159 - Set nsGlobalWindow::mIsClosed properly after window.close(). r=billm (27334e4b61)
- Bug 1240241 - Don't recurse infinitely in FilterCachedColorModels::ForColorModel if the original filter node was null. r=roc (1730db5ca7)
- Bug 1247706 - "Please don't disable WebGL if crashed on WebGL context". r=dvander (e25621753e)
- Bug 1244742. Use the default copy constructor and assignment operators. (0dac3bcbfb)
- Bug 1230929 - modified the logic in order to prvent null pointer dereference. r=jmuizelaar (1d5761abc9)
- Bug 1247979. Optimize ScaleToOutsidePixels. r=kats (2b9ef41111)
- Bug 1249368 - use UniquePtr instead of nsAutoArrayPtr in gfxAlphaBoxBlur; r=jrmuizel (e60419d49d)
- Bug 1082598 - Part 4: Workaround for naming conflict in unified sources for Skia and thebes DWrite fonts. r=jrmuizel (84a9e11ded)
- Bug 1172817 - Remove PL_DHashTableEnumerate() use from FontNameCache. r=jtd. (b0632cd825)
- Bug 1197717 - Load fonts from profile-agnostic writable location. r=jfkthame (c9227268ff)
- Bug 1246889 - Correctly check whether hb_blob_create failed in ShareTableAndGetBlob. r=jfkthame (f8c62776be)
- Bug 1246834 - Fix memory reporting of nsFontFamily{List,Name}. r=jfkthame. (0535b8c110)
- Bug 1238134 P1 Provide a Response.cloneUnfiltered() method for chrome code to access internal Response state. r=ehsan (3dc25b1501)
- Bug 1238134 P2 Test chrome-only Response.cloneUnfiltered(). r=ehsan (3c307c4ec0)
- Bug 1100949 - wrap font info reads with structured exception handler. r=bas (2c2cacb05e)
- Bug 1241931 - On shutdown stop any ongoing loading of fonts; GDI in particular. r=jdaggett (057aae8cab)
- Bug 1154182 - enable native keybindings for graphene. r=billm (33e706a020)
- Bug 1167081 - Call PuppetWidget::Destroy() in its destructor. r=roc (58115c3029)
- Bug 1222662 - Disable cursor caching in the content process on Windows. r=aklotz (e760794ee2)
- Bug 1240891 - Silence warning from calling GetNativeData(NS_NATIVE_WINDOW). r=roc (d766a47f66)
- Bug 1248981 - Fix spelling error in nsMenuUtilsX.mm, a=tomcat (b93c16b961)
- Bug 1197925 - Use channel->Open2() in intl/hyphenation/hnjstdio.cpp (r=sicking) (2bf5dd3cd3)
- Bug 1248339 - fix header sort order of hal. r=gsvelto (01b61a2f5d)
- Bug 1232687: Add system-service interface to HAL, r=gsvelto (ab692e1508)
- Bug 1236762 - Simplify locking APIs for SharedSurface. - r=jrmuizel (901ae94a85)
250 lines
8.4 KiB
C++
250 lines
8.4 KiB
C++
/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
|
|
/* 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 "SharedSurfaceIO.h"
|
|
|
|
#include "GLContextCGL.h"
|
|
#include "mozilla/DebugOnly.h"
|
|
#include "mozilla/gfx/MacIOSurface.h"
|
|
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
|
|
#include "ScopedGLHelpers.h"
|
|
|
|
namespace mozilla {
|
|
namespace gl {
|
|
|
|
/*static*/ UniquePtr<SharedSurface_IOSurface>
|
|
SharedSurface_IOSurface::Create(const RefPtr<MacIOSurface>& ioSurf,
|
|
GLContext* gl,
|
|
bool hasAlpha)
|
|
{
|
|
MOZ_ASSERT(ioSurf);
|
|
MOZ_ASSERT(gl);
|
|
|
|
gfx::IntSize size(ioSurf->GetWidth(), ioSurf->GetHeight());
|
|
|
|
typedef SharedSurface_IOSurface ptrT;
|
|
UniquePtr<ptrT> ret( new ptrT(ioSurf, gl, size, hasAlpha) );
|
|
return Move(ret);
|
|
}
|
|
|
|
void
|
|
SharedSurface_IOSurface::ProducerReleaseImpl()
|
|
{
|
|
mGL->MakeCurrent();
|
|
mGL->fFlush();
|
|
}
|
|
|
|
bool
|
|
SharedSurface_IOSurface::CopyTexImage2D(GLenum target, GLint level, GLenum internalformat,
|
|
GLint x, GLint y, GLsizei width, GLsizei height,
|
|
GLint border)
|
|
{
|
|
/* Bug 896693 - OpenGL framebuffers that are backed by IOSurface on OSX expose a bug
|
|
* in glCopyTexImage2D --- internalformats GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA
|
|
* return the wrong results. To work around, copy framebuffer to a temporary texture
|
|
* using GL_RGBA (which works), attach as read framebuffer and glCopyTexImage2D
|
|
* instead.
|
|
*/
|
|
|
|
// https://www.opengl.org/sdk/docs/man3/xhtml/glCopyTexImage2D.xml says that width or
|
|
// height set to 0 results in a NULL texture. Lets not do any work and punt to
|
|
// original glCopyTexImage2D, since the FBO below will fail when trying to attach a
|
|
// texture of 0 width or height.
|
|
if (width == 0 || height == 0)
|
|
return false;
|
|
|
|
switch (internalformat) {
|
|
case LOCAL_GL_ALPHA:
|
|
case LOCAL_GL_LUMINANCE:
|
|
case LOCAL_GL_LUMINANCE_ALPHA:
|
|
break;
|
|
|
|
default:
|
|
return false;
|
|
}
|
|
|
|
MOZ_ASSERT(mGL->IsCurrent());
|
|
|
|
ScopedTexture destTex(mGL);
|
|
{
|
|
ScopedBindTexture bindTex(mGL, destTex.Texture());
|
|
mGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MIN_FILTER,
|
|
LOCAL_GL_NEAREST);
|
|
mGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MAG_FILTER,
|
|
LOCAL_GL_NEAREST);
|
|
mGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_S,
|
|
LOCAL_GL_CLAMP_TO_EDGE);
|
|
mGL->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_T,
|
|
LOCAL_GL_CLAMP_TO_EDGE);
|
|
mGL->raw_fCopyTexImage2D(LOCAL_GL_TEXTURE_2D, 0, LOCAL_GL_RGBA, x, y, width,
|
|
height, 0);
|
|
}
|
|
|
|
ScopedFramebufferForTexture tmpFB(mGL, destTex.Texture(), LOCAL_GL_TEXTURE_2D);
|
|
ScopedBindFramebuffer bindFB(mGL, tmpFB.FB());
|
|
mGL->raw_fCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
SharedSurface_IOSurface::ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
|
|
GLenum format, GLenum type, GLvoid* pixels)
|
|
{
|
|
// Calling glReadPixels when an IOSurface is bound to the current framebuffer
|
|
// can cause corruption in following glReadPixel calls (even if they aren't
|
|
// reading from an IOSurface).
|
|
// We workaround this by copying to a temporary texture, and doing the readback
|
|
// from that.
|
|
MOZ_ASSERT(mGL->IsCurrent());
|
|
|
|
ScopedTexture destTex(mGL);
|
|
{
|
|
ScopedFramebufferForTexture srcFB(mGL, ProdTexture(), ProdTextureTarget());
|
|
|
|
ScopedBindFramebuffer bindFB(mGL, srcFB.FB());
|
|
ScopedBindTexture bindTex(mGL, destTex.Texture());
|
|
mGL->raw_fCopyTexImage2D(LOCAL_GL_TEXTURE_2D, 0,
|
|
mHasAlpha ? LOCAL_GL_RGBA : LOCAL_GL_RGB,
|
|
x, y,
|
|
width, height, 0);
|
|
}
|
|
|
|
ScopedFramebufferForTexture destFB(mGL, destTex.Texture());
|
|
|
|
ScopedBindFramebuffer bindFB(mGL, destFB.FB());
|
|
mGL->raw_fReadPixels(0, 0, width, height, format, type, pixels);
|
|
return true;
|
|
}
|
|
|
|
static void
|
|
BackTextureWithIOSurf(GLContext* gl, GLuint tex, MacIOSurface* ioSurf)
|
|
{
|
|
MOZ_ASSERT(gl->IsCurrent());
|
|
|
|
ScopedBindTexture texture(gl, tex, LOCAL_GL_TEXTURE_RECTANGLE_ARB);
|
|
|
|
gl->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
|
|
LOCAL_GL_TEXTURE_MIN_FILTER,
|
|
LOCAL_GL_LINEAR);
|
|
gl->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
|
|
LOCAL_GL_TEXTURE_MAG_FILTER,
|
|
LOCAL_GL_LINEAR);
|
|
gl->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
|
|
LOCAL_GL_TEXTURE_WRAP_S,
|
|
LOCAL_GL_CLAMP_TO_EDGE);
|
|
gl->fTexParameteri(LOCAL_GL_TEXTURE_RECTANGLE_ARB,
|
|
LOCAL_GL_TEXTURE_WRAP_T,
|
|
LOCAL_GL_CLAMP_TO_EDGE);
|
|
|
|
CGLContextObj cgl = GLContextCGL::Cast(gl)->GetCGLContext();
|
|
MOZ_ASSERT(cgl);
|
|
|
|
ioSurf->CGLTexImageIOSurface2D(cgl);
|
|
}
|
|
|
|
SharedSurface_IOSurface::SharedSurface_IOSurface(const RefPtr<MacIOSurface>& ioSurf,
|
|
GLContext* gl,
|
|
const gfx::IntSize& size,
|
|
bool hasAlpha)
|
|
: SharedSurface(SharedSurfaceType::IOSurface,
|
|
AttachmentType::GLTexture,
|
|
gl,
|
|
size,
|
|
hasAlpha,
|
|
true)
|
|
, mIOSurf(ioSurf)
|
|
{
|
|
gl->MakeCurrent();
|
|
mProdTex = 0;
|
|
gl->fGenTextures(1, &mProdTex);
|
|
BackTextureWithIOSurf(gl, mProdTex, mIOSurf);
|
|
}
|
|
|
|
SharedSurface_IOSurface::~SharedSurface_IOSurface()
|
|
{
|
|
if (mProdTex) {
|
|
DebugOnly<bool> success = mGL->MakeCurrent();
|
|
MOZ_ASSERT(success);
|
|
mGL->fDeleteTextures(1, &mProdTex);
|
|
}
|
|
}
|
|
|
|
bool
|
|
SharedSurface_IOSurface::ToSurfaceDescriptor(layers::SurfaceDescriptor* const out_descriptor)
|
|
{
|
|
bool isOpaque = !mHasAlpha;
|
|
*out_descriptor = layers::SurfaceDescriptorMacIOSurface(mIOSurf->GetIOSurfaceID(),
|
|
mIOSurf->GetContentsScaleFactor(),
|
|
isOpaque);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
SharedSurface_IOSurface::ReadbackBySharedHandle(gfx::DataSourceSurface* out_surface)
|
|
{
|
|
MOZ_ASSERT(out_surface);
|
|
mIOSurf->Lock();
|
|
size_t bytesPerRow = mIOSurf->GetBytesPerRow();
|
|
size_t ioWidth = mIOSurf->GetDevicePixelWidth();
|
|
size_t ioHeight = mIOSurf->GetDevicePixelHeight();
|
|
|
|
const unsigned char* ioData = (unsigned char*)mIOSurf->GetBaseAddress();
|
|
gfx::DataSourceSurface::ScopedMap map(out_surface, gfx::DataSourceSurface::WRITE);
|
|
if (!map.IsMapped()) {
|
|
mIOSurf->Unlock();
|
|
return false;
|
|
}
|
|
|
|
for (size_t i = 0; i < ioHeight; i++) {
|
|
memcpy(map.GetData() + i * map.GetStride(),
|
|
ioData + i * bytesPerRow, ioWidth * 4);
|
|
}
|
|
|
|
mIOSurf->Unlock();
|
|
return true;
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
// SurfaceFactory_IOSurface
|
|
|
|
/*static*/ UniquePtr<SurfaceFactory_IOSurface>
|
|
SurfaceFactory_IOSurface::Create(GLContext* gl, const SurfaceCaps& caps,
|
|
const RefPtr<layers::ISurfaceAllocator>& allocator,
|
|
const layers::TextureFlags& flags)
|
|
{
|
|
gfx::IntSize maxDims(MacIOSurface::GetMaxWidth(),
|
|
MacIOSurface::GetMaxHeight());
|
|
|
|
typedef SurfaceFactory_IOSurface ptrT;
|
|
UniquePtr<ptrT> ret( new ptrT(gl, caps, allocator, flags, maxDims) );
|
|
return Move(ret);
|
|
}
|
|
|
|
UniquePtr<SharedSurface>
|
|
SurfaceFactory_IOSurface::CreateShared(const gfx::IntSize& size)
|
|
{
|
|
if (size.width > mMaxDims.width ||
|
|
size.height > mMaxDims.height)
|
|
{
|
|
return nullptr;
|
|
}
|
|
|
|
bool hasAlpha = mReadCaps.alpha;
|
|
RefPtr<MacIOSurface> ioSurf;
|
|
ioSurf = MacIOSurface::CreateIOSurface(size.width, size.height, 1.0,
|
|
hasAlpha);
|
|
|
|
if (!ioSurf) {
|
|
NS_WARNING("Failed to create MacIOSurface.");
|
|
return nullptr;
|
|
}
|
|
|
|
return SharedSurface_IOSurface::Create(ioSurf, mGL, hasAlpha);
|
|
}
|
|
|
|
} // namespace gl
|
|
} // namespace mozilla
|