Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(623)

Unified Diff: Source/core/dom/Document.cpp

Issue 108333006: Adding a navigation policy for the "presentation" feature in window.open() Base URL: https://github.com/drott/blink-crosswalk.git@presentationWindow
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/loader/NavigationPolicy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index 5a414bae9abb526fe0e730a0456c35baa50a1dca..288bcf9a9e0ce68d413943dfafefe6dcf8662d00 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -4809,8 +4809,14 @@ void Document::didRemoveTouchEventHandler(Node* handler)
{
if (!m_touchEventTargets.get())
return;
- ASSERT(m_touchEventTargets->contains(handler));
+
+ // ASSERT(m_touchEventTargets->contains(handler));
+ // For demo purposes - let's soften this a bit to avoid assertion failure
+ // crashes. Seems that on closing the window this is prone to races on Windows.
+ if (!m_touchEventTargets->contains(handler))
+ return;
m_touchEventTargets->remove(handler);
+
if (Document* parent = parentDocument()) {
parent->didRemoveTouchEventHandler(this);
return;
« no previous file with comments | « no previous file | Source/core/loader/NavigationPolicy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698