Title: [134337] branches/chromium/1312/Source/WebKit/chromium
Revision
134337
Author
[email protected]
Date
2012-11-12 18:22:18 -0800 (Mon, 12 Nov 2012)

Log Message

Merge 134009 - WebPagePopupImpl::handleKeyEvent is called after WebPagePopupImpl::close
https://bugs.webkit.org/show_bug.cgi?id=93800

Reviewed by Kent Tamura.

We need to set m_closing to true in WebPagePopupImpl::close so we won't access m_page in WebPagePopupImpl::handleKeyEvent.

* src/WebPagePopupImpl.cpp:
(WebKit::WebPagePopupImpl::close): Set m_closing to true.


[email protected]
Review URL: https://codereview.chromium.org/11312201

Modified Paths

Diff

Modified: branches/chromium/1312/Source/WebKit/chromium/ChangeLog (134336 => 134337)


--- branches/chromium/1312/Source/WebKit/chromium/ChangeLog	2012-11-13 02:10:09 UTC (rev 134336)
+++ branches/chromium/1312/Source/WebKit/chromium/ChangeLog	2012-11-13 02:22:18 UTC (rev 134337)
@@ -1,3 +1,15 @@
+2012-11-08  Keishi Hattori  <[email protected]>
+
+        WebPagePopupImpl::handleKeyEvent is called after WebPagePopupImpl::close
+        https://bugs.webkit.org/show_bug.cgi?id=93800
+
+        Reviewed by Kent Tamura.
+
+        We need to set m_closing to true in WebPagePopupImpl::close so we won't access m_page in WebPagePopupImpl::handleKeyEvent.
+
+        * src/WebPagePopupImpl.cpp:
+        (WebKit::WebPagePopupImpl::close): Set m_closing to true.
+
 2012-10-31  Keishi Hattori  <[email protected]>
 
         [Chromium] Page popup shows up at wrong locations when root view is scrolled

Modified: branches/chromium/1312/Source/WebKit/chromium/src/WebPagePopupImpl.cpp (134336 => 134337)


--- branches/chromium/1312/Source/WebKit/chromium/src/WebPagePopupImpl.cpp	2012-11-13 02:10:09 UTC (rev 134336)
+++ branches/chromium/1312/Source/WebKit/chromium/src/WebPagePopupImpl.cpp	2012-11-13 02:22:18 UTC (rev 134337)
@@ -304,6 +304,7 @@
 
 void WebPagePopupImpl::close()
 {
+    m_closing = true;
     if (m_page && m_page->mainFrame())
         m_page->mainFrame()->loader()->frameDetached();
     m_page.clear();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to