Skip to content

Commit ddd1f79

Browse files
author
Jay Bhaskar
committed
8314212: Crash when loading cnn.com in WebView
Reviewed-by: kcr, hmeda
1 parent 7b797b9 commit ddd1f79

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/java/MediaPlayerPrivateJava.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,12 @@ float MediaPlayerPrivate::currentTime() const
430430
LOG_TRACE1("MediaPlayerPrivate currentTime returns (seekTime): %f\n", m_seekTime);
431431
return m_seekTime;
432432
}
433+
434+
// in case of hls media m3u8 format check network state
435+
// since jfx media do not support hls live streaming protocol
436+
if (MediaPlayerNetworkState::NetworkError == MediaPlayer::NetworkState::NetworkError)
437+
return MediaTime::zeroTime().toFloat();
438+
433439
JNIEnv* env = WTF::GetJavaEnv();
434440
static jmethodID s_mID
435441
= env->GetMethodID(PG_GetMediaPlayerClass(env), "fwkGetCurrentTime", "()F");

modules/javafx.web/src/main/native/Source/WebCore/rendering/RenderLayerCompositor.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -1196,6 +1196,11 @@ void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* ancestor
11961196
#endif
11971197
}
11981198

1199+
// in case of video data format like m3u8 error case ,check if layer needs compositing
1200+
#if PLATFORM(JAVA)
1201+
if (willBeComposited != needsToBeComposited(layer, queryData))
1202+
return;
1203+
#endif
11991204
ASSERT(willBeComposited == needsToBeComposited(layer, queryData));
12001205

12011206
// Create or destroy backing here. However, we can't update geometry because layers above us may become composited

0 commit comments

Comments
 (0)