| Index: gpu/ipc/service/direct_composition_surface_win.cc
|
| diff --git a/gpu/ipc/service/direct_composition_surface_win.cc b/gpu/ipc/service/direct_composition_surface_win.cc
|
| index 70e272adbd24e115767f3e4ef5506d627dd58c75..4438950993170254469566497cd01ae123567efb 100644
|
| --- a/gpu/ipc/service/direct_composition_surface_win.cc
|
| +++ b/gpu/ipc/service/direct_composition_surface_win.cc
|
| @@ -125,7 +125,7 @@ bool HardwareSupportsOverlays() {
|
| DCHECK(d3d11_device);
|
|
|
| base::win::ScopedComPtr<IDXGIDevice> dxgi_device;
|
| - d3d11_device.QueryInterface(dxgi_device.Receive());
|
| + d3d11_device.CopyTo(dxgi_device.Receive());
|
| base::win::ScopedComPtr<IDXGIAdapter> dxgi_adapter;
|
| dxgi_device->GetAdapter(dxgi_adapter.Receive());
|
|
|
| @@ -135,7 +135,7 @@ bool HardwareSupportsOverlays() {
|
| if (FAILED(dxgi_adapter->EnumOutputs(i++, output.Receive())))
|
| break;
|
| base::win::ScopedComPtr<IDXGIOutput3> output3;
|
| - if (FAILED(output.QueryInterface(output3.Receive())))
|
| + if (FAILED(output.CopyTo(output3.Receive())))
|
| continue;
|
|
|
| UINT flags = 0;
|
| @@ -297,13 +297,13 @@ class DCLayerTree::SwapChainPresenter {
|
| };
|
|
|
| bool DCLayerTree::Initialize(HWND window) {
|
| - d3d11_device_.QueryInterface(video_device_.Receive());
|
| + d3d11_device_.CopyTo(video_device_.Receive());
|
| base::win::ScopedComPtr<ID3D11DeviceContext> context;
|
| d3d11_device_->GetImmediateContext(context.Receive());
|
| - context.QueryInterface(video_context_.Receive());
|
| + context.CopyTo(video_context_.Receive());
|
|
|
| base::win::ScopedComPtr<IDCompositionDesktopDevice> desktop_device;
|
| - dcomp_device_.QueryInterface(desktop_device.Receive());
|
| + dcomp_device_.CopyTo(desktop_device.Receive());
|
|
|
| HRESULT hr = desktop_device->CreateTargetForHwnd(window, TRUE,
|
| dcomp_target_.Receive());
|
| @@ -359,10 +359,10 @@ DCLayerTree::SwapChainPresenter::SwapChainPresenter(
|
| DCLayerTree* surface,
|
| base::win::ScopedComPtr<ID3D11Device> d3d11_device)
|
| : surface_(surface), d3d11_device_(d3d11_device) {
|
| - d3d11_device_.QueryInterface(video_device_.Receive());
|
| + d3d11_device_.CopyTo(video_device_.Receive());
|
| base::win::ScopedComPtr<ID3D11DeviceContext> context;
|
| d3d11_device_->GetImmediateContext(context.Receive());
|
| - context.QueryInterface(video_context_.Receive());
|
| + context.CopyTo(video_context_.Receive());
|
| HMODULE dcomp = ::GetModuleHandleA("dcomp.dll");
|
| CHECK(dcomp);
|
| create_surface_handle_function_ =
|
| @@ -447,7 +447,7 @@ void DCLayerTree::SwapChainPresenter::PresentToSwapChain(
|
| // TODO(jbauman): Use correct colorspace.
|
| gfx::ColorSpace src_color_space = gfx::ColorSpace::CreateREC709();
|
| base::win::ScopedComPtr<ID3D11VideoContext1> context1;
|
| - if (SUCCEEDED(video_context_.QueryInterface(context1.Receive()))) {
|
| + if (SUCCEEDED(video_context_.CopyTo(context1.Receive()))) {
|
| context1->VideoProcessorSetStreamColorSpace1(
|
| video_processor_.Get(), 0,
|
| gfx::ColorSpaceWin::GetDXGIColorSpace(src_color_space));
|
| @@ -468,7 +468,7 @@ void DCLayerTree::SwapChainPresenter::PresentToSwapChain(
|
| }
|
|
|
| base::win::ScopedComPtr<IDXGISwapChain3> swap_chain3;
|
| - if (SUCCEEDED(swap_chain_.QueryInterface(swap_chain3.Receive()))) {
|
| + if (SUCCEEDED(swap_chain_.CopyTo(swap_chain3.Receive()))) {
|
| DXGI_COLOR_SPACE_TYPE color_space =
|
| gfx::ColorSpaceWin::GetDXGIColorSpace(output_color_space);
|
| HRESULT hr = swap_chain3->SetColorSpace1(color_space);
|
| @@ -549,7 +549,7 @@ void DCLayerTree::SwapChainPresenter::PresentToSwapChain(
|
| frames_since_color_space_change_++;
|
|
|
| base::win::ScopedComPtr<IDXGISwapChainMedia> swap_chain_media;
|
| - if (SUCCEEDED(swap_chain_.QueryInterface(swap_chain_media.Receive()))) {
|
| + if (SUCCEEDED(swap_chain_.CopyTo(swap_chain_media.Receive()))) {
|
| DXGI_FRAME_STATISTICS_MEDIA stats = {};
|
| if (SUCCEEDED(swap_chain_media->GetFrameStatisticsMedia(&stats))) {
|
| UMA_HISTOGRAM_SPARSE_SLOWLY("GPU.DirectComposition.CompositionMode",
|
| @@ -582,14 +582,14 @@ void DCLayerTree::SwapChainPresenter::ReallocateSwapChain(bool yuy2) {
|
| DCHECK(!swap_chain_);
|
|
|
| base::win::ScopedComPtr<IDXGIDevice> dxgi_device;
|
| - d3d11_device_.QueryInterface(dxgi_device.Receive());
|
| + d3d11_device_.CopyTo(dxgi_device.Receive());
|
| base::win::ScopedComPtr<IDXGIAdapter> dxgi_adapter;
|
| dxgi_device->GetAdapter(dxgi_adapter.Receive());
|
| base::win::ScopedComPtr<IDXGIFactory2> dxgi_factory;
|
| dxgi_adapter->GetParent(IID_PPV_ARGS(dxgi_factory.Receive()));
|
|
|
| base::win::ScopedComPtr<IDXGIFactoryMedia> media_factory;
|
| - dxgi_factory.QueryInterface(media_factory.Receive());
|
| + dxgi_factory.CopyTo(media_factory.Receive());
|
| DXGI_SWAP_CHAIN_DESC1 desc = {};
|
| desc.Width = swap_chain_size_.width();
|
| desc.Height = swap_chain_size_.height();
|
| @@ -921,7 +921,7 @@ void DirectCompositionSurfaceWin::InitializeSurface() {
|
| DXGI_ALPHA_MODE alpha_mode =
|
| has_alpha_ ? DXGI_ALPHA_MODE_PREMULTIPLIED : DXGI_ALPHA_MODE_IGNORE;
|
| base::win::ScopedComPtr<IDXGIDevice> dxgi_device;
|
| - d3d11_device_.QueryInterface(dxgi_device.Receive());
|
| + d3d11_device_.CopyTo(dxgi_device.Receive());
|
| base::win::ScopedComPtr<IDXGIAdapter> dxgi_adapter;
|
| dxgi_device->GetAdapter(dxgi_adapter.Receive());
|
| base::win::ScopedComPtr<IDXGIFactory2> dxgi_factory;
|
| @@ -968,7 +968,7 @@ void DirectCompositionSurfaceWin::ReleaseDrawTexture(bool will_discard) {
|
| // committing the DirectComposition tree, or else the swapchain
|
| // may flicker black when it's first presented.
|
| base::win::ScopedComPtr<IDXGIDevice2> dxgi_device2;
|
| - HRESULT hr = d3d11_device_.QueryInterface(dxgi_device2.Receive());
|
| + HRESULT hr = d3d11_device_.CopyTo(dxgi_device2.Receive());
|
| DCHECK(SUCCEEDED(hr));
|
| base::WaitableEvent event(
|
| base::WaitableEvent::ResetPolicy::AUTOMATIC,
|
|
|