Commit bccf0827 authored by Zhenyao Mo's avatar Zhenyao Mo Committed by Commit Bot

Add VLOG to DirectCompositionChildSurfaceWin::SetDrawRectangle

This is for investigation purpose and will revert after this gets
in Canary and we get the error message from user.

BUG=914911
TEST=bots
R=piman@chromium.org

Change-Id: I67761a335c7e6dee36a2beb8c593f03c4b2d1958
Reviewed-on: https://chromium-review.googlesource.com/c/1396847Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#620164}
parent 442e4362
...@@ -262,19 +262,19 @@ bool DirectCompositionChildSurfaceWin::SupportsDCLayers() const { ...@@ -262,19 +262,19 @@ bool DirectCompositionChildSurfaceWin::SupportsDCLayers() const {
bool DirectCompositionChildSurfaceWin::SetDrawRectangle( bool DirectCompositionChildSurfaceWin::SetDrawRectangle(
const gfx::Rect& rectangle) { const gfx::Rect& rectangle) {
if (!gfx::Rect(size_).Contains(rectangle)) { if (!gfx::Rect(size_).Contains(rectangle)) {
DLOG(ERROR) << "Draw rectangle must be contained within size of surface"; VLOG(1) << "Draw rectangle must be contained within size of surface";
return false; return false;
} }
if (draw_texture_) { if (draw_texture_) {
DLOG(ERROR) << "SetDrawRectangle must be called only once per swap buffers"; VLOG(1) << "SetDrawRectangle must be called only once per swap buffers";
return false; return false;
} }
DCHECK(!real_surface_); DCHECK(!real_surface_);
DCHECK(!g_current_surface); DCHECK(!g_current_surface);
if (gfx::Rect(size_) != rectangle && !swap_chain_ && !dcomp_surface_) { if (gfx::Rect(size_) != rectangle && !swap_chain_ && !dcomp_surface_) {
DLOG(ERROR) << "First draw to surface must draw to everything"; VLOG(1) << "First draw to surface must draw to everything";
return false; return false;
} }
...@@ -294,7 +294,7 @@ bool DirectCompositionChildSurfaceWin::SetDrawRectangle( ...@@ -294,7 +294,7 @@ bool DirectCompositionChildSurfaceWin::SetDrawRectangle(
size_.width(), size_.height(), output_format, size_.width(), size_.height(), output_format,
DXGI_ALPHA_MODE_PREMULTIPLIED, dcomp_surface_.GetAddressOf()); DXGI_ALPHA_MODE_PREMULTIPLIED, dcomp_surface_.GetAddressOf());
if (FAILED(hr)) { if (FAILED(hr)) {
DLOG(ERROR) << "CreateSurface failed with error " << std::hex << hr; VLOG(1) << "CreateSurface failed with error " << std::hex << hr;
return false; return false;
} }
} else if (!enable_dc_layers_ && !swap_chain_) { } else if (!enable_dc_layers_ && !swap_chain_) {
...@@ -331,8 +331,8 @@ bool DirectCompositionChildSurfaceWin::SetDrawRectangle( ...@@ -331,8 +331,8 @@ bool DirectCompositionChildSurfaceWin::SetDrawRectangle(
d3d11_device_.Get(), &desc, nullptr, swap_chain_.GetAddressOf()); d3d11_device_.Get(), &desc, nullptr, swap_chain_.GetAddressOf());
first_swap_ = true; first_swap_ = true;
if (FAILED(hr)) { if (FAILED(hr)) {
DLOG(ERROR) << "CreateSwapChainForComposition failed with error " VLOG(1) << "CreateSwapChainForComposition failed with error " << std::hex
<< std::hex << hr; << hr;
return false; return false;
} }
} }
...@@ -346,7 +346,7 @@ bool DirectCompositionChildSurfaceWin::SetDrawRectangle( ...@@ -346,7 +346,7 @@ bool DirectCompositionChildSurfaceWin::SetDrawRectangle(
HRESULT hr = dcomp_surface_->BeginDraw( HRESULT hr = dcomp_surface_->BeginDraw(
&rect, IID_PPV_ARGS(draw_texture_.GetAddressOf()), &update_offset); &rect, IID_PPV_ARGS(draw_texture_.GetAddressOf()), &update_offset);
if (FAILED(hr)) { if (FAILED(hr)) {
DLOG(ERROR) << "BeginDraw failed with error " << std::hex << hr; VLOG(1) << "BeginDraw failed with error " << std::hex << hr;
return false; return false;
} }
draw_offset_ = gfx::Point(update_offset) - rectangle.origin(); draw_offset_ = gfx::Point(update_offset) - rectangle.origin();
...@@ -373,7 +373,7 @@ bool DirectCompositionChildSurfaceWin::SetDrawRectangle( ...@@ -373,7 +373,7 @@ bool DirectCompositionChildSurfaceWin::SetDrawRectangle(
eglCreatePbufferFromClientBuffer(GetDisplay(), EGL_D3D_TEXTURE_ANGLE, eglCreatePbufferFromClientBuffer(GetDisplay(), EGL_D3D_TEXTURE_ANGLE,
buffer, GetConfig(), pbuffer_attribs); buffer, GetConfig(), pbuffer_attribs);
if (!real_surface_) { if (!real_surface_) {
DLOG(ERROR) << "eglCreatePbufferFromClientBuffer failed with error " VLOG(1) << "eglCreatePbufferFromClientBuffer failed with error "
<< ui::GetLastEGLErrorString(); << ui::GetLastEGLErrorString();
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment