Title: [173625] branches/safari-600.1.4.11-branch/Source/WebKit2
- Revision
- 173625
- Author
- [email protected]
- Date
- 2014-09-15 11:45:28 -0700 (Mon, 15 Sep 2014)
Log Message
Merged r173623. <rdar://problem/17897780>
Modified Paths
Diff
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog (173624 => 173625)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-15 18:40:21 UTC (rev 173624)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-09-15 18:45:28 UTC (rev 173625)
@@ -1,5 +1,29 @@
2014-09-15 Babak Shafiei <[email protected]>
+ Merge r173623.
+
+ 2014-09-13 Gavin Barraclough <[email protected]>
+
+ Should call [BKSProcessAssertion invalidate]
+ https://bugs.webkit.org/show_bug.cgi?id=136804
+ <rdar://problem/17897780>
+
+ Reviewed by Darin Adler.
+
+ We should invalidate the process assertion before releasing it. Fortunately this is really easy,
+ since there is a simple 1:1 relationship with ProcessAssertion, with their lifetimes matching exactly.
+
+ * UIProcess/ProcessAssertion.cpp:
+ (WebKit::ProcessAssertion::~ProcessAssertion):
+ - no-op implementation.
+ * UIProcess/ProcessAssertion.h:
+ - added destructor.
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ (WebKit::ProcessAssertion::~ProcessAssertion):
+ - destructor invalidates the BKSProcessAssertion.
+
+2014-09-15 Babak Shafiei <[email protected]>
+
<rdar://problem/18327341> Disable Web Timing on this branch.
Reviewed originally by Sam Weinig.
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ProcessAssertion.cpp (173624 => 173625)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ProcessAssertion.cpp 2014-09-15 18:40:21 UTC (rev 173624)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ProcessAssertion.cpp 2014-09-15 18:45:28 UTC (rev 173625)
@@ -35,6 +35,10 @@
{
}
+ProcessAssertion::~ProcessAssertion()
+{
+}
+
void ProcessAssertion::setState(AssertionState assertionState)
{
if (m_assertionState == assertionState)
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ProcessAssertion.h (173624 => 173625)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ProcessAssertion.h 2014-09-15 18:40:21 UTC (rev 173624)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ProcessAssertion.h 2014-09-15 18:45:28 UTC (rev 173625)
@@ -42,7 +42,8 @@
class ProcessAssertion {
public:
ProcessAssertion(pid_t, AssertionState);
-
+ ~ProcessAssertion();
+
AssertionState state() const { return m_assertionState; }
void setState(AssertionState);
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (173624 => 173625)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2014-09-15 18:40:21 UTC (rev 173624)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2014-09-15 18:45:28 UTC (rev 173625)
@@ -158,6 +158,11 @@
m_assertion = adoptNS([[BKSProcessAssertion alloc] initWithPID:pid flags:flagsForState(assertionState) reason:BKSProcessAssertionReasonExtension name:@"Web content visible" withHandler:handler]);
}
+ProcessAssertion::~ProcessAssertion()
+{
+ [m_assertion invalidate];
+}
+
void ProcessAssertion::setState(AssertionState assertionState)
{
if (m_assertionState == assertionState)
@@ -201,6 +206,10 @@
{
}
+ProcessAssertion::~ProcessAssertion()
+{
+}
+
void ProcessAssertion::setState(AssertionState assertionState)
{
m_assertionState = assertionState;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
