Title: [206040] trunk/Source/WebKit2
Revision
206040
Author
ddkil...@apple.com
Date
2016-09-16 12:44:50 -0700 (Fri, 16 Sep 2016)

Log Message

ASSERT accidentally commented out in r204916
<https://webkit.org/b/162077>

Reviewed by Anders Carlsson.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::terminateProcess): Comment in the ASSERT
back in.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (206039 => 206040)


--- trunk/Source/WebKit2/ChangeLog	2016-09-16 19:33:22 UTC (rev 206039)
+++ trunk/Source/WebKit2/ChangeLog	2016-09-16 19:44:50 UTC (rev 206040)
@@ -1,3 +1,14 @@
+2016-09-16  David Kilzer  <ddkil...@apple.com>
+
+        ASSERT accidentally commented out in r204916
+        <https://webkit.org/b/162077>
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::terminateProcess): Comment in the ASSERT
+        back in.
+
 2016-09-16  Wenson Hsieh  <wenson_hs...@apple.com>
 
         Inserting a space after inserting an accepted candidate scrolls the document and causes a flicker

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (206039 => 206040)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2016-09-16 19:33:22 UTC (rev 206039)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2016-09-16 19:44:50 UTC (rev 206040)
@@ -2351,7 +2351,7 @@
     // requestTermination() is a no-op for launching processes, so we get into an inconsistent state by calling resetStateAfterProcessExited().
     // FIXME: A client can terminate the page at any time, so we should do something more meaningful than assert and fall apart in release builds.
     // See also <https://bugs.webkit.org/show_bug.cgi?id=136012>.
-//    ASSERT(m_process->state() != WebProcessProxy::State::Launching);
+    ASSERT(m_process->state() != WebProcessProxy::State::Launching);
 
     // NOTE: This uses a check of m_isValid rather than calling isValid() since
     // we want this to run even for pages being closed or that already closed.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to