Title: [235088] trunk/Source/WebKit
- Revision
- 235088
- Author
- [email protected]
- Date
- 2018-08-20 12:15:11 -0700 (Mon, 20 Aug 2018)
Log Message
Fix the iOSMac build with unified sources
* Shared/mac/ArgumentCodersMac.mm:
* Shared/mac/ChildProcessMac.mm:
* Shared/mac/NativeWebKeyboardEventMac.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (235087 => 235088)
--- trunk/Source/WebKit/ChangeLog 2018-08-20 18:38:05 UTC (rev 235087)
+++ trunk/Source/WebKit/ChangeLog 2018-08-20 19:15:11 UTC (rev 235088)
@@ -1,3 +1,11 @@
+2018-08-20 Tim Horton <[email protected]>
+
+ Fix the iOSMac build with unified sources
+
+ * Shared/mac/ArgumentCodersMac.mm:
+ * Shared/mac/ChildProcessMac.mm:
+ * Shared/mac/NativeWebKeyboardEventMac.mm:
+
2018-08-20 Eric Carlson <[email protected]>
[MediaStream] Move capture device monitoring to WebKit
Modified: trunk/Source/WebKit/Shared/mac/ArgumentCodersMac.mm (235087 => 235088)
--- trunk/Source/WebKit/Shared/mac/ArgumentCodersMac.mm 2018-08-20 18:38:05 UTC (rev 235087)
+++ trunk/Source/WebKit/Shared/mac/ArgumentCodersMac.mm 2018-08-20 19:15:11 UTC (rev 235088)
@@ -37,8 +37,6 @@
#import "WebCoreArgumentCoders.h"
#import <WebCore/ColorMac.h>
-using namespace WebCore;
-
namespace IPC {
enum class NSType {
@@ -62,6 +60,8 @@
}
namespace IPC {
+using namespace WebCore;
+
static NSType typeFromObject(id object)
{
ASSERT(object);
Modified: trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm (235087 => 235088)
--- trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2018-08-20 18:38:05 UTC (rev 235087)
+++ trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2018-08-20 19:15:11 UTC (rev 235088)
@@ -71,9 +71,9 @@
extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
-using namespace WebCore;
namespace WebKit {
+using namespace WebCore;
#if USE(CACHE_COMPILED_SANDBOX)
using SandboxProfile = typename std::remove_pointer<sandbox_profile_t>::type;
Modified: trunk/Source/WebKit/Shared/mac/NativeWebKeyboardEventMac.mm (235087 => 235088)
--- trunk/Source/WebKit/Shared/mac/NativeWebKeyboardEventMac.mm 2018-08-20 18:38:05 UTC (rev 235087)
+++ trunk/Source/WebKit/Shared/mac/NativeWebKeyboardEventMac.mm 2018-08-20 19:15:11 UTC (rev 235088)
@@ -31,9 +31,9 @@
#import "WebEventFactory.h"
#import <WebCore/KeyboardEvent.h>
-using namespace WebCore;
namespace WebKit {
+using namespace WebCore;
NativeWebKeyboardEvent::NativeWebKeyboardEvent(NSEvent *event, bool handledByInputMethod, bool replacesSoftSpace, const Vector<KeypressCommand>& commands)
: WebKeyboardEvent(WebEventFactory::createWebKeyboardEvent(event, handledByInputMethod, replacesSoftSpace, commands))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
