Changeset 83513 in webkit

Timestamp:

Apr 11, 2011 3:15:07 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-11 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Remove m_urlAtProcessExit from WebPageProxy
​https://bugs.webkit.org/show_bug.cgi?id=58275

Get rid of m_urlAtProcessExit and replace some zeros with nullptrs.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::processDidCrash):
• UIProcess/WebPageProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-11  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Remove m_urlAtProcessExit from WebPageProxy
+        https://bugs.webkit.org/show_bug.cgi?id=58275
+
+        Get rid of m_urlAtProcessExit and replace some zeros with nullptrs.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::processDidCrash):
+        * UIProcess/WebPageProxy.h:
+
 2011-04-11  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -2692 +2692 @@
     m_isValid = false;
 
-    if (m_mainFrame)
-        m_urlAtProcessExit = m_mainFrame->url();
-
-    m_mainFrame = 0;
-
+    m_mainFrame = nullptr;
     m_drawingArea = nullptr;
 
@@ -2702 +2698 @@
     if (m_inspector) {
         m_inspector->invalidate();
-        m_inspector = 0;
+        m_inspector = nullptr;
     }
 #endif
@@ -2709 +2705 @@
     if (m_fullScreenManager) {
         m_fullScreenManager->invalidate();
-        m_fullScreenManager = 0;
+        m_fullScreenManager = nullptr;
     }
 #endif
@@ -2715 +2711 @@
     if (m_openPanelResultListener) {
         m_openPanelResultListener->invalidate();
-        m_openPanelResultListener = 0;
+        m_openPanelResultListener = nullptr;
     }
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -429 +429 @@
     WebCore::DragOperation dragOperation() { return m_currentDragOperation; }
     void resetDragOperation() { m_currentDragOperation = WebCore::DragOperationNone; }
-
-    // REMOVE: For demo purposes only.
-    const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
 
     void preferencesDidChange();
@@ -763 +760 @@
     SelectionState m_selectionState;
 
-    // REMOVE: For demo purposes only.
-    String m_urlAtProcessExit;
-
     double m_textZoomFactor;
     double m_pageZoomFactor;