diff options
| author | jmadill <jmadill@chromium.org> | 2015-03-11 16:21:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-11 23:22:16 +0000 |
| commit | d78b086e4459077f2f5ceac61c3a8b968eff6353 (patch) | |
| tree | d0771d83b63f496bcba8e67738c2a1e13448168a /content/content_gpu.gypi | |
| parent | 8c6aa8edcb4af22c634df10faffb41ae004cba0e (diff) | |
| download | chromium_src-d78b086e4459077f2f5ceac61c3a8b968eff6353.zip chromium_src-d78b086e4459077f2f5ceac61c3a8b968eff6353.tar.gz chromium_src-d78b086e4459077f2f5ceac61c3a8b968eff6353.tar.bz2 | |
Add ANGLE Platform implementation.
*re-land with fix to components_browsertests*
This logic allows us to record traces and histograms easily within
ANGLE's code. It also gives a flexible design that we can extend
with further methods later, without breaking compilation. The
design is based on blink::Platform.
Also add two new histogram descriptions to histograms.xml, and
move the GPU Process metrics init to before InitializeOneOff, so
ANGLE can record histograms during Renderer initialization.
BUG=436191
TBR=jam@chromium.org, asvitkine@chromium.org, piman@chromium.org, maruel@chromium.org, kbr@chromium.org
Review URL: https://codereview.chromium.org/923223002
Cr-Commit-Position: refs/heads/master@{#319930}
Review URL: https://codereview.chromium.org/997143002
Cr-Commit-Position: refs/heads/master@{#320182}
Diffstat (limited to 'content/content_gpu.gypi')
| -rw-r--r-- | content/content_gpu.gypi | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index af0c47f..1c2121d 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -26,13 +26,10 @@ ['OS=="win"', { 'include_dirs': [ '<(DEPTH)/third_party/khronos', + # ANGLE libs picked up from ui/gl '<(angle_path)/src', '<(DEPTH)/third_party/wtl/include', ], - 'dependencies': [ - '<(angle_path)/src/angle.gyp:libEGL', - '<(angle_path)/src/angle.gyp:libGLESv2', - ], 'link_settings': { 'libraries': [ '-lsetupapi.lib', |