author | Jeff Muizelaar <jmuizelaar@mozilla.com> |
Fri, 30 Jan 2015 00:12:01 -0500 | |
changeset 226758 | 4be1e72d619b138b61d6be9301acdf446ae885d9 |
parent 226757 | 14594507ec55729f0d3d9eeaa3ba52d8046f399f |
child 226759 | 42b47d13f842d30225a0672dd6a6e3f49f87e20f |
push id | 28205 |
push user | ryanvm@gmail.com |
push date | Fri, 30 Jan 2015 17:32:20 +0000 |
treeherder | mozilla-central@d7e156a7a0a6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1124847 |
milestone | 38.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/gfx/layers/d3d11/TextureD3D11.cpp +++ b/gfx/layers/d3d11/TextureD3D11.cpp @@ -362,17 +362,17 @@ TextureClientD3D11::BorrowDrawTarget() gfxWarning() << "Invalid draw target for borrowing"; } return mDrawTarget; } static const GUID sD3D11TextureUsage = { 0xd89275b0, 0x6c7d, 0x4038, { 0xb5, 0xfa, 0x4d, 0x87, 0x16, 0xd5, 0xcc, 0x4e } }; -/* This class get's it's lifetime tied to a D3D texture +/* This class gets its lifetime tied to a D3D texture * and increments memory usage on construction and decrements * on destruction */ class TextureMemoryMeasurer : public IUnknown { public: TextureMemoryMeasurer(size_t aMemoryUsed) { mMemoryUsed = aMemoryUsed;