diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 15:15:36 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 15:15:36 +0000 |
| commit | 0b8dbc30486cb2c491a7d5fff75c82f3c1b6cf1b (patch) | |
| tree | 43679dfb06a3c37fe5a60f917e441aa118b355d1 /skia | |
| parent | b68bf389d1ffa4539a3b486a6ee3e4d03990c166 (diff) | |
| download | chromium_src-0b8dbc30486cb2c491a7d5fff75c82f3c1b6cf1b.zip chromium_src-0b8dbc30486cb2c491a7d5fff75c82f3c1b6cf1b.tar.gz chromium_src-0b8dbc30486cb2c491a7d5fff75c82f3c1b6cf1b.tar.bz2 | |
Until this roll skia supported only a single GrGLInterace object shared by all GrContexts. Now GrGLInterface is a ref counted object and each GrContext can use a different one.
This flexibility be needed to use skia-gpu to draw UI elements concurrently with canvas or --enable-accelerated-drawing while in --single-process mode. The former will uses the in-proc WGC3D implementation and the latter uses the cmd-buf implementation.
These changes just make Chrome continue to work as it did before. A future change will remove the dependence on setting the "default" GrGLInterface and instead explicitly pass a GrGLInterface to each GrContext constructor that depends on which WGC3D implementation is in use.
Review URL: http://codereview.chromium.org/7691002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 2ffdf5b..af1e5ad 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -16,6 +16,7 @@ '../third_party/skia/gpu/src/GrContext.cpp', '../third_party/skia/gpu/src/GrCreatePathRenderer_none.cpp', '../third_party/skia/gpu/src/GrDrawTarget.cpp', + '../third_party/skia/gpu/src/GrDrawTarget.h', '../third_party/skia/gpu/src/GrGeometryBuffer.h', '../third_party/skia/gpu/src/GrGLDefaultInterface_none.cpp', '../third_party/skia/gpu/src/GrGLIndexBuffer.cpp', @@ -26,6 +27,7 @@ '../third_party/skia/gpu/src/GrGLProgram.h', '../third_party/skia/gpu/src/GrGLRenderTarget.cpp', '../third_party/skia/gpu/src/GrGLRenderTarget.h', + '../third_party/skia/gpu/src/GrGLStencilBuffer.cpp', '../third_party/skia/gpu/src/GrGLStencilBuffer.h', '../third_party/skia/gpu/src/GrGLTexture.cpp', '../third_party/skia/gpu/src/GrGLTexture.h', @@ -47,6 +49,7 @@ '../third_party/skia/gpu/src/GrMatrix.cpp', '../third_party/skia/gpu/src/GrMemory.cpp', '../third_party/skia/gpu/src/GrPathRenderer.cpp', + '../third_party/skia/gpu/src/GrPathRenderer.h', '../third_party/skia/gpu/src/GrPathUtils.cpp', '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp', '../third_party/skia/gpu/src/GrRenderTarget.cpp', @@ -57,6 +60,7 @@ '../third_party/skia/gpu/src/GrStencilBuffer.cpp', '../third_party/skia/gpu/src/GrStencilBuffer.h', '../third_party/skia/gpu/src/GrTesselatedPathRenderer.cpp', + '../third_party/skia/gpu/src/GrTesselatedPathRenderer.h', '../third_party/skia/gpu/src/GrTexture.cpp', '../third_party/skia/gpu/src/GrTextContext.cpp', '../third_party/skia/gpu/src/GrTextStrike.cpp', @@ -71,7 +75,6 @@ '../third_party/skia/gpu/include/GrColor.h', '../third_party/skia/gpu/include/GrConfig.h', '../third_party/skia/gpu/include/GrContext.h', - '../third_party/skia/gpu/include/GrDrawTarget.h', '../third_party/skia/gpu/include/GrFontScaler.h', '../third_party/skia/gpu/include/GrGLConfig.h', '../third_party/skia/gpu/include/GrGLConfig_chrome.h', @@ -103,7 +106,6 @@ '../third_party/skia/gpu/include/GrTDArray.h', '../third_party/skia/gpu/include/GrTHashCache.h', '../third_party/skia/gpu/include/GrTLList.h', - '../third_party/skia/gpu/include/GrTesselatedPathRenderer.h', '../third_party/skia/gpu/include/GrTextContext.h', '../third_party/skia/gpu/include/GrTextStrike.h', '../third_party/skia/gpu/include/GrTexture.h', |