Landings for Stack Containing D82359

Failed to land

Landing requested on , by jgilbert@mozilla.com.

Revisions: D29469 diff 431605 D29562 diff 431607 D82359 diff 431609

While applying revision D29469 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

  • dom/canvas/TexUnpackBlob.cpp @ f8f02e3a863d3f4f8927e336882fb484e97e8a3f
  • --- TexUnpackBlob.cpp
    +++ TexUnpackBlob.cpp
    ...
    
    --- TexUnpackBlob.cpp
    +++ TexUnpackBlob.cpp
    @@ -577,7 +582,7 @@
     
       if (!useParanoidHandling) {
         const ScopedLazyBind bindPBO(gl, LOCAL_GL_PIXEL_UNPACK_BUFFER,
    -      webgl->mBoundPixelUnpackBuffer);
    +                                 webgl->mBoundPixelUnpackBuffer);
     
         *out_error =
             DoTexOrSubImage(isSubImage, gl, target, level, dui, xOffset, yOffset,
    
Raw error output:
Problem while applying patch in revision 29469:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpnpvcbjmj: applying /tmp/tmpnpvcbjmj

patching file dom/canvas/TexUnpackBlob.cpp
Hunk #3 FAILED at 581
1 out of 3 hunks FAILED -- saving rejects to file dom/canvas/TexUnpackBlob.cpp.rej
abort: patch failed to apply

Stack containing revision D82359

Land Bug Status Revision Reviewers
1367251
Blocked
Repository is not supported by Lando.
Closed
D82359: Bug 1367251 - Revert changeset b1cdccfb383d - now-working-test. r=jgilbert
  • @jgilbert accepted a prior diff
1367251
Blocked
Repository is not supported by Lando.
Closed
D29562: Bug 1367251 - add bindings for options to createImageBitmap and support flipY r=bzbarsky,aosmond
  • @bzbarsky accepted a prior diff
  • @aosmond accepted a prior diff
  • @baku accepted a prior diff
1367251
Blocked
Repository is not supported by Lando.
Closed
D29469: Bug 1367251 - ignore gl.UNPACK_FLIP_Y_WEBGL & UNPACK_PREMULTIPLY_ALPHA for textures uploading ImageBitmap data as per spec. r=jgilbert
  • @jgilbert accepted a prior diff