Permalink
Browse files

WebGL implementation for Android

Implementation of WebGL in Android WebKit. Exposes a low level 3D
graphics API based on OpenGL ES 2.0 to JavaScript. WebGL is not compiled
by default. It can be enabled by setting ENABLE_WEBGL = true in your
device BoardConfig.mk or directly in external/webkit/Android.mk.

Includes runtime enablement through Browser Settings -> Labs menu.

Enable WebGL debug logs and FPS timing with: adb shell setprop debug.webgl 1

Includes Cross-origin resource sharing support.

Includes fixes for the following Khronos WebGL 1.0.1. tests:
- premultiplyalpha-test.html
- struct-nesting-exceeds-maximum.html
- index-validation.html
- context-attributes-alpha-depth-stencil-antialias.html
- program-test.html
- object-deletion-behaviour.html

Squashed patches:
-----------------------------------------------------------

WebGL implementation for Android

Implementation of WebGL in Android WebKit. Exposes a low level 3D
graphics API based on OpenGL ES 2.0 to JavaScript. WebGL is not compiled
by default. It can be enabled by setting ENABLE_WEBGL = true in your
device BoardConfig.mk or directly in external/webkit/Android.mk. It is
also disabled by default (in WebSettings.cpp) as required by Khronos
until it reaches 100% conformance.

--
From: Anders Edenbrandt <anders.edenbrandt@sonyericsson.com>
Date: Thu, 26 Jan 2012 11:48:41 +0100

WebGL bug fixes and updates

Some updates:
  - stability fixes
  - image decoder
  - redesign of how the FBOs are used
  - other bug fixes

--
From: Anders Edenbrandt <anders.edenbrandt@sonyericsson.com>
Date: Tue, 31 Jan 2012 17:20:13 +0100

WebGL code cleanup and bug fixes

--
From: Anders Edenbrandt <anders.edenbrandt@sonyericsson.com>
Date: Thu Mar 15 10:15:33 2012 +0100

More improvements and bug fixes

Updates:
- cleaned up buffer handling, allowing for arbitrary number of buffers
- removed rect from invalidation
- removed screen update request from drawGL
- releasing buffers when the browser is paused
- added missing method 'slice' for typed arrays
- fixed bug in bindFramebuffer

https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=c72ff2aa562941d94ceb51ba685d60809ca882a6

Updates to fix some test failures in Khronos Conformance Test Suite:

  - Increase max identifier length in shaders to 256
  - Add length check on uniforms and attributes
  - Add minimal support for compressed textures
      (that is, just return the correct error codes)
  - Add support for Uint8ClampedByteArray
  - Modify how error checking is done on framebuffer operations
  - Activate the GL_OES_packed_depth_stencil extension
  - Activate the GL_OES_texture_float extension

https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=5bfe05848c12a2894697fbb503cfa79981eb96bd

Fix WebGL 1.0.1 premultiplyalpha-test conformance test

Fixing bug with toDataURL when called against a Canvas in which WebGL
content is being rendered and make sure paintRenderingResultsToImageData
isn't used for the premultiplied case.

ihttps://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=5834a1e00f89d898a7a0039d47916b196e40a2c8

Update ANGLE to r1009 to fix WebGL 1.0.1 conformance test

Fixes struct-nesting-exceeds-maximum Khronos WebGL conformance test.

https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=ae2392db6360b41a5717f3770a9e63b1bcea45d6

vertexAttribPointer needs to reject large negative offsets

https://bugs.webkit.org/show_bug.cgi?id=85117

Reviewed by Kenneth Russell.

Source/WebCore:

* html/canvas/WebGLRenderingContext.cpp: Use long long for GLsizeiptr and GLintptr
(WebCore):
(WebCore::WebGLRenderingContext::bufferData):
(WebCore::WebGLRenderingContext::bufferSubData):
(WebCore::WebGLRenderingContext::drawElements):
(WebCore::WebGLRenderingContext::getVertexAttribOffset):
(WebCore::WebGLRenderingContext::vertexAttribPointer):
* html/canvas/WebGLRenderingContext.h: Ditto
(WebGLRenderingContext):
* html/canvas/WebGLRenderingContext.idl: Ditto

LayoutTests:

* fast/canvas/webgl/index-validation-expected.txt:
* fast/canvas/webgl/index-validation.html: Add a test case for large negative offset.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@116374 268f45cc-cd09-0410-ab3c-d52691b4dbfc
https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=b3a02a0942a0e2c44d23961382145fad6016b2ef

Fix for context-attributes-alpha-depth-stencil-antialias

Support for alpha, depth and stencil to fix WebGL Khronos 1.0.1
conformance test. Report back that antialiasing is not supported on our
platform.

https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=22e98195ac73e7e12a59d5b9a42dfc4e2252b475

WebGLRenderingContext should defer caching program info
https://bugs.webkit.org/show_bug.cgi?id=83513

Reviewed by Kenneth Russell.

* html/canvas/WebGLProgram.cpp:
(WebCore::WebGLProgram::WebGLProgram):
(WebCore::WebGLProgram::numActiveAttribLocations): call cacheInfoIfNeeded();
(WebCore::WebGLProgram::getActiveAttribLocation): Ditto.
(WebCore::WebGLProgram::isUsingVertexAttrib0): Ditto.
(WebCore::WebGLProgram::getLinkStatus): Ditto.
(WebCore):
(WebCore::WebGLProgram::cacheActiveAttribLocations):
(WebCore::WebGLProgram::cacheInfoIfNeeded): Cache link status, active attire locations, etc if needed.
(WebCore::WebGLProgram::increaseLinkCount): also invalidate cached info.
* html/canvas/WebGLProgram.h:
(WebGLProgram):
* html/canvas/WebGLRenderingContext.cpp:
(WebCore):
(WebCore::WebGLRenderingContext::linkProgram): Do not cache program info immediately.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113915 268f45cc-cd09-0410-ab3c-d52691b4dbfc
https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=66bc9c1b9eb5151b1b236199d0eeb17df0557b47

Runtime enablement of WebGL

Hooks up with the Java side to enable/disable WebGL through the debug
menu.

https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=75aab57859de45a0aaec5a7cad41a12111e9a82e

Support the usage of CORS for WebGL and the 2D canvas

Factor CORS request preparation out of DocumentThreadableLoader
https://bugs.webkit.org/show_bug.cgi?id=61209

2011-05-20  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Factor CORS request preparation out of DocumentThreadableLoader
        https://bugs.webkit.org/show_bug.cgi?id=61209

        DocumentThreadableLoader has two jobs:

        1) Proxy loads between threads.
        2) Run the CORS state machine.

        This patch begins the work of separating those concerns, allowing CORS
        to be used elsewhere in the loading pipeline.  In particular, this
        patch moves knowledge of how to prepare CORS requests out of
        DocumentThreadableLoder.

        * loader/CrossOriginAccessControl.cpp:
        (WebCore::isOnAccessControlSimpleRequestHeaderWhitelist):
        (WebCore::updateRequestForAccessControl):
        (WebCore::createAccessControlPreflightRequest):
        * loader/CrossOriginAccessControl.h:
        * loader/DocumentThreadableLoader.cpp:
        (WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
        (WebCore::DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest):
        (WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequestWithPreflight):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86980 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Add rel type prerender to distinguish prerender from prefetch
https://bugs.webkit.org/show_bug.cgi?id=61079

2011-05-21  Gavin Peters  <gavinp@chromium.org>

        Reviewed by Adam Barth.

        Add rel type prerender to distinguish prerender from prefetch
        https://bugs.webkit.org/show_bug.cgi?id=61079

        Chrome right now uses <link rel=prefetch ...> for one of two things,
        to warm the cache in the same way as firefox, or to launch a speculative
        rendering of a web page, for faster "loading" when the user navigates to it.

        This new rel type will let us distinguish the two cases; the rel type prerender
        isn't used on the web today, but the Google Web Search example prerendering application
        is ready to experiment with it.

        * fast/dom/HTMLLinkElement/prerender-expected.txt: Added.
        * fast/dom/HTMLLinkElement/prerender.html: Added.
        * platform/gtk/Skipped:
        * platform/mac/Skipped:
        * platform/qt/Skipped:
        * platform/win/Skipped:

2011-05-21  Gavin Peters  <gavinp@chromium.org>

        Reviewed by Adam Barth.

        Add rel type prerender to distinguish prerender from prefetch
        https://bugs.webkit.org/show_bug.cgi?id=61079

        Chrome right now uses <link rel=prefetch ...> for one of two things,
        to warm the cache in the same way as firefox, or to launch a speculative
        rendering of a web page, for faster "loading" when the user navigates to it.

        This new rel type will let us distinguish the two cases; the rel type prerender
        isn't used on the web today, but the Google Web Search example prerendering application
        is ready to experiment with it.

        Test: fast/dom/HTMLLinkElement/prerender.html

        * html/HTMLLinkElement.cpp:
        (WebCore::HTMLLinkElement::tokenizeRelAttribute):
        (WebCore::HTMLLinkElement::process):
        * html/HTMLLinkElement.h:
        (WebCore::HTMLLinkElement::RelAttribute::RelAttribute):
        * loader/cache/CachedResource.cpp:
        (WebCore::defaultPriorityForResourceType):
        * loader/cache/CachedResource.h:
        (WebCore::CachedResource::isLinkResource):
        * loader/cache/CachedResourceLoader.cpp:
        (WebCore::createResource):
        (WebCore::CachedResourceLoader::requestLinkResource):
        (WebCore::CachedResourceLoader::canRequest):
        * loader/cache/CachedResourceLoader.h:
        * loader/cache/CachedResourceRequest.cpp:
        (WebCore::cachedResourceTypeToTargetType):
        (WebCore::CachedResourceRequest::load):
        * platform/network/ResourceRequestBase.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87020 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Make CachedResource take a ResourceRequest instead of just a url string.

2011-05-24  Nate Chapin  <japhet@chromium.org>

        Reviewed by Adam Barth.

        Change CachedResources to take a ResourceRequest instead of
        a url in their constructors and provide a very minimal set of
        cases for avoiding reusing a CachedResource. The ResourceRequest
        part of this change requires pushing responsibility
        for calling Document::completeURL() to the caller, instead of
        CachedResourceLoader, since ResourceRequest ASSERTs if it
        is constructed with an invalid url.

        https://bugs.webkit.org/show_bug.cgi?id=61318

        Refactor, no new tests.

        * css/CSSFontSelector.cpp:
        (WebCore::CSSFontSelector::addFontFaceRule):
        * css/CSSImageValue.cpp:
        (WebCore::CSSImageValue::cachedImage):
        * css/CSSImportRule.cpp:
        (WebCore::CSSImportRule::insertedIntoParent):
        * dom/ProcessingInstruction.cpp:
        (WebCore::ProcessingInstruction::checkStyleSheet):
        * dom/ScriptElement.cpp:
        (WebCore::ScriptElement::requestScript):
        * html/HTMLLinkElement.cpp:
        (WebCore::HTMLLinkElement::process):
        * loader/ImageLoader.cpp:
        (WebCore::ImageLoader::updateFromElement):
        * loader/cache/CachedCSSStyleSheet.cpp:
        (WebCore::CachedCSSStyleSheet::CachedCSSStyleSheet):
        (WebCore::CachedCSSStyleSheet::didAddClient):
        (WebCore::CachedCSSStyleSheet::checkNotify):
        * loader/cache/CachedCSSStyleSheet.h:
        * loader/cache/CachedFont.cpp:
        (WebCore::CachedFont::CachedFont):
        * loader/cache/CachedFont.h:
        * loader/cache/CachedImage.cpp:
        (WebCore::CachedImage::CachedImage):
        (WebCore::CachedImage::checkShouldPaintBrokenImage):
        * loader/cache/CachedImage.h:
        * loader/cache/CachedResource.cpp:
        (WebCore::CachedResource::CachedResource):
        (WebCore::reuseRequest):
        (WebCore::CachedResource::allowReuseOfRequest):
        (WebCore::CachedResource::removeClient):
        (WebCore::CachedResource::canUseCacheValidator):
        * loader/cache/CachedResource.h:
        (WebCore::CachedResource::resourceRequest):
        (WebCore::CachedResource::url):
        * loader/cache/CachedResourceLoader.cpp:
        * loader/cache/CachedResourceLoader.h:
        * loader/cache/CachedResourceRequest.cpp:
        (WebCore::CachedResourceRequest::load):
        * loader/cache/CachedScript.cpp:
        (WebCore::CachedScript::CachedScript):
        * loader/cache/CachedScript.h:
        * loader/cache/CachedXSLStyleSheet.cpp:
        (WebCore::CachedXSLStyleSheet::CachedXSLStyleSheet):
        (WebCore::CachedXSLStyleSheet::didAddClient):
        (WebCore::CachedXSLStyleSheet::checkNotify):
        * loader/cache/CachedXSLStyleSheet.h:
        * svg/SVGFEImageElement.cpp:
        (WebCore::SVGFEImageElement::requestImageResource):
        * svg/SVGFontFaceUriElement.cpp:
        (WebCore::SVGFontFaceUriElement::loadFont):
        * xml/XSLImportRule.cpp:
        (WebCore::XSLImportRule::loadSheet):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87239 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Support cross-origin property for images

2011-05-26  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

        Support cross-origin property for images
        https://bugs.webkit.org/show_bug.cgi?id=61015

        Test various cases involving CORS requests and canvas tainting.

        * http/tests/security/canvas-remote-read-remote-image-allowed-expected.txt: Added.
        * http/tests/security/canvas-remote-read-remote-image-allowed-with-credentials-expected.txt: Added.
        * http/tests/security/canvas-remote-read-remote-image-allowed-with-credentials.html: Added.
        * http/tests/security/canvas-remote-read-remote-image-allowed.html: Added.
        * http/tests/security/canvas-remote-read-remote-image-blocked-no-crossorigin-expected.txt: Added.
        * http/tests/security/canvas-remote-read-remote-image-blocked-no-crossorigin.html: Added.
        * http/tests/security/resources/abe-allow-credentials.php: Added.
        * http/tests/security/resources/abe-allow-star.php: Added.
2011-05-26  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

        Support cross-origin property for images
        https://bugs.webkit.org/show_bug.cgi?id=61015

        This patch add support for the crossorigin attribute of images and
        teaches 2D canvas to respect that flag and not taint a canvas if the
        image drawn on the canvas is allowed by CORS.

        While I was editing this code, I couldn't resist a couple touch-up
        changes.

        Tests: http/tests/security/canvas-remote-read-remote-image-allowed-with-credentials.html
               http/tests/security/canvas-remote-read-remote-image-allowed.html
               http/tests/security/canvas-remote-read-remote-image-blocked-no-crossorigin.html

        * html/HTMLAttributeNames.in:
        * html/HTMLCanvasElement.cpp:
        (WebCore::HTMLCanvasElement::securityOrigin):
        * html/HTMLCanvasElement.h:
        * html/HTMLImageElement.idl:
        * html/canvas/CanvasRenderingContext.cpp:
        (WebCore::CanvasRenderingContext::checkOrigin):
        * html/canvas/CanvasRenderingContext2D.cpp:
        (WebCore::CanvasRenderingContext2D::createPattern):
        * loader/ImageLoader.cpp:
        (WebCore::ImageLoader::updateFromElement):
        * loader/cache/CachedResource.cpp:
        (WebCore::CachedResource::passesAccessControlCheck):
        * loader/cache/CachedResource.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87473 268f45cc-cd09-0410-ab3c-d52691b4dbfc

HTMLVideoElement::currentSrc() should return a KURL

2011-05-27  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

        HTMLVideoElement::currentSrc() should return a KURL
        https://bugs.webkit.org/show_bug.cgi?id=61578

        I suspect we got into this mess because the author of this code didn't
        know about the URL attribute in WebKit IDL, which is super useful!

        Bad news: The line of code in question seems to have another bug, which
        I've documented in a FIXME.  Let the yak shaving continue!

        * html/HTMLMediaElement.cpp:
        (WebCore::urlForLogging):
        (WebCore::HTMLMediaElement::loadResource):
        (WebCore::HTMLMediaElement::isSafeToLoadURL):
        (WebCore::HTMLMediaElement::selectNextSourceChild):
        (WebCore::HTMLMediaElement::getPluginProxyParams):
        * html/HTMLMediaElement.h:
        (WebCore::HTMLMediaElement::currentSrc):
        (WebCore::HTMLMediaElement::currentURL):
        * html/canvas/CanvasRenderingContext.cpp:
        (WebCore::CanvasRenderingContext::checkOrigin):
        * rendering/HitTestResult.cpp:
        (WebCore::HitTestResult::absoluteMediaURL):
            - This complete URL call was unnecessary because currentSrc is
              already absolute.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87539 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Disallow use of cross-domain media (images, video) in WebGL

2011-06-09  Kenneth Russell  <kbr@google.com>

        Reviewed by Adam Barth.

        Disallow use of cross-domain media (images, video) in WebGL
        https://bugs.webkit.org/show_bug.cgi?id=62257

        Updated WebGL implementation to track recent spec updates in this area.

        Tests: http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html
               http/tests/security/webgl-remote-read-remote-image-allowed.html
               http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html

        * html/canvas/CanvasRenderingContext.cpp:
        (WebCore::CanvasRenderingContext::wouldTaintOrigin):
        (WebCore::CanvasRenderingContext::checkOrigin):
        * html/canvas/CanvasRenderingContext.h:
        (WebCore::CanvasRenderingContext::checkOrigin):
        * html/canvas/WebGLRenderingContext.cpp:
        (WebCore::WebGLRenderingContext::readPixels):
        (WebCore::WebGLRenderingContext::texImage2D):
        (WebCore::WebGLRenderingContext::videoFrameToImage):
        (WebCore::WebGLRenderingContext::texSubImage2D):
        * html/canvas/WebGLRenderingContext.h:
2011-06-09  Kenneth Russell  <kbr@google.com>

        Reviewed by Adam Barth.

        Disallow use of cross-domain media (images, video) in WebGL
        https://bugs.webkit.org/show_bug.cgi?id=62257

        Updated origin-clean-conformance.html to track upstream version in
        Khronos repository. Added new layout tests mirroring those added
        in bug 61015 which verify that new CORS support for images is
        working in the context of WebGL.

        Verified new tests in WebKit and Chromium. Skipped tests on
        platforms where WebGL is disabled.

        * http/tests/canvas/webgl/origin-clean-conformance-expected.txt:
        * http/tests/canvas/webgl/origin-clean-conformance.html:
        * http/tests/security/webgl-remote-read-remote-image-allowed-expected.txt: Added.
        * http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials-expected.txt: Added.
        * http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html: Added.
        * http/tests/security/webgl-remote-read-remote-image-allowed.html: Added.
        * http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin-expected.txt: Added.
        * http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html: Added.
        * platform/gtk/Skipped:
        * platform/mac-leopard/Skipped:
        * platform/mac-wk2/Skipped:
        * platform/qt/Skipped:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@88489 268f45cc-cd09-0410-ab3c-d52691b4dbfc
https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=0ddd7c1d91c08fbee6c99b79fa9971a7ac914384

Runtime enablement of WebGL logs

Allows enabling WebGL method level logging using:

adb shell setprop debug.webgl 1

https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=307d4a2b5b20f2609497ceaea1eca2e29a8a781f

Adding WebGL FPS timing to logs

Samples WebGL average FPS every 15 frames and outputs to WebGL debug log.
TODO: Add setting to browser debug settings that overlays FPS on web
pages.

Postpone deleteRenderbuffer/deleteTexture until all framebuffer attachment points are removed.
https://bugs.webkit.org/show_bug.cgi?id=74741

Reviewed by Kenneth Russell.

Source/WebCore:

Use WebGLObject's attachment count mechanism to track if a renderbuffer/texture
is still attached to framebuffers, and if its deletion should be delated or not.

* html/canvas/WebGLFramebuffer.cpp:
(WebCore::WebGLFramebuffer::setAttachmentForBoundFramebuffer):
(WebCore::WebGLFramebuffer::getAttachment):
(WebCore::WebGLFramebuffer::removeAttachmentFromBoundFramebuffer):
(WebCore::WebGLFramebuffer::deleteObjectImpl):
(WebCore::WebGLFramebuffer::isBound):
* html/canvas/WebGLFramebuffer.h:

LayoutTests:

* fast/canvas/webgl/object-deletion-behaviour-expected.txt:
* fast/canvas/webgl/object-deletion-behaviour.html: synced with khronos side.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@103272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
https://www.codeaurora.org/gitweb/quic/la/?p=platform/external/webkit.git;a=commit;h=9def386340c74f2a745fb041b1cb11daa30d1a82

-----------------------------------------------------------

Change-Id: If1bf1f53f8050889a22959288e9e3874ea823dd2

Conflicts:

	Source/WebCore/html/HTMLCanvasElement.cpp
	Source/WebCore/html/HTMLCanvasElement.h
	Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
  • Loading branch information...
plafayet authored and cyanogen committed Dec 29, 2011
1 parent 0148f24 commit c87046083d6ce21f776f192be4fc99d53d485dbf
Showing with 130,258 additions and 7,843 deletions.
  1. +46 −1 Android.mk
  2. +98,699 −0 LayoutTests/ChangeLog
  3. +322 −0 LayoutTests/fast/canvas/webgl/object-deletion-behaviour-expected.txt
  4. +419 −0 LayoutTests/fast/canvas/webgl/object-deletion-behaviour.html
  5. +29 −0 LayoutTests/http/tests/canvas/webgl/origin-clean-conformance-expected.txt
  6. +218 −0 LayoutTests/http/tests/canvas/webgl/origin-clean-conformance.html
  7. +15 −0 LayoutTests/http/tests/security/canvas-remote-read-remote-image-allowed-expected.txt
  8. +15 −0 ...utTests/http/tests/security/canvas-remote-read-remote-image-allowed-with-credentials-expected.txt
  9. +108 −0 LayoutTests/http/tests/security/canvas-remote-read-remote-image-allowed-with-credentials.html
  10. +108 −0 LayoutTests/http/tests/security/canvas-remote-read-remote-image-allowed.html
  11. +15 −0 LayoutTests/http/tests/security/canvas-remote-read-remote-image-blocked-no-crossorigin-expected.txt
  12. +108 −0 LayoutTests/http/tests/security/canvas-remote-read-remote-image-blocked-no-crossorigin.html
  13. +12 −0 LayoutTests/http/tests/security/resources/abe-allow-credentials.php
  14. +11 −0 LayoutTests/http/tests/security/resources/abe-allow-star.php
  15. +13 −0 LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-expected.txt
  16. +13 −0 LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials-expected.txt
  17. +101 −0 LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html
  18. +101 −0 LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed.html
  19. +13 −0 LayoutTests/http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin-expected.txt
  20. +103 −0 LayoutTests/http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html
  21. +4 −0 Source/JavaScriptCore/wtf/Platform.h
  22. +66 −2 Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
  23. +77 −0 Source/ThirdParty/ANGLE/Android.mk
  24. +1,725 −0 Source/ThirdParty/ANGLE/ChangeLog
  25. +27 −39 Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
  26. +84 −0 Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
  27. +5 −4 Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
  28. +134 −8 Source/ThirdParty/ANGLE/include/EGL/eglext.h
  29. +21 −2 Source/ThirdParty/ANGLE/include/EGL/eglplatform.h
  30. +725 −62 Source/ThirdParty/ANGLE/include/GLES2/gl2ext.h
  31. +88 −31 Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
  32. +268 −182 Source/ThirdParty/ANGLE/src/build_angle.xcodeproj/project.pbxproj
  33. +47 −0 Source/ThirdParty/ANGLE/src/common/RefCountObject.cpp
  34. +65 −0 Source/ThirdParty/ANGLE/src/common/RefCountObject.h
  35. +103 −44 Source/ThirdParty/ANGLE/src/common/debug.cpp
  36. +58 −20 Source/ThirdParty/ANGLE/src/common/debug.h
  37. +10 −0 Source/ThirdParty/ANGLE/src/common/version.h
  38. +5 −0 Source/ThirdParty/ANGLE/src/compiler/BaseTypes.h
  39. +437 −0 Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.cpp
  40. +103 −0 Source/ThirdParty/ANGLE/src/compiler/BuiltInFunctionEmulator.h
  41. +11 −2 Source/ThirdParty/ANGLE/src/compiler/CodeGenGLSL.cpp
  42. +8 −2 Source/ThirdParty/ANGLE/src/compiler/CodeGenHLSL.cpp
  43. +89 −8 Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp
  44. +18 −50 Source/ThirdParty/ANGLE/src/compiler/ConstantUnion.h
  45. +125 −0 Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.cpp
  46. +60 −0 Source/ThirdParty/ANGLE/src/compiler/DetectRecursion.h
  47. +18 −1 Source/ThirdParty/ANGLE/src/compiler/ExtensionBehavior.h
  48. +215 −0 Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.cpp
  49. +48 −0 Source/ThirdParty/ANGLE/src/compiler/ForLoopUnroll.h
  50. +33 −21 Source/ThirdParty/ANGLE/src/compiler/Initialize.cpp
  51. +4 −6 Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp
  52. +120 −0 Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.cpp
  53. +60 −0 Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.h
  54. +22 −0 Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp
  55. +22 −0 Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h
  56. +3 −676 Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.cpp
  57. +4 −32 Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.h
  58. +720 −0 Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp
  59. +54 −0 Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.h
  60. +332 −89 Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.cpp
  61. +17 −6 Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.h
  62. +67 −9 Source/ThirdParty/ANGLE/src/compiler/ParseHelper.cpp
  63. +46 −15 Source/ThirdParty/ANGLE/src/compiler/ParseHelper.h
  64. +9 −2 Source/ThirdParty/ANGLE/src/compiler/PoolAlloc.cpp
  65. +13 −7 Source/ThirdParty/ANGLE/src/compiler/PoolAlloc.h
  66. +20 −3 Source/ThirdParty/ANGLE/src/compiler/ShHandle.h
  67. +49 −20 Source/ThirdParty/ANGLE/src/compiler/ShaderLang.cpp
  68. +20 −0 Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
  69. +6 −0 Source/ThirdParty/ANGLE/src/compiler/SymbolTable.h
  70. +40 −0 Source/ThirdParty/ANGLE/src/compiler/TranslatorESSL.cpp
  71. +23 −0 Source/ThirdParty/ANGLE/src/compiler/TranslatorESSL.h
  72. +4 −0 Source/ThirdParty/ANGLE/src/compiler/TranslatorGLSL.cpp
  73. +22 −4 Source/ThirdParty/ANGLE/src/compiler/Types.h
  74. +39 −8 Source/ThirdParty/ANGLE/src/compiler/UnfoldSelect.cpp
  75. +2 −1 Source/ThirdParty/ANGLE/src/compiler/UnfoldSelect.h
  76. +68 −25 Source/ThirdParty/ANGLE/src/compiler/ValidateLimitations.cpp
  77. +1 −4 Source/ThirdParty/ANGLE/src/compiler/ValidateLimitations.h
  78. +18 −6 Source/ThirdParty/ANGLE/src/compiler/VariableInfo.cpp
  79. +8 −1 Source/ThirdParty/ANGLE/src/compiler/VariableInfo.h
  80. +21 −14 Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.cpp
  81. +4 −2 Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h
  82. +27 −0 Source/ThirdParty/ANGLE/src/compiler/generate_parser.sh
  83. +18 −2 Source/ThirdParty/ANGLE/src/compiler/glslang.l
  84. +124 −61 Source/ThirdParty/ANGLE/src/compiler/glslang.y
  85. +389 −355 Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp
  86. +815 −688 Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp
  87. +107 −103 Source/ThirdParty/ANGLE/src/compiler/glslang_tab.h
  88. +2 −0 Source/ThirdParty/ANGLE/src/compiler/intermOut.cpp
  89. +37 −6 Source/ThirdParty/ANGLE/src/compiler/intermediate.h
  90. +2 −1 Source/ThirdParty/ANGLE/src/compiler/osinclude.h
  91. +3 −2 Source/ThirdParty/ANGLE/src/compiler/preprocessor/atom.c
  92. +2 −1 Source/ThirdParty/ANGLE/src/compiler/preprocessor/compile.h
  93. +84 −25 Source/ThirdParty/ANGLE/src/compiler/preprocessor/cpp.c
  94. +6 −6 Source/ThirdParty/ANGLE/src/compiler/preprocessor/cppstruct.c
  95. +21 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/length_limits.h
  96. +4 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/memory.c
  97. +139 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Context.cpp
  98. +60 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Context.h
  99. +165 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Input.cpp
  100. +74 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Input.h
  101. +45 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Macro.cpp
  102. +51 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Macro.h
  103. +53 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Preprocessor.cpp
  104. +42 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Preprocessor.h
  105. +55 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Token.cpp
  106. +48 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/Token.h
  107. +27 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/generate_parser.sh
  108. +181 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/pp.l
  109. +225 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/pp.y
  110. +2,268 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/pp_lex.cpp
  111. +2,072 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/pp_tab.cpp
  112. +119 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/pp_tab.h
  113. +29 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/stl_utils.h
  114. +13 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/new/token_type.h
  115. +7 −8 Source/ThirdParty/ANGLE/src/compiler/preprocessor/scanner.c
  116. +1 −4 Source/ThirdParty/ANGLE/src/compiler/preprocessor/scanner.h
  117. +4 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/symbols.c
  118. +5 −0 Source/ThirdParty/ANGLE/src/compiler/preprocessor/tokens.c
  119. +25 −16 Source/ThirdParty/ANGLE/src/libEGL/Config.cpp
  120. +3 −3 Source/ThirdParty/ANGLE/src/libEGL/Config.h
  121. +648 −73 Source/ThirdParty/ANGLE/src/libEGL/Display.cpp
  122. +49 −10 Source/ThirdParty/ANGLE/src/libEGL/Display.h
  123. +368 −228 Source/ThirdParty/ANGLE/src/libEGL/Surface.cpp
  124. +32 −16 Source/ThirdParty/ANGLE/src/libEGL/Surface.h
  125. +257 −196 Source/ThirdParty/ANGLE/src/libEGL/libEGL.cpp
  126. +102 −0 Source/ThirdParty/ANGLE/src/libEGL/libEGL.rc
  127. +191 −4 Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
  128. +10 −10 Source/ThirdParty/ANGLE/src/libEGL/main.cpp
  129. +1 −0 Source/ThirdParty/ANGLE/src/libEGL/main.h
  130. +14 −0 Source/ThirdParty/ANGLE/src/libEGL/resource.h
  131. +49 −8 Source/ThirdParty/ANGLE/src/libGLESv2/Blit.cpp
  132. +4 −0 Source/ThirdParty/ANGLE/src/libGLESv2/Blit.h
  133. +38 −27 Source/ThirdParty/ANGLE/src/libGLESv2/Buffer.cpp
  134. +8 −6 Source/ThirdParty/ANGLE/src/libGLESv2/Buffer.h
  135. +1,310 −616 Source/ThirdParty/ANGLE/src/libGLESv2/Context.cpp
  136. +166 −51 Source/ThirdParty/ANGLE/src/libGLESv2/Context.h
  137. +12 −14 Source/ThirdParty/ANGLE/src/libGLESv2/Fence.cpp
  138. +7 −1 Source/ThirdParty/ANGLE/src/libGLESv2/Fence.h
  139. +32 −76 Source/ThirdParty/ANGLE/src/libGLESv2/Framebuffer.cpp
  140. +5 −6 Source/ThirdParty/ANGLE/src/libGLESv2/Framebuffer.h
  141. +63 −0 Source/ThirdParty/ANGLE/src/libGLESv2/HandleAllocator.cpp
  142. +45 −0 Source/ThirdParty/ANGLE/src/libGLESv2/HandleAllocator.h
  143. +473 −0 Source/ThirdParty/ANGLE/src/libGLESv2/IndexDataManager.cpp
  144. +149 −0 Source/ThirdParty/ANGLE/src/libGLESv2/IndexDataManager.h
  145. +720 −727 Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp
  146. +49 −46 Source/ThirdParty/ANGLE/src/libGLESv2/Program.h
  147. +128 −0 Source/ThirdParty/ANGLE/src/libGLESv2/Query.cpp
  148. +48 −0 Source/ThirdParty/ANGLE/src/libGLESv2/Query.h
  149. +223 −217 Source/ThirdParty/ANGLE/src/libGLESv2/Renderbuffer.cpp
  150. +113 −63 Source/ThirdParty/ANGLE/src/libGLESv2/Renderbuffer.h
  151. +13 −33 Source/ThirdParty/ANGLE/src/libGLESv2/ResourceManager.cpp
  152. +23 −11 Source/ThirdParty/ANGLE/src/libGLESv2/ResourceManager.h
  153. +126 −51 Source/ThirdParty/ANGLE/src/libGLESv2/Shader.cpp
  154. +27 −18 Source/ThirdParty/ANGLE/src/libGLESv2/Shader.h
  155. +1,795 −1,172 Source/ThirdParty/ANGLE/src/libGLESv2/Texture.cpp
  156. +285 −167 Source/ThirdParty/ANGLE/src/libGLESv2/Texture.h
  157. +782 −0 Source/ThirdParty/ANGLE/src/libGLESv2/VertexDataManager.cpp
  158. +169 −0 Source/ThirdParty/ANGLE/src/libGLESv2/VertexDataManager.h
  159. +1,312 −528 Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.cpp
  160. +18 −1 Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def
  161. +102 −0 Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.rc
  162. +225 −33 Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
  163. +38 −5 Source/ThirdParty/ANGLE/src/libGLESv2/main.cpp
  164. +3 −0 Source/ThirdParty/ANGLE/src/libGLESv2/main.h
  165. +54 −1 Source/ThirdParty/ANGLE/src/libGLESv2/mathutil.h
  166. +14 −0 Source/ThirdParty/ANGLE/src/libGLESv2/resource.h
  167. +306 −92 Source/ThirdParty/ANGLE/src/libGLESv2/utilities.cpp
  168. +37 −10 Source/ThirdParty/ANGLE/src/libGLESv2/utilities.h
  169. +208 −0 Source/ThirdParty/ANGLE/src/libGLESv2/vertexconversion.h
  170. +10 −0 Source/WebCore/Android.derived.v8bindings.mk
  171. +37 −2 Source/WebCore/Android.mk
  172. +8 −0 Source/WebCore/Android.v8bindings.mk
  173. +60 −0 Source/WebCore/ChangeLog
  174. +6 −4 Source/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h
  175. +67 −0 Source/WebCore/bindings/v8/custom/V8Uint8ClampedArrayCustom.cpp
  176. +3 −0 Source/WebCore/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
  177. +2 −1 Source/WebCore/css/CSSFontSelector.cpp
  178. +3 −1 Source/WebCore/css/CSSImageValue.cpp
  179. +3 −2 Source/WebCore/css/CSSImportRule.cpp
  180. +30 −0 Source/WebCore/dom/Document.cpp
  181. +16 −0 Source/WebCore/dom/Document.h
  182. +7 −0 Source/WebCore/dom/Element.h
  183. +3 −2 Source/WebCore/dom/ProcessingInstruction.cpp
  184. +2 −1 Source/WebCore/dom/ScriptElement.cpp
  185. +4 −0 Source/WebCore/history/PageCache.cpp
  186. +1 −0 Source/WebCore/html/HTMLAttributeNames.in
  187. +53 −5 Source/WebCore/html/HTMLCanvasElement.cpp
  188. +10 −1 Source/WebCore/html/HTMLCanvasElement.h
  189. +2 −1 Source/WebCore/html/HTMLImageElement.idl
  190. +25 −14 Source/WebCore/html/HTMLLinkElement.cpp
  191. +2 −0 Source/WebCore/html/HTMLLinkElement.h
  192. +17 −22 Source/WebCore/html/HTMLMediaElement.cpp
  193. +3 −3 Source/WebCore/html/HTMLMediaElement.h
  194. +1 −1 Source/WebCore/html/HTMLMediaElement.idl
  195. +37 −1 Source/WebCore/html/canvas/ArrayBuffer.cpp
  196. +9 −1 Source/WebCore/html/canvas/ArrayBuffer.h
  197. +3 −0 Source/WebCore/html/canvas/ArrayBuffer.idl
  198. +2 −0 Source/WebCore/html/canvas/ArrayBufferView.h
  199. +44 −19 Source/WebCore/html/canvas/CanvasRenderingContext.cpp
  200. +14 −7 Source/WebCore/html/canvas/CanvasRenderingContext.h
  201. +9 −1 Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
  202. +2 −1 Source/WebCore/html/canvas/Uint8Array.h
  203. +73 −0 Source/WebCore/html/canvas/Uint8ClampedArray.cpp
  204. +64 −0 Source/WebCore/html/canvas/Uint8ClampedArray.h
  205. +49 −0 Source/WebCore/html/canvas/Uint8ClampedArray.idl
  206. +176 −34 Source/WebCore/html/canvas/WebGLFramebuffer.cpp
  207. +15 −6 Source/WebCore/html/canvas/WebGLFramebuffer.h
  208. +17 −0 Source/WebCore/html/canvas/WebGLGetInfo.cpp
  209. +6 −0 Source/WebCore/html/canvas/WebGLGetInfo.h
  210. +58 −26 Source/WebCore/html/canvas/WebGLProgram.cpp
  211. +12 −9 Source/WebCore/html/canvas/WebGLProgram.h
  212. +320 −114 Source/WebCore/html/canvas/WebGLRenderingContext.cpp
  213. +42 −12 Source/WebCore/html/canvas/WebGLRenderingContext.h
  214. +23 −8 Source/WebCore/html/canvas/WebGLRenderingContext.idl
  215. +8 −1 Source/WebCore/html/canvas/WebKitLoseContext.cpp
  216. +2 −0 Source/WebCore/html/canvas/WebKitLoseContext.h
  217. +2 −0 Source/WebCore/html/canvas/WebKitLoseContext.idl
  218. +4 −2 Source/WebCore/html/parser/CSSPreloadScanner.cpp
  219. +4 −3 Source/WebCore/html/parser/HTMLPreloadScanner.cpp
  220. +40 −1 Source/WebCore/loader/CrossOriginAccessControl.cpp
  221. +12 −8 Source/WebCore/loader/CrossOriginAccessControl.h
  222. +4 −34 Source/WebCore/loader/DocumentThreadableLoader.cpp
  223. +11 −2 Source/WebCore/loader/ImageLoader.cpp
  224. +4 −4 Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
  225. +1 −1 Source/WebCore/loader/cache/CachedCSSStyleSheet.h
  226. +2 −2 Source/WebCore/loader/cache/CachedFont.cpp
  227. +1 −1 Source/WebCore/loader/cache/CachedFont.h
  228. +5 −5 Source/WebCore/loader/cache/CachedImage.cpp
  229. +1 −1 Source/WebCore/loader/cache/CachedImage.h
  230. +15 −4 Source/WebCore/loader/cache/CachedResource.cpp
  231. +28 −21 Source/WebCore/loader/cache/CachedResource.h
  232. +107 −92 Source/WebCore/loader/cache/CachedResourceLoader.cpp
  233. +12 −12 Source/WebCore/loader/cache/CachedResourceLoader.h
  234. +12 −13 Source/WebCore/loader/cache/CachedResourceRequest.cpp
  235. +2 −2 Source/WebCore/loader/cache/CachedScript.cpp
  236. +1 −1 Source/WebCore/loader/cache/CachedScript.h
  237. +4 −4 Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
  238. +1 −1 Source/WebCore/loader/cache/CachedXSLStyleSheet.h
  239. +2 −2 Source/WebCore/loader/cache/MemoryCache.cpp
  240. +2 −0 Source/WebCore/page/DOMWindow.idl
  241. +6 −6 Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
  242. +2 −1 Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
  243. +6 −3 Source/WebCore/platform/graphics/GraphicsContext3D.cpp
  244. +28 −2 Source/WebCore/platform/graphics/GraphicsContext3D.h
  245. +5 −4 Source/WebCore/platform/graphics/ImageBuffer.h
  246. +102 −0 Source/WebCore/platform/graphics/android/Extensions3DAndroid.cpp
  247. +64 −0 Source/WebCore/platform/graphics/android/Extensions3DAndroid.h
  248. +1,368 −0 Source/WebCore/platform/graphics/android/GraphicsContext3DAndroid.cpp
  249. +1,098 −0 Source/WebCore/platform/graphics/android/GraphicsContext3DInternal.cpp
  250. +221 −0 Source/WebCore/platform/graphics/android/GraphicsContext3DInternal.h
  251. +98 −0 Source/WebCore/platform/graphics/android/GraphicsContext3DProxy.cpp
  252. +64 −0 Source/WebCore/platform/graphics/android/GraphicsContext3DProxy.h
  253. +34 −0 Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
  254. +12 −0 Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.h
  255. +48 −18 Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
  256. +85 −0 Source/WebCore/platform/graphics/android/WebGLLayer.cpp
  257. +61 −0 Source/WebCore/platform/graphics/android/WebGLLayer.h
  258. +7 −7 Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
  259. +1 −0 Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
  260. +1 −1 Source/WebCore/platform/graphics/android/layers/VideoLayerManager.h
  261. +1 −1 Source/WebCore/platform/graphics/android/rendering/ShaderProgram.h
  262. +6 −2 Source/WebCore/platform/image-decoders/ImageDecoder.cpp
  263. +1 −0 Source/WebCore/platform/network/ResourceRequestBase.h
  264. +0 −1 Source/WebCore/platform/network/android/ResourceRequest.h
  265. +1 −1 Source/WebCore/rendering/HitTestResult.cpp
  266. +62 −62 Source/WebCore/rendering/RenderLayerBacking.cpp
  267. +5 −5 Source/WebCore/rendering/RenderLayerCompositor.cpp
  268. +2 −1 Source/WebCore/svg/SVGFEImageElement.cpp
  269. +2 −1 Source/WebCore/svg/SVGFontFaceUriElement.cpp
  270. +3 −1 Source/WebCore/xml/XSLImportRule.cpp
  271. +28 −3 Source/WebKit/android/jni/WebSettings.cpp
  272. +12 −0 Source/WebKit/android/jni/WebViewCore.cpp
View
@@ -23,6 +23,11 @@
## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
##
+# Control WebGL compiling in webkit.
+ifneq ($(ENABLE_WEBGL),true)
+ ENABLE_WEBGL = false
+endif
+
# Control SVG compiling in webkit.
# Default is true unless explictly disabled.
ifneq ($(ENABLE_SVG),false)
@@ -92,6 +97,14 @@ LOCAL_C_INCLUDES := \
frameworks/base/core/jni/android/graphics \
frameworks/base/include
+LOCAL_C_INCLUDES += external/libpng \
+ external/zlib
+
+ifeq ($(ENABLE_WEBGL),true)
+LOCAL_C_INCLUDES += frameworks/native/include/gui \
+ frameworks/native/include/private/gui
+endif
+
# Add Source/ for the include of <JavaScriptCore/config.h> from WebCore/config.h
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(SOURCE_PATH)
@@ -144,6 +157,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(WEBCORE_PATH)/platform/image-decoders/jpeg \
$(WEBCORE_PATH)/platform/image-decoders/png \
$(WEBCORE_PATH)/platform/image-decoders/webp \
+ $(WEBCORE_PATH)/platform/image-encoders/skia \
$(WEBCORE_PATH)/platform/mock \
$(WEBCORE_PATH)/platform/network \
$(WEBCORE_PATH)/platform/network/android \
@@ -200,6 +214,10 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
LOCAL_CFLAGS += -DWEBKIT_IMPLEMENTATION=1
+# Needed for ANGLE
+LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+ $(SOURCE_PATH)/ThirdParty/ANGLE/include/GLSLANG
+
# Include WTF source file.
d := Source/JavaScriptCore
LOCAL_PATH := $(BASE_PATH)/$d
@@ -294,6 +312,10 @@ endif
LOCAL_CFLAGS += -DENABLE_REQUEST_ANIMATION_FRAME=1
+ifeq ($(ENABLE_WEBGL),true)
+LOCAL_CFLAGS += -DENABLE_WEBGL
+endif
+
# LOCAL_LDLIBS is used in simulator builds only and simulator builds are only
# valid on Linux
LOCAL_LDLIBS += -lpthread -ldl
@@ -334,13 +356,17 @@ ifeq ($(SUPPORT_COMPLEX_SCRIPTS),true)
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
external/harfbuzz/src \
external/harfbuzz/contrib
-LOCAL_SHARED_LIBRARIES += libharfbuzz
+LOCAL_SHARED_LIBRARIES += libharfbuzz libjpeg
LOCAL_CFLAGS += -DSUPPORT_COMPLEX_SCRIPTS=1
endif
# Build the list of static libraries
LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation libskiagpu libv8
+ifeq ($(ENABLE_WEBGL),true)
+LOCAL_STATIC_LIBRARIES += libpng
+endif
+
ifeq ($(ENABLE_AUTOFILL),true)
LOCAL_SHARED_LIBRARIES += libexpat
endif
@@ -360,6 +386,24 @@ WEBKIT_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES)
# Build the library all at once
include $(BUILD_STATIC_LIBRARY)
+# Build ANGLE as a static library.
+include $(CLEAR_VARS)
+LOCAL_MODULE := libangle
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE_TAGS := optional
+ANGLE_PATH := $(SOURCE_PATH)/ThirdParty/ANGLE
+LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
+include $(ANGLE_PATH)/Android.mk
+# Redefine LOCAL_SRC_FILES with the correct prefix
+LOCAL_SRC_FILES := $(addprefix Source/ThirdParty/ANGLE/src/compiler/,$(LOCAL_SRC_FILES))
+# Append angle intermediate include paths to the WebKit include list.
+LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) \
+ $(ANGLE_PATH)/include \
+ $(ANGLE_PATH)/src
+LOCAL_CFLAGS += -Wno-error=non-virtual-dtor
+# Build libangle
+include $(BUILD_STATIC_LIBRARY)
+
# Now build the shared library using only the exported jni entry point. This
# will strip out any unused code from the entry point.
include $(CLEAR_VARS)
@@ -371,6 +415,7 @@ LOCAL_MODULE := libwebcore
LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES += libangle
LOCAL_LDFLAGS := -fvisibility=hidden
LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
LOCAL_CPPFLAGS := $(WEBKIT_CPPFLAGS)
Oops, something went wrong.

0 comments on commit c870460

Please sign in to comment.