From d5594e09fdc8e8c9d63e920436fb9d30f47df908 Mon Sep 17 00:00:00 2001 From: "abecsi@webkit.org" Date: Thu, 26 Jan 2012 18:46:55 +0000 Subject: [PATCH] ASSERT(!m_overlay) reached in TapHighlightController.cpp:73 https://bugs.webkit.org/show_bug.cgi?id=77117 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed by Tor Arne Vestbø. The PageOverlay does only get uninstalled after the fade-out animation finishes, so do not assert on !m_overlay after the uninstallPageOverlay call. * WebProcess/WebPage/TapHighlightController.cpp: (WebKit::TapHighlightController::hideHighlight): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106012 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 13 +++++++++++++ .../WebKit2/WebProcess/WebPage/TapHighlightController.cpp | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index f22afe0..82b1542 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,16 @@ +2012-01-26 Andras Becsi + + ASSERT(!m_overlay) reached in TapHighlightController.cpp:73 + https://bugs.webkit.org/show_bug.cgi?id=77117 + + Reviewed by Tor Arne Vestbø. + + The PageOverlay does only get uninstalled after the fade-out animation finishes, + so do not assert on !m_overlay after the uninstallPageOverlay call. + + * WebProcess/WebPage/TapHighlightController.cpp: + (WebKit::TapHighlightController::hideHighlight): + 2012-01-26 Caio Marcelo de Oliveira Filho WebPreferencesStore: use DEFINE_STATIC_LOCAL for overrides HashMap diff --git a/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp b/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp index 5408107..1c36a4d 100644 --- a/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp +++ b/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp @@ -70,7 +70,6 @@ void TapHighlightController::hideHighlight() { if (m_overlay) m_webPage->uninstallPageOverlay(m_overlay, /* fadeout */ true); - ASSERT(!m_overlay); } void TapHighlightController::pageOverlayDestroyed(PageOverlay*) -- 2.7.4