[webkit-changes] [240260] branches/safari-607-branch/Source

Tue, 22 Jan 2019 10:35:49 -0800

Title: [240260] branches/safari-607-branch/Source
Revision
240260
Author
[email protected]
Date
2019-01-22 10:34:24 -0800 (Tue, 22 Jan 2019)

Log Message

Cherry-pick r239997. rdar://problem/47099573

    Fix iOS build after r239993
    https://bugs.webkit.org/show_bug.cgi?id=193361

    Source/WebKit:

    * UIProcess/ProvisionalPageProxy.h:
    * UIProcess/SuspendedPageProxy.h:

    Source/WTF:

    * wtf/RefCounter.h:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-607-branch/Source/WTF/ChangeLog (240259 => 240260)


--- branches/safari-607-branch/Source/WTF/ChangeLog	2019-01-22 18:34:21 UTC (rev 240259)
+++ branches/safari-607-branch/Source/WTF/ChangeLog	2019-01-22 18:34:24 UTC (rev 240260)
@@ -1,3 +1,30 @@
+2019-01-22  Alan Coon  <[email protected]>
+
+        Cherry-pick r239997. rdar://problem/47099573
+
+    Fix iOS build after r239993
+    https://bugs.webkit.org/show_bug.cgi?id=193361
+    
+    Source/WebKit:
+    
+    * UIProcess/ProvisionalPageProxy.h:
+    * UIProcess/SuspendedPageProxy.h:
+    
+    Source/WTF:
+    
+    * wtf/RefCounter.h:
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239997 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-15  Alex Christensen  <[email protected]>
+
+            Fix iOS build after r239993
+            https://bugs.webkit.org/show_bug.cgi?id=193361
+
+            * wtf/RefCounter.h:
+
 2019-01-15  Alan Coon  <[email protected]>
 
         Cherry-pick r239904. rdar://problem/4726030

Modified: branches/safari-607-branch/Source/WTF/wtf/RefCounter.h (240259 => 240260)


--- branches/safari-607-branch/Source/WTF/wtf/RefCounter.h	2019-01-22 18:34:21 UTC (rev 240259)
+++ branches/safari-607-branch/Source/WTF/wtf/RefCounter.h	2019-01-22 18:34:24 UTC (rev 240260)
@@ -65,6 +65,7 @@
     using ValueChangeFunction = WTF::Function<void (RefCounterEvent)>;
 
     RefCounter(ValueChangeFunction&& = nullptr);
+    RefCounter(RefCounter&&) = default;
     ~RefCounter();
 
     Token count() const

Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (240259 => 240260)


--- branches/safari-607-branch/Source/WebKit/ChangeLog	2019-01-22 18:34:21 UTC (rev 240259)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog	2019-01-22 18:34:24 UTC (rev 240260)
@@ -1,5 +1,33 @@
 2019-01-22  Alan Coon  <[email protected]>
 
+        Cherry-pick r239997. rdar://problem/47099573
+
+    Fix iOS build after r239993
+    https://bugs.webkit.org/show_bug.cgi?id=193361
+    
+    Source/WebKit:
+    
+    * UIProcess/ProvisionalPageProxy.h:
+    * UIProcess/SuspendedPageProxy.h:
+    
+    Source/WTF:
+    
+    * wtf/RefCounter.h:
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239997 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-01-15  Alex Christensen  <[email protected]>
+
+            Fix iOS build after r239993
+            https://bugs.webkit.org/show_bug.cgi?id=193361
+
+            * UIProcess/ProvisionalPageProxy.h:
+            * UIProcess/SuspendedPageProxy.h:
+
+2019-01-22  Alan Coon  <[email protected]>
+
         Cherry-pick r239995. rdar://problem/47099573
 
     Unreviewed iOS build fix after r239993.

Modified: branches/safari-607-branch/Source/WebKit/UIProcess/ProvisionalPageProxy.h (240259 => 240260)


--- branches/safari-607-branch/Source/WebKit/UIProcess/ProvisionalPageProxy.h	2019-01-22 18:34:21 UTC (rev 240259)
+++ branches/safari-607-branch/Source/WebKit/UIProcess/ProvisionalPageProxy.h	2019-01-22 18:34:24 UTC (rev 240260)
@@ -88,7 +88,7 @@
     URL m_provisionalLoadURL;
 
 #if PLATFORM(IOS_FAMILY)
-    ProcessThrottler::BackgroundActivityToken m_suspensionToken;
+    ProcessThrottler::ForegroundActivityToken m_suspensionToken;
 #endif
 };

Modified: branches/safari-607-branch/Source/WebKit/UIProcess/SuspendedPageProxy.h (240259 => 240260)


--- branches/safari-607-branch/Source/WebKit/UIProcess/SuspendedPageProxy.h	2019-01-22 18:34:21 UTC (rev 240259)
+++ branches/safari-607-branch/Source/WebKit/UIProcess/SuspendedPageProxy.h	2019-01-22 18:34:24 UTC (rev 240260)
@@ -72,7 +72,7 @@
     SuspensionState m_suspensionState { SuspensionState::Suspending };
     CompletionHandler<void(SuspendedPageProxy*)> m_readyToUnsuspendHandler;
 #if PLATFORM(IOS_FAMILY)
-    ProcessThrottler::ForegroundActivityToken m_suspensionToken;
+    ProcessThrottler::BackgroundActivityToken m_suspensionToken;
 #endif
 };
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to