diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-05-08 01:22:24 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-05-08 22:46:34 +0000 |
| commit | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebCore | |
| parent | 6469f308c0f0f710544d7d55c7655384bed27795 (diff) | |
| download | qtwebkit-wip/next.tar.gz | |
Import WebKit commit b25ce6eca994718717218f56d045e75a4a22f989wip/next
Change-Id: Ied338d9a16b44b5da35d484e80a21acc284eb625
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/bindings/js/JSDOMGlobalObject.h | 1 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/bindings/js/JSDOMGlobalObject.h b/Source/WebCore/bindings/js/JSDOMGlobalObject.h index ca286c0a6..0f77bf435 100644 --- a/Source/WebCore/bindings/js/JSDOMGlobalObject.h +++ b/Source/WebCore/bindings/js/JSDOMGlobalObject.h @@ -30,6 +30,7 @@ #include "PlatformExportMacros.h" #include "WebCoreJSBuiltinInternals.h" #include <runtime/JSGlobalObject.h> +#include <runtime/StructureInlines.h> namespace WebCore { diff --git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp index 8c898c17b..b6bdf60ca 100644 --- a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp +++ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp @@ -695,7 +695,7 @@ void MediaPlayerPrivateMediaFoundation::createVideoWindow() PlatformPageClient pageClient = view->hostWindow()->platformPageClient(); #if PLATFORM(QT) - QWindow* ownerWindow = pageClient->ownerWindow(); + QWindow* ownerWindow = pageClient ? pageClient->ownerWindow() : nullptr; if (!ownerWindow) return; hWndParent = (HWND)ownerWindow->winId(); |