diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 04:41:50 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 04:41:50 +0000 |
| commit | 80504655bd84c4d34c31bb5d3d7ae2df1c2de29f (patch) | |
| tree | bd89741aa47be93927eb2efe55a866b7e2392571 /content/renderer/media | |
| parent | bb28d29ac8cb3d1977874beef149fa8ccc323c82 (diff) | |
| download | chromium_src-80504655bd84c4d34c31bb5d3d7ae2df1c2de29f.zip chromium_src-80504655bd84c4d34c31bb5d3d7ae2df1c2de29f.tar.gz chromium_src-80504655bd84c4d34c31bb5d3d7ae2df1c2de29f.tar.bz2 | |
Revert teporary include hacks for WebLocalFrame and use forward declares
BUG=346764
Review URL: https://codereview.chromium.org/238033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
5 files changed, 6 insertions, 8 deletions
diff --git a/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h b/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h index 50a3359..7f54f0c 100644 --- a/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h +++ b/content/renderer/media/crypto/pepper_cdm_wrapper_impl.h @@ -13,11 +13,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "content/renderer/media/crypto/pepper_cdm_wrapper.h" -// TODO(dcheng): Temporary. Convert back to a forward declare. -#include "third_party/WebKit/public/web/WebLocalFrame.h" namespace blink { class WebHelperPlugin; +class WebLocalFrame; } namespace content { diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index a0b3cf2..ddb5c89 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -29,7 +29,7 @@ #include "third_party/WebKit/public/platform/WebMediaConstraints.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/web/WebDocument.h" -#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" namespace content { @@ -95,7 +95,7 @@ void MediaStreamImpl::requestUserMedia( int request_id = g_next_request_id++; StreamOptions options; - blink::WebFrame* frame = NULL; + blink::WebLocalFrame* frame = NULL; GURL security_origin; bool enable_automatic_output_device_selection = false; diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h index ca9c218..63d6de8 100644 --- a/content/renderer/media/webcontentdecryptionmodule_impl.h +++ b/content/renderer/media/webcontentdecryptionmodule_impl.h @@ -11,10 +11,9 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h" -// TODO(dcheng): Remove and convert back to a forward declare. -#include "third_party/WebKit/public/web/WebLocalFrame.h" namespace blink { +class WebLocalFrame; class WebSecurityOrigin; } diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc index e54b162..ea68fc7 100644 --- a/content/renderer/media/webmediaplayer_impl.cc +++ b/content/renderer/media/webmediaplayer_impl.cc @@ -66,6 +66,7 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebView.h" diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h index 22d4854..1c3cb51 100644 --- a/content/renderer/media/webmediaplayer_impl.h +++ b/content/renderer/media/webmediaplayer_impl.h @@ -28,14 +28,13 @@ #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebMediaPlayer.h" #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" -// TODO(dcheng): Convert back to forward declare. -#include "third_party/WebKit/public/web/WebLocalFrame.h" #include "url/gurl.h" class RenderAudioSourceProvider; namespace blink { class WebContentDecryptionModule; +class WebLocalFrame; } namespace base { |