Title: [167201] trunk/Source/WebKit2
- Revision
- 167201
- Author
- psola...@apple.com
- Date
- 2014-04-13 12:23:43 -0700 (Sun, 13 Apr 2014)
Log Message
Don't use ImportanceAssertion on iOS
https://bugs.webkit.org/show_bug.cgi?id=131481
<rdar://problem/16575830>
Reviewed by Darin Adler.
We have other API to mark processes as being in use on iOS. No need to use ImportanceAssertion.
* Platform/IPC/MessageDecoder.cpp:
* Platform/IPC/MessageDecoder.h:
* Platform/IPC/mac/ConnectionMac.cpp:
(IPC::Connection::receiveSourceEventHandler):
* Platform/IPC/mac/ImportanceAssertion.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167200 => 167201)
--- trunk/Source/WebKit2/ChangeLog 2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-13 19:23:43 UTC (rev 167201)
@@ -1,3 +1,19 @@
+2014-04-13 Pratik Solanki <psola...@apple.com>
+
+ Don't use ImportanceAssertion on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=131481
+ <rdar://problem/16575830>
+
+ Reviewed by Darin Adler.
+
+ We have other API to mark processes as being in use on iOS. No need to use ImportanceAssertion.
+
+ * Platform/IPC/MessageDecoder.cpp:
+ * Platform/IPC/MessageDecoder.h:
+ * Platform/IPC/mac/ConnectionMac.cpp:
+ (IPC::Connection::receiveSourceEventHandler):
+ * Platform/IPC/mac/ImportanceAssertion.h:
+
2014-04-13 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r167168 and r167194.
Modified: trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp (167200 => 167201)
--- trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp 2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp 2014-04-13 19:23:43 UTC (rev 167201)
@@ -31,7 +31,7 @@
#include "MessageFlags.h"
#include "StringReference.h"
-#if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
#include "ImportanceAssertion.h"
#endif
@@ -66,7 +66,7 @@
return m_messageFlags & DispatchMessageWhenWaitingForSyncReply;
}
-#if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
void MessageDecoder::setImportanceAssertion(std::unique_ptr<ImportanceAssertion> assertion)
{
m_importanceAssertion = std::move(assertion);
Modified: trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h (167200 => 167201)
--- trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h 2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h 2014-04-13 19:23:43 UTC (rev 167201)
@@ -46,7 +46,7 @@
bool isSyncMessage() const;
bool shouldDispatchMessageWhenWaitingForSyncReply() const;
-#if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
void setImportanceAssertion(std::unique_ptr<ImportanceAssertion>);
#endif
@@ -57,7 +57,7 @@
uint64_t m_destinationID;
-#if PLATFORM(IOS) || PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
std::unique_ptr<ImportanceAssertion> m_importanceAssertion;
#endif
};
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp (167200 => 167201)
--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp 2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp 2014-04-13 19:23:43 UTC (rev 167201)
@@ -416,7 +416,7 @@
std::unique_ptr<MessageDecoder> decoder = createMessageDecoder(header);
ASSERT(decoder);
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
decoder->setImportanceAssertion(std::make_unique<ImportanceAssertion>(header));
#endif
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (167200 => 167201)
--- trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2014-04-13 19:20:11 UTC (rev 167200)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2014-04-13 19:23:43 UTC (rev 167201)
@@ -26,7 +26,7 @@
#ifndef ImportanceAssertion_h
#define ImportanceAssertion_h
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
#if __has_include(<libproc_internal.h>)
#include <libproc_internal.h>
@@ -58,6 +58,6 @@
}
-#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
#endif // ImportanceAssertion_h
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
