Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: emscripten-core/emscripten
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.8.2
Choose a base ref
...
head repository: emscripten-core/emscripten
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.8.3
Choose a head ref
  • 19 commits
  • 13 files changed
  • 4 contributors

Commits on Dec 23, 2013

  1. Added workaround for window.scrollX compat.

    window.scrollX/Y is not available in IE11. As far as specifications go, is currently only specified in draft (http://dev.w3.org/csswg/cssom-view/#refsCSSOM). Falling back to 
    window.pageXOffset seems like a good workaround.
    
    On a related note; my Emscriptified project runs on IE11 although performance is very poor (mostly due to Internet Explorer itself, I think). It's pretty finicky about the shaders, as they introduced an extra set of requirements. (inout/in/out keywords not supported, can't construct mat3 from mat4, etc).
    onnoj committed Dec 23, 2013
    Configuration menu
    Copy the full SHA
    a0e9770 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2014

  1. Added comments & assert to scrollX fix.

    Added comments to fix as per @kripken's request.
    Added an assert too (guarded by ASSERTIONS define)
    onnoj committed Jan 2, 2014
    Configuration menu
    Copy the full SHA
    e132e7a View commit details
    Browse the repository at this point in the history
  2. Fixed undefined check.

    Forgot I had to explicitly check the type of variable type to see if it's undefined.
    onnoj committed Jan 2, 2014
    Configuration menu
    Copy the full SHA
    76ba593 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2014

  1. clean extra arg of JSify

    coolwanglu committed Jan 3, 2014
    Configuration menu
    Copy the full SHA
    902926d View commit details
    Browse the repository at this point in the history
  2. Update library_browser.js

    onnoj committed Jan 3, 2014
    Configuration menu
    Copy the full SHA
    fe66c89 View commit details
    Browse the repository at this point in the history
  3. [SDL] Fixing SDL_UnlockSurface in IE10/IE11.

    Previously, just calling SDL_UnlockSurface in IE10/IE11 would throw an exception, since Emscripten assumed that the ImageData's `data` property was Uint8ClampedArray, which has a backing buffer.
    
    IE10/IE11 still uses the deprecated CanvasPixelArray, which does not have a backing buffer property:
    https://developer.mozilla.org/en-US/docs/Web/API/CanvasPixelArray
    
    I've added an additional path to SDL_UnlockSurface for these browsers.
    John Vilk committed Jan 3, 2014
    Configuration menu
    Copy the full SHA
    2268e7b View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1971 from jvilk/sdl_fixes

    [SDL] Fixing SDL_UnlockSurface in IE10/IE11
    kripken committed Jan 3, 2014
    Configuration menu
    Copy the full SHA
    c00a68f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c7ccd83 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c9b22f4 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2014

  1. Configuration menu
    Copy the full SHA
    0529968 View commit details
    Browse the repository at this point in the history
  2. [SDL] Actually fix SDL_UnlockSurface in IE10/IE11.

    The previous revision did not copy over pixel data properly. This time, I have reverted the IE path to the code used in this method prior to the breaking change, and have tested it with JSMESS.
    John Vilk committed Jan 4, 2014
    Configuration menu
    Copy the full SHA
    5f21294 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c67e7e8 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1973 from jvilk/sdl_fix

    [SDL] Actually fix SDL_UnlockSurface in IE10/IE11.
    kripken committed Jan 4, 2014
    Configuration menu
    Copy the full SHA
    15253e6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c0beb1c View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1941 from onnoj/incoming

    Added workaround for window.scrollX compat.
    kripken committed Jan 4, 2014
    Configuration menu
    Copy the full SHA
    1946621 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1967 from coolwanglu/pr_clean

    clean extra arg of JSify
    kripken committed Jan 4, 2014
    Configuration menu
    Copy the full SHA
    bd33305 View commit details
    Browse the repository at this point in the history
  8. specify (void) as the arguments in webgl_context_attributes test, to …

    …avoid confusion with varargs by clang
    kripken committed Jan 4, 2014
    Configuration menu
    Copy the full SHA
    ddaac5f View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2014

  1. todo about async script tags

    kripken committed Jan 5, 2014
    Configuration menu
    Copy the full SHA
    0895a98 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    354b32d View commit details
    Browse the repository at this point in the history
Loading