diff options
| author | Ben Murdoch <benm@google.com> | 2011-07-13 10:14:36 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-07-13 11:03:14 +0100 |
| commit | d0147a863b872ecaa451ab0dce2a348760e99e2c (patch) | |
| tree | b4819830b7ab03f384ed8ab83734ac0f46193263 /Source/WebCore/html/MediaDocument.cpp | |
| parent | 65b45b34343dc5d5b9dbeda52e9de428e146c8f7 (diff) | |
| download | external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.zip external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.tar.gz external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.tar.bz2 | |
Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.
Take us to top of Chrome 12 release branch (12.0.742.130)
Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
Diffstat (limited to 'Source/WebCore/html/MediaDocument.cpp')
| -rw-r--r-- | Source/WebCore/html/MediaDocument.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/html/MediaDocument.cpp b/Source/WebCore/html/MediaDocument.cpp index cd1fdfb..1d7b0f9 100644 --- a/Source/WebCore/html/MediaDocument.cpp +++ b/Source/WebCore/html/MediaDocument.cpp @@ -209,7 +209,11 @@ void MediaDocument::replaceMediaElementTimerFired(Timer<MediaDocument>*) embedElement->setAttribute(heightAttr, "100%"); embedElement->setAttribute(nameAttr, "plugin"); embedElement->setAttribute(srcAttr, url().string()); - embedElement->setAttribute(typeAttr, loader()->writer()->mimeType()); + + DocumentLoader* documentLoader = loader(); + ASSERT(documentLoader); + if (documentLoader) + embedElement->setAttribute(typeAttr, documentLoader->writer()->mimeType()); ExceptionCode ec; videoElement->parentNode()->replaceChild(embedElement, videoElement, ec); |