+ Goal of this test is to check that modifying defaultValue and value attribute + of input types is working as expected. +
+ +HSTS page
"; + response.setStatusLine(request.httpVersion, "200", "OK"); + response.setHeader("Strict-Transport-Security", "max-age=60"); + response.setHeader("Content-Type", "text/html", false); + response.setHeader("Content-Length", page.length + "", false); + response.write(page); +} diff --git a/config/config.mk b/config/config.mk index dabe7e98de48..d9cbe86e4b08 100644 --- a/config/config.mk +++ b/config/config.mk @@ -841,7 +841,7 @@ OBJ_SUFFIX := $(_OBJ_SUFFIX) # PGO builds with GCC build objects with instrumentation in a first pass, # then objects optimized, without instrumentation, in a second pass. If -# we overwrite the ojects from the first pass with those from the second, +# we overwrite the objects from the first pass with those from the second, # we end up not getting instrumentation data for better optimization on # incremental builds. As a consequence, we use a different object suffix # for the first pass. diff --git a/configure.in b/configure.in index 62c4c6d6dbe7..7bdc6c4a332a 100644 --- a/configure.in +++ b/configure.in @@ -60,7 +60,7 @@ dnl ======================================================== GLIB_VERSION=1.2.0 PERL_VERSION=5.006 CAIRO_VERSION=1.10 -PANGO_VERSION=1.14.0 +PANGO_VERSION=1.22.0 GTK2_VERSION=2.10.0 GTK3_VERSION=3.0.0 WINDRES_VERSION=2.14.90 @@ -251,10 +251,13 @@ if test -n "$gonkdir" ; then 19) GONK_INCLUDES="-I$gonkdir/frameworks/native/include -I$gonkdir/frameworks/av/include -I$gonkdir/frameworks/av/include/media -I$gonkdir/frameworks/av/include/camera -I$gonkdir/frameworks/native/include/media/openmax -I$gonkdir/frameworks/av/media/libstagefright/include" MOZ_B2G_CAMERA=1 - MOZ_OMX_DECODER=1 MOZ_B2G_BT=1 MOZ_B2G_BT_BLUEDROID=1 MOZ_NFC=1 + MOZ_RTSP=1 + MOZ_OMX_DECODER=1 + MOZ_OMX_ENCODER=1 + AC_DEFINE(MOZ_OMX_ENCODER) ;; *) @@ -4050,6 +4053,16 @@ fi AC_DEFINE_UNQUOTED(MOZ_UPDATE_CHANNEL, $MOZ_UPDATE_CHANNEL) AC_SUBST(MOZ_UPDATE_CHANNEL) +# Allow to specify a Mozilla API key file that contains the secret key to be +# used for various Mozilla API requests. +MOZ_ARG_WITH_STRING(mozilla-api-keyfile, +[ --with-mozilla-api-keyfile=file Use the secret key contained in the given keyfile for Mozilla API requests], + MOZ_MOZILLA_API_KEY=`cat $withval`) +if test -z "$MOZ_MOZILLA_API_KEY"; then + MOZ_MOZILLA_API_KEY=no-mozilla-api-key +fi +AC_SUBST(MOZ_MOZILLA_API_KEY) + # Allow to specify a Google API key file that contains the secret key to be # used for various Google API requests. MOZ_ARG_WITH_STRING(google-api-keyfile, diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index ed58b331f671..5ca6309e7543 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -963,7 +963,7 @@ TransferZoomLevels(nsIDocument* aFromDoc, return; toCtxt->SetFullZoom(fromCtxt->GetFullZoom()); - toCtxt->SetMinFontSize(fromCtxt->MinFontSize(nullptr)); + toCtxt->SetBaseMinFontSize(fromCtxt->BaseMinFontSize()); toCtxt->SetTextZoom(fromCtxt->TextZoom()); } diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp index b9c7ca9c32e6..354cec2389ba 100644 --- a/content/canvas/src/WebGLContextGL.cpp +++ b/content/canvas/src/WebGLContextGL.cpp @@ -508,8 +508,16 @@ WebGLContext::CopyTexImage2D(GLenum target, return; } - if (mBoundFramebuffer && !mBoundFramebuffer->CheckAndInitializeAttachments()) - return ErrorInvalidFramebufferOperation("copyTexImage2D: incomplete framebuffer"); + if (mBoundFramebuffer) { + if (!mBoundFramebuffer->CheckAndInitializeAttachments()) + return ErrorInvalidFramebufferOperation("copyTexImage2D: incomplete framebuffer"); + + GLenum readPlaneBits = LOCAL_GL_COLOR_BUFFER_BIT; + if (!mBoundFramebuffer->HasCompletePlanes(readPlaneBits)) { + return ErrorInvalidOperation("copyTexImage2D: Read source attachment doesn't have the" + " correct color/depth/stencil type."); + } + } bool texFormatRequiresAlpha = internalformat == LOCAL_GL_RGBA || internalformat == LOCAL_GL_ALPHA || @@ -613,10 +621,17 @@ WebGLContext::CopyTexSubImage2D(GLenum target, return ErrorInvalidOperation("copyTexSubImage2D: a base internal format of DEPTH_COMPONENT or DEPTH_STENCIL isn't supported"); } - if (mBoundFramebuffer) + if (mBoundFramebuffer) { if (!mBoundFramebuffer->CheckAndInitializeAttachments()) return ErrorInvalidFramebufferOperation("copyTexSubImage2D: incomplete framebuffer"); + GLenum readPlaneBits = LOCAL_GL_COLOR_BUFFER_BIT; + if (!mBoundFramebuffer->HasCompletePlanes(readPlaneBits)) { + return ErrorInvalidOperation("copyTexSubImage2D: Read source attachment doesn't have the" + " correct color/depth/stencil type."); + } + } + bool texFormatRequiresAlpha = (internalFormat == LOCAL_GL_RGBA || internalFormat == LOCAL_GL_ALPHA || internalFormat == LOCAL_GL_LUMINANCE_ALPHA); @@ -2307,6 +2322,12 @@ WebGLContext::ReadPixels(GLint x, GLint y, GLsizei width, // prevent readback of arbitrary video memory through uninitialized renderbuffers! if (!mBoundFramebuffer->CheckAndInitializeAttachments()) return ErrorInvalidFramebufferOperation("readPixels: incomplete framebuffer"); + + GLenum readPlaneBits = LOCAL_GL_COLOR_BUFFER_BIT; + if (!mBoundFramebuffer->HasCompletePlanes(readPlaneBits)) { + return ErrorInvalidOperation("readPixels: Read source attachment doesn't have the" + " correct color/depth/stencil type."); + } } // Now that the errors are out of the way, on to actually reading diff --git a/content/canvas/src/WebGLFramebuffer.cpp b/content/canvas/src/WebGLFramebuffer.cpp index 645561cabdeb..92f0ef7ec200 100644 --- a/content/canvas/src/WebGLFramebuffer.cpp +++ b/content/canvas/src/WebGLFramebuffer.cpp @@ -630,6 +630,31 @@ WebGLFramebuffer::CheckFramebufferStatus() const return mContext->gl->fCheckFramebufferStatus(LOCAL_GL_FRAMEBUFFER); } +bool +WebGLFramebuffer::HasCompletePlanes(GLbitfield mask) +{ + if (CheckFramebufferStatus() != LOCAL_GL_FRAMEBUFFER_COMPLETE) + return false; + + MOZ_ASSERT(mContext->mBoundFramebuffer == this); + bool hasPlanes = true; + if (mask & LOCAL_GL_COLOR_BUFFER_BIT) { + hasPlanes &= ColorAttachmentCount() && + ColorAttachment(0).IsDefined(); + } + + if (mask & LOCAL_GL_DEPTH_BUFFER_BIT) { + hasPlanes &= DepthAttachment().IsDefined() || + DepthStencilAttachment().IsDefined(); + } + + if (mask & LOCAL_GL_STENCIL_BUFFER_BIT) { + hasPlanes &= StencilAttachment().IsDefined() || + DepthStencilAttachment().IsDefined(); + } + + return hasPlanes; +} bool WebGLFramebuffer::CheckAndInitializeAttachments() diff --git a/content/canvas/src/WebGLFramebuffer.h b/content/canvas/src/WebGLFramebuffer.h index 282f36ae5a04..8634534882d0 100644 --- a/content/canvas/src/WebGLFramebuffer.h +++ b/content/canvas/src/WebGLFramebuffer.h @@ -166,6 +166,9 @@ public: NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLFramebuffer) NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLFramebuffer) + // mask mirrors glClear. + bool HasCompletePlanes(GLbitfield mask); + bool CheckAndInitializeAttachments(); bool CheckColorAttachmentNumber(GLenum attachment, const char* functionName) const; diff --git a/content/canvas/test/webgl/non-conf-tests/mochitest.ini b/content/canvas/test/webgl/non-conf-tests/mochitest.ini index 91b8c2986def..1c31862f2c4c 100644 --- a/content/canvas/test/webgl/non-conf-tests/mochitest.ini +++ b/content/canvas/test/webgl/non-conf-tests/mochitest.ini @@ -3,6 +3,7 @@ support-files = driver-info.js webgl-util.js +[test_depth_readpixels.html] [test_highp_fs.html] [test_no_arr_points.html] [test_privileged_exts.html] diff --git a/content/canvas/test/webgl/non-conf-tests/test_depth_readpixels.html b/content/canvas/test/webgl/non-conf-tests/test_depth_readpixels.html new file mode 100644 index 000000000000..e82ef42901c3 --- /dev/null +++ b/content/canvas/test/webgl/non-conf-tests/test_depth_readpixels.html @@ -0,0 +1,61 @@ + + + ++ Goal of this test is to check that modifying defaultValue and value attribute + of input types is working as expected. +
+ +