diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 01:54:06 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 01:54:06 +0000 |
commit | a9a430111290193028dc2b39be75c176d49d7bd3 (patch) | |
tree | 4b28a94aed9596ff8bcaf5f67b1e9273ece1c40f /gpu/demos/pepper_gpu_demo.html | |
parent | 0f8805d56674fff8ef79abd0981a3ede8b79190d (diff) | |
download | chromium_src-a9a430111290193028dc2b39be75c176d49d7bd3.zip chromium_src-a9a430111290193028dc2b39be75c176d49d7bd3.tar.gz chromium_src-a9a430111290193028dc2b39be75c176d49d7bd3.tar.bz2 |
Revert 65152 - Integrated Pepper3D v2 with the accelerated compositor.
- It now uses GGL instead of a child window.
- Fixed a bug where GLES2 decoder set texture state without updating TextureInfo.
- Fixed Pepper3D demos and added awesome 3D CSS programmer art.
- Removed ggl::GetCurrentContext to prevent further abuse. Fixed said abuse :)
- GGL exposes GLES2Implementation to allow issue of GL calls on a particular context without making that context globally current.
- Removed redundant "this context" argument from GGL SwapBuffers completion callback.
- Temporarily removed context lost notification. I need to figure out the best semantics.
TEST=Run Pepper3D and WebGL demos and YouTube videos on Windows and Mac.
BUG=none
Review URL: http://codereview.chromium.org/3531008
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/4561001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos/pepper_gpu_demo.html')
-rw-r--r-- | gpu/demos/pepper_gpu_demo.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/demos/pepper_gpu_demo.html b/gpu/demos/pepper_gpu_demo.html index 64d88f7..8be4e57 100644 --- a/gpu/demos/pepper_gpu_demo.html +++ b/gpu/demos/pepper_gpu_demo.html @@ -3,10 +3,10 @@ <title>Pepper GPU Demo</title> </head> -<body style="background-color:Silver; -webkit-perspective: 1000;"> +<body style="background-color:Silver"> <h1>Pepper GPU Demo</h1> -<embed id="plugin" type="pepper-application/x-gpu-demo" width="512" height="512" style="position:absolute; top: 30px; -webkit-transform: rotateY(30deg);" /> -<p style="position:absolute; top: 256px;">Text on top</p> +<object id="plugin" type="pepper-application/x-gpu-demo" width="512" height="512" /> + </body> </html> |