diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-04 14:48:40 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-04 14:48:40 (GMT) |
| commit | b4ef8b906c88e5d60e687d9018af93de0e735e0c (patch) | |
| tree | fe4167319039047ba3ac0c97651dddc0a526349b /src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp | |
| parent | f4f6012d181cf60fd04fc5bf69b21786977f0de0 (diff) | |
| parent | 9cda9fb4bb496a7c589767bdcead131dbcdeeb79 (diff) | |
| download | Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.zip Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.tar.gz Qt-b4ef8b906c88e5d60e687d9018af93de0e735e0c.tar.bz2 | |
Merge commit 's60/4.6' into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp index 11ca3ba..729aceb 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp +++ b/src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp @@ -247,16 +247,12 @@ void HTMLMediaElement::insertedIntoDocument() scheduleLoad(); } -void HTMLMediaElement::willRemove() -{ - if (m_isFullscreen) - exitFullscreen(); - HTMLElement::willRemove(); -} void HTMLMediaElement::removedFromDocument() { if (m_networkState > NETWORK_EMPTY) pause(); + if (m_isFullscreen) + exitFullscreen(); HTMLElement::removedFromDocument(); } @@ -1678,6 +1674,9 @@ void HTMLMediaElement::userCancelledLoad() void HTMLMediaElement::documentWillBecomeInactive() { + if (m_isFullscreen) + exitFullscreen(); + m_inActiveDocument = false; userCancelledLoad(); |