Title: [159246] trunk/Source/WebCore
Revision
159246
Author
[email protected]
Date
2013-11-13 15:10:30 -0800 (Wed, 13 Nov 2013)

Log Message

Remove Document::m_savedRenderView pointer.
<https://webkit.org/b/124310>

This pointer held a copy of m_renderView while the document was in
page cache, and null while it wasn't. It was not used for anything.

Reviewed by Anders Carlsson.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (159245 => 159246)


--- trunk/Source/WebCore/ChangeLog	2013-11-13 23:08:53 UTC (rev 159245)
+++ trunk/Source/WebCore/ChangeLog	2013-11-13 23:10:30 UTC (rev 159246)
@@ -1,3 +1,13 @@
+2013-11-13  Andreas Kling  <[email protected]>
+
+        Remove Document::m_savedRenderView pointer.
+        <https://webkit.org/b/124310>
+
+        This pointer held a copy of m_renderView while the document was in
+        page cache, and null while it wasn't. It was not used for anything.
+
+        Reviewed by Anders Carlsson.
+
 2013-11-13  Brady Eidson  <[email protected]>
 
         Move setIndexKeys() to the IDBServerConnection

Modified: trunk/Source/WebCore/dom/Document.cpp (159245 => 159246)


--- trunk/Source/WebCore/dom/Document.cpp	2013-11-13 23:08:53 UTC (rev 159245)
+++ trunk/Source/WebCore/dom/Document.cpp	2013-11-13 23:10:30 UTC (rev 159246)
@@ -427,7 +427,6 @@
     , m_xmlVersion(ASCIILiteral("1.0"))
     , m_xmlStandalone(StandaloneUnspecified)
     , m_hasXMLDeclaration(false)
-    , m_savedRenderView(nullptr)
     , m_designMode(inherit)
 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION)
     , m_hasAnnotatedRegions(false)
@@ -532,7 +531,6 @@
 {
     ASSERT(!renderView());
     ASSERT(!m_inPageCache);
-    ASSERT(!m_savedRenderView);
     ASSERT(m_ranges.isEmpty());
     ASSERT(!m_styleRecalcTimer.isActive());
     ASSERT(!m_parentTreeScope);
@@ -3927,8 +3925,6 @@
         page->lockAllOverlayScrollbarsToHidden(flag);
 
     if (flag) {
-        ASSERT(!m_savedRenderView);
-        m_savedRenderView = renderView();
         if (v) {
             // FIXME: There is some scrolling related work that needs to happen whenever a page goes into the
             // page cache and similar work that needs to occur when it comes out. This is where we do the work
@@ -3947,10 +3943,6 @@
         }
         m_styleRecalcTimer.stop();
     } else {
-        ASSERT(!renderView() || renderView() == m_savedRenderView);
-        setRenderView(m_savedRenderView);
-        m_savedRenderView = nullptr;
-
         if (childNeedsStyleRecalc())
             scheduleStyleRecalc();
     }

Modified: trunk/Source/WebCore/dom/Document.h (159245 => 159246)


--- trunk/Source/WebCore/dom/Document.h	2013-11-13 23:08:53 UTC (rev 159245)
+++ trunk/Source/WebCore/dom/Document.h	2013-11-13 23:10:30 UTC (rev 159246)
@@ -1411,8 +1411,6 @@
 
     String m_contentLanguage;
 
-    RenderView* m_savedRenderView;
-    
     RefPtr<TextResourceDecoder> m_decoder;
 
     InheritedBool m_designMode;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to