From: oskwon Date: Mon, 6 Feb 2017 08:57:17 +0000 (+0900) Subject: fixes crash error. X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=9d45cb4e4e0d30688eae0b7f9820fc258bfcf54e fixes crash error. --- diff --git a/meta-openvuplus/recipes-webkit/webkit/webkit-gtk/fixed_crash_error.diff b/meta-openvuplus/recipes-webkit/webkit/webkit-gtk/fixed_crash_error.diff new file mode 100644 index 0000000..97ed658 --- /dev/null +++ b/meta-openvuplus/recipes-webkit/webkit/webkit-gtk/fixed_crash_error.diff @@ -0,0 +1,23 @@ +commit 6562b9521098e108c431cd45b8cb691dc4abf8c8 +Author: oskwon +Date: Sat Feb 4 03:49:59 2017 +0900 + + fix!! + +diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp +index c21fcd7..d6a3a85 100644 +--- a/Source/WebCore/plugins/PluginView.cpp ++++ b/Source/WebCore/plugins/PluginView.cpp +@@ -126,7 +126,11 @@ IntRect PluginView::windowClipRect() const + IntRect clipRect(m_windowRect); + + // Take our element and get the clip rect from the enclosing layer and frame view. +- RenderLayer* layer = m_element->renderer()->enclosingLayer(); ++ RenderLayer* layer = 0; ++ RenderObject* renderer = m_element->renderer(); ++ if (renderer) { ++ layer = m_element->renderer()->enclosingLayer(); ++ } + FrameView* parentView = m_element->document()->view(); + clipRect.intersect(parentView->windowClipRectForLayer(layer, true)); + diff --git a/meta-openvuplus/recipes-webkit/webkit/webkit-gtk_git.bb b/meta-openvuplus/recipes-webkit/webkit/webkit-gtk_git.bb index 2825697..5e95268 100644 --- a/meta-openvuplus/recipes-webkit/webkit/webkit-gtk_git.bb +++ b/meta-openvuplus/recipes-webkit/webkit/webkit-gtk_git.bb @@ -14,13 +14,16 @@ ICU_LIB = "icu" DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libidn gnutls geoclue \ gtk+ gstreamer1.0 gstreamer1.0-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" -PR = "r3" +PR = "r4" PV = "r95199" BRANCH="vuplus-webkit" SRCREV="9eed47d1f873a13759d3fd8ead72739b328d710a" -SRC_URI = "git://code.vuplus.com:/git/webkit-r95199-base.git;protocol=http;branch=${BRANCH};rev=${SRCREV}" +SRC_URI = " \ + git://code.vuplus.com:/git/webkit-r95199-base.git;protocol=http;branch=${BRANCH};rev=${SRCREV} \ + file://fixed_crash_error.diff \ +" inherit autotools lib_package gtk-doc pkgconfig