summaryrefslogtreecommitdiffstats
path: root/media/cdm
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-26 03:39:13 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-26 03:39:13 +0000
commit98b1462d9778f3554bfd70c9ad730b9a1bf1c402 (patch)
tree3ee479e938e46c212db0fa6369a3bdf739cde769 /media/cdm
parent2ce42c602bf3574bd7c257ef6928c32d486ae1f3 (diff)
downloadchromium_src-98b1462d9778f3554bfd70c9ad730b9a1bf1c402.zip
chromium_src-98b1462d9778f3554bfd70c9ad730b9a1bf1c402.tar.gz
chromium_src-98b1462d9778f3554bfd70c9ad730b9a1bf1c402.tar.bz2
Make PPB_URLUtil_Dev interface backward compatible
Commit on behalf of xzhang@adobe.com The original code review issue is: https://codereview.chromium.org/59243002/ BUG=None TEST=None Review URL: https://codereview.chromium.org/86483003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cdm')
-rw-r--r--media/cdm/ppapi/cdm_adapter.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc
index 1da9d15..1d9200a 100644
--- a/media/cdm/ppapi/cdm_adapter.cc
+++ b/media/cdm/ppapi/cdm_adapter.cc
@@ -259,7 +259,12 @@ void CdmAdapter::GenerateKeyRequest(uint32_t reference_id,
#if defined(CHECK_DOCUMENT_URL)
PP_URLComponents_Dev url_components = {};
- pp::Var href = pp::URLUtil_Dev::Get()->GetDocumentURL(
+ const pp::URLUtil_Dev* url_util = pp::URLUtil_Dev::Get();
+ if (!url_util) {
+ SendUnknownKeyError(reference_id);
+ return;
+ }
+ pp::Var href = url_util->GetDocumentURL(
pp::InstanceHandle(pp_instance()), &url_components);
PP_DCHECK(href.is_string());
PP_DCHECK(!href.AsString().empty());