Index: content/browser/media/capture/desktop_capture_device_aura.cc |
diff --git a/content/browser/media/capture/desktop_capture_device_aura.cc b/content/browser/media/capture/desktop_capture_device_aura.cc |
index 14dc780f19cb03789ed7d87e33944ecacbd6d7b6..45631b5a750a2d967b7580e52b63d39502ac6d1b 100644 |
--- a/content/browser/media/capture/desktop_capture_device_aura.cc |
+++ b/content/browser/media/capture/desktop_capture_device_aura.cc |
@@ -254,16 +254,9 @@ void DesktopVideoCaptureMachine::Stop(const base::Closure& callback) { |
void DesktopVideoCaptureMachine::UpdateCaptureSize() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
if (oracle_proxy_.get() && desktop_window_) { |
- ui::Layer* layer = desktop_window_->layer(); |
- gfx::Size capture_size = |
- ui::ConvertSizeToPixel(layer, layer->bounds().size()); |
-#if defined(OS_CHROMEOS) |
- // Pad desktop capture size to multiples of 16 pixels to accommodate HW |
- // encoder. TODO(hshi): remove this hack. See http://crbug.com/402151 |
- capture_size.SetSize((capture_size.width() + 15) & ~15, |
- (capture_size.height() + 15) & ~15); |
-#endif |
- oracle_proxy_->UpdateCaptureSize(capture_size); |
+ ui::Layer* layer = desktop_window_->layer(); |
+ oracle_proxy_->UpdateCaptureSize(ui::ConvertSizeToPixel( |
+ layer, layer->bounds().size())); |
} |
ClearCursorState(); |
} |