Commit 29d0ee05 authored by mcasas's avatar mcasas Committed by Commit bot

Image Capture: Move files out of content/renderer/media to replicate WebKit's structure

No new code, just shuffling things around so WebKit/Source/modules
and content/renderer have a more related structure, also in terms
of bug components and OWNERS.

BUG=none  (no new code)

TBR=jochen@chromium.org
for adding a third_party/skia to DEPS; this dependency was
in content/renderer/media before anywa, and
third_party/skia hasn't got OWNERs itself :?

Review-Url: https://codereview.chromium.org/2739253003
Cr-Commit-Position: refs/heads/master@{#456149}
parent cee951ec
......@@ -540,6 +540,8 @@ target(link_target_type, "renderer") {
if (enable_webrtc) {
# WebRTC plugin-related stuff goes in a different section below.
sources += [
"image_capture/image_capture_frame_grabber.cc",
"image_capture/image_capture_frame_grabber.h",
"media/aec_dump_message_filter.cc",
"media/aec_dump_message_filter.h",
"media/audio_repetition_detector.cc",
......@@ -554,8 +556,6 @@ target(link_target_type, "renderer") {
"media/gpu/rtc_video_encoder.h",
"media/gpu/rtc_video_encoder_factory.cc",
"media/gpu/rtc_video_encoder_factory.h",
"media/image_capture_frame_grabber.cc",
"media/image_capture_frame_grabber.h",
"media/local_media_stream_audio_source.cc",
"media/local_media_stream_audio_source.h",
"media/media_devices_event_dispatcher.cc",
......
include_rules = [
"+third_party/libyuv",
'+third_party/skia',
]
mcasas@chromium.org
reillyg@chomium.org
# COMPONENT: Blink>ImageCapture
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "content/renderer/media/image_capture_frame_grabber.h"
#include "content/renderer/image_capture/image_capture_frame_grabber.h"
#include "cc/paint/paint_canvas.h"
#include "cc/paint/paint_surface.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_RENDERER_MEDIA_IMAGE_CAPTURE_FRAME_GRABBER_H_
#define CONTENT_RENDERER_MEDIA_IMAGE_CAPTURE_FRAME_GRABBER_H_
#ifndef CONTENT_RENDERER_IMAGE_CAPTURE_IMAGE_CAPTURE_FRAME_GRABBER_H_
#define CONTENT_RENDERER_IMAGE_CAPTURE_IMAGE_CAPTURE_FRAME_GRABBER_H_
#include "base/compiler_specific.h"
#include "base/macros.h"
......@@ -57,4 +57,4 @@ class CONTENT_EXPORT ImageCaptureFrameGrabber final
} // namespace content
#endif // CONTENT_RENDERER_MEDIA_IMAGE_CAPTURE_FRAME_GRABBER_H_
#endif // CONTENT_RENDERER_IMAGE_CAPTURE_IMAGE_CAPTURE_FRAME_GRABBER_H_
......@@ -54,9 +54,9 @@
#include "content/renderer/dom_storage/local_storage_namespace.h"
#include "content/renderer/dom_storage/webstoragenamespace_impl.h"
#include "content/renderer/gamepad_shared_memory_reader.h"
#include "content/renderer/image_capture/image_capture_frame_grabber.h"
#include "content/renderer/media/audio_decoder.h"
#include "content/renderer/media/audio_device_factory.h"
#include "content/renderer/media/image_capture_frame_grabber.h"
#include "content/renderer/media/renderer_webaudiodevice_impl.h"
#include "content/renderer/media/renderer_webmidiaccessor_impl.h"
#include "content/renderer/media_capture_from_element/canvas_capture_handler.h"
......
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