Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conflicts resolved in conflicting files. OffscreenCanvas ready to be merged. #19067

Closed
wants to merge 11 commits into from
Closed

Conflicts resolved in conflicting files. OffscreenCanvas ready to be merged. #19067

wants to merge 11 commits into from
+929 −9

Commits on Nov 8, 2017

  1. Fixed changes made in 'just commiting' commit 

    New interfaces added and stub methods implemented for OffscreenCanvas API

OffscreenCanvas implementaion - 25 bugs removed towards a successful build.

OffscreenCanvas API Implemented with stub methods, build successful

Conflicts removed from master, OffscreenCanvas changes ready for merge

Revert "Conflicts removed from master, OffscreenCanvas changes ready for merge"
Will rebase branch and resolve conflicts.
This reverts commit 7357f2e.

Changes reverted in conflicting files. OffscreenCanvas API ready to be merged.
    Gauraang Khurana @gauraangkhurana
    Gauraang Khurana authored and gauraangkhurana committed Nov 8, 2017
    Loading status checks…
    6867786

Commits on Nov 21, 2017

  1. Code sanitation

    @gauraangkhurana
    gauraangkhurana committed Nov 21, 2017
    Loading status checks…
    122aa43

  2. Code sanitisation by referring to the travis build

    @gauraangkhurana
    gauraangkhurana committed Nov 21, 2017
    Loading status checks…
    7601b1f

Commits on Nov 22, 2017

  1. Specification links specified for offscreen-canvas and offscreen-canv… 

    …as2drendering
    @gauraangkhurana
    gauraangkhurana committed Nov 22, 2017
    Loading status checks…
    95bc7ae

  2. Sanitized code to add link and missing functions in offscreeen

    @gauraangkhurana
    gauraangkhurana committed Nov 22, 2017
    Loading status checks…
    8c1f2bd

  3. Code sanitized and fixed errors in travis build

    @gauraangkhurana
    gauraangkhurana committed Nov 22, 2017
    Loading status checks…
    8490167

  4. Code sanitized and fixed errors in travis build 1.40

    @gauraangkhurana
    gauraangkhurana committed Nov 22, 2017
    Loading status checks…
    81dd745

Commits on Dec 3, 2017

  1. OffscreenCanvasRenderingContext2D functionality shared with CanvasRen… 

    …deringContext2D
    @gauraangkhurana
    gauraangkhurana committed Dec 3, 2017
    Loading status checks…
    e982909

  2. New and constructor function changed for offscreen-canvas

    @gauraangkhurana
    gauraangkhurana committed Dec 3, 2017
    Loading status checks…
    39d0308

Commits on Dec 6, 2017

  1. Width and height added to offscreen-canvas constructor

    @gauraangkhurana
    gauraangkhurana committed Dec 6, 2017
    Loading status checks…
    03df441

Commits on Dec 7, 2017

  1. getContext method implemented in OffscreenCanvas API

    @gauraangkhurana
    gauraangkhurana committed Dec 7, 2017
    Loading status checks…
    bb3de9c
You can’t perform that action at this time.