Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: content/renderer/media_capture_from_element/canvas_capture_handler.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media_capture_from_element/canvas_capture_handler.cc
diff --git a/content/renderer/media_capture_from_element/canvas_capture_handler.cc b/content/renderer/media_capture_from_element/canvas_capture_handler.cc
index 65935ec0381b7bc19d5409250ccd74c4e2428251..fcea03de6135d3b0ed8ae5de3925e6b94ea7e370 100644
--- a/content/renderer/media_capture_from_element/canvas_capture_handler.cc
+++ b/content/renderer/media_capture_from_element/canvas_capture_handler.cc
@@ -20,7 +20,9 @@
#include "media/base/limits.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
#include "third_party/WebKit/public/platform/WebString.h"
+#undef FOURCC // Leaky macro from both libyuv and webrtc
#include "third_party/libyuv/include/libyuv.h"
+#undef FOURCC // Leaky macro from both libyuv and webrtc
#include "third_party/skia/include/core/SkImage.h"
namespace {
« no previous file with comments | « content/renderer/media/webrtc_local_audio_source_provider.cc ('k') | content/renderer/pepper/pepper_audio_input_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698