Title: [217872] trunk/Source
- Revision
- 217872
- Author
- [email protected]
- Date
- 2017-06-06 20:46:57 -0700 (Tue, 06 Jun 2017)
Log Message
Unreviewed, rolling out r214974.
Causes some tabs to start using a huge amount of CPU after 8
minutes in the background
Reverted changeset:
"Make inactive web processes behave as though under memory
pressure."
https://bugs.webkit.org/show_bug.cgi?id=170042
http://trac.webkit.org/changeset/214974
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (217871 => 217872)
--- trunk/Source/WTF/ChangeLog 2017-06-07 03:25:12 UTC (rev 217871)
+++ trunk/Source/WTF/ChangeLog 2017-06-07 03:46:57 UTC (rev 217872)
@@ -1,3 +1,17 @@
+2017-06-06 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r214974.
+
+ Causes some tabs to start using a huge amount of CPU after 8
+ minutes in the background
+
+ Reverted changeset:
+
+ "Make inactive web processes behave as though under memory
+ pressure."
+ https://bugs.webkit.org/show_bug.cgi?id=170042
+ http://trac.webkit.org/changeset/214974
+
2017-06-06 Don Olmstead <[email protected]>
[WebCore] Enable REQUEST_ANIMATION_FRAME_TIMER for all ports
Modified: trunk/Source/WTF/wtf/MemoryPressureHandler.cpp (217871 => 217872)
--- trunk/Source/WTF/wtf/MemoryPressureHandler.cpp 2017-06-07 03:25:12 UTC (rev 217871)
+++ trunk/Source/WTF/wtf/MemoryPressureHandler.cpp 2017-06-07 03:46:57 UTC (rev 217872)
@@ -201,9 +201,6 @@
if (m_processState == state)
return;
m_processState = state;
- memoryPressureStatusChanged();
- if (m_processState == WebsamProcessState::Inactive)
- respondToMemoryPressure(Critical::Yes, Synchronous::No);
}
void MemoryPressureHandler::beginSimulatedMemoryPressure()
@@ -223,17 +220,6 @@
memoryPressureStatusChanged();
}
-bool MemoryPressureHandler::isUnderMemoryPressure()
-{
- auto& memoryPressureHandler = singleton();
- return memoryPressureHandler.m_underMemoryPressure
-#if PLATFORM(MAC)
- || memoryPressureHandler.m_memoryUsagePolicy >= MemoryUsagePolicy::Strict
- || memoryPressureHandler.m_processState == WebsamProcessState::Inactive
-#endif
- || memoryPressureHandler.m_isSimulatingMemoryPressure;
-}
-
void MemoryPressureHandler::releaseMemory(Critical critical, Synchronous synchronous)
{
if (!m_lowMemoryHandler)
Modified: trunk/Source/WTF/wtf/MemoryPressureHandler.h (217871 => 217872)
--- trunk/Source/WTF/wtf/MemoryPressureHandler.h 2017-06-07 03:25:12 UTC (rev 217871)
+++ trunk/Source/WTF/wtf/MemoryPressureHandler.h 2017-06-07 03:46:57 UTC (rev 217872)
@@ -79,7 +79,14 @@
m_lowMemoryHandler = WTFMove(handler);
}
- WTF_EXPORT_PRIVATE static bool isUnderMemoryPressure();
+ bool isUnderMemoryPressure() const
+ {
+ return m_underMemoryPressure
+#if PLATFORM(MAC)
+ || m_memoryUsagePolicy >= MemoryUsagePolicy::Strict
+#endif
+ || m_isSimulatingMemoryPressure;
+ }
void setUnderMemoryPressure(bool);
#if OS(LINUX)
@@ -181,7 +188,7 @@
};
#endif
- WebsamProcessState m_processState { WebsamProcessState::Active };
+ WebsamProcessState m_processState { WebsamProcessState::Inactive };
bool m_installed { false };
LowMemoryHandler m_lowMemoryHandler;
Modified: trunk/Source/WebCore/ChangeLog (217871 => 217872)
--- trunk/Source/WebCore/ChangeLog 2017-06-07 03:25:12 UTC (rev 217871)
+++ trunk/Source/WebCore/ChangeLog 2017-06-07 03:46:57 UTC (rev 217872)
@@ -1,3 +1,17 @@
+2017-06-06 Chris Dumez <[email protected]>
+
+ Unreviewed, rolling out r214974.
+
+ Causes some tabs to start using a huge amount of CPU after 8
+ minutes in the background
+
+ Reverted changeset:
+
+ "Make inactive web processes behave as though under memory
+ pressure."
+ https://bugs.webkit.org/show_bug.cgi?id=170042
+ http://trac.webkit.org/changeset/214974
+
2017-06-06 Tim Horton <[email protected]>
Crash trying to drag the entire text of a long book out of Mail compose view
Modified: trunk/Source/WebCore/page/PerformanceMonitor.h (217871 => 217872)
--- trunk/Source/WebCore/page/PerformanceMonitor.h 2017-06-07 03:25:12 UTC (rev 217871)
+++ trunk/Source/WebCore/page/PerformanceMonitor.h 2017-06-07 03:46:57 UTC (rev 217872)
@@ -65,7 +65,7 @@
Timer m_postBackgroundingMemoryUsageTimer;
Timer m_processMayBecomeInactiveTimer;
- bool m_processMayBecomeInactive { false };
+ bool m_processMayBecomeInactive { true };
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
