Title: [239148] trunk/Source/WebKit
- Revision
- 239148
- Author
- [email protected]
- Date
- 2018-12-12 19:21:51 -0800 (Wed, 12 Dec 2018)
Log Message
[meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
https://bugs.webkit.org/show_bug.cgi?id=192449
<rdar://problem/46595508>
Reviewed by Darin Adler.
Part 5: Files in WebProcess folder.
* WebProcess/Cache/WebCacheStorageConnection.cpp:
* WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
(mediaTimeToCurrentTime):
(-[WKAnimationDelegate initWithLayerID:layerTreeHost:]):
* WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
(-[WKAccessibilityWebPageObject accessibilityHitTest:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (239147 => 239148)
--- trunk/Source/WebKit/ChangeLog 2018-12-13 03:15:13 UTC (rev 239147)
+++ trunk/Source/WebKit/ChangeLog 2018-12-13 03:21:51 UTC (rev 239148)
@@ -1,3 +1,20 @@
+2018-12-12 Chris Fleizach <[email protected]>
+
+ [meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
+ https://bugs.webkit.org/show_bug.cgi?id=192449
+ <rdar://problem/46595508>
+
+ Reviewed by Darin Adler.
+
+ Part 5: Files in WebProcess folder.
+
+ * WebProcess/Cache/WebCacheStorageConnection.cpp:
+ * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
+ (mediaTimeToCurrentTime):
+ (-[WKAnimationDelegate initWithLayerID:layerTreeHost:]):
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
+ (-[WKAccessibilityWebPageObject accessibilityHitTest:]):
+
2018-12-12 Ross Kirsling <[email protected]>
[MSVC] Unreviewed build fix for r239080.
Modified: trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp (239147 => 239148)
--- trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp 2018-12-13 03:15:13 UTC (rev 239147)
+++ trunk/Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp 2018-12-13 03:21:51 UTC (rev 239148)
@@ -35,11 +35,10 @@
#include "WebProcess.h"
#include <wtf/MainThread.h>
+namespace WebKit {
using namespace WebCore::DOMCacheEngine;
-using namespace WebKit::CacheStorage;
+using namespace CacheStorage;
-namespace WebKit {
-
WebCacheStorageConnection::WebCacheStorageConnection(WebCacheStorageProvider& provider, PAL::SessionID sessionID)
: m_provider(provider)
, m_sessionID(sessionID)
Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm (239147 => 239148)
--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm 2018-12-13 03:15:13 UTC (rev 239147)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm 2018-12-13 03:21:51 UTC (rev 239148)
@@ -40,12 +40,9 @@
#import <wtf/RetainPtr.h>
#import <wtf/text/TextStream.h>
-using namespace WTF;
-using namespace WebCore;
-
static MonotonicTime mediaTimeToCurrentTime(CFTimeInterval t)
{
- return MonotonicTime::now() + Seconds(t - CACurrentMediaTime());
+ return WTF::MonotonicTime::now() + Seconds(t - CACurrentMediaTime());
}
static NSString * const WKExplicitBeginTimeFlag = @"WKPlatformCAAnimationExplicitBeginTimeFlag";
@@ -55,7 +52,7 @@
@implementation WKAnimationDelegate
-- (instancetype)initWithLayerID:(GraphicsLayer::PlatformLayerID)layerID layerTreeHost:(WebKit::RemoteLayerTreeHost*)layerTreeHost
+- (instancetype)initWithLayerID:(WebCore::GraphicsLayer::PlatformLayerID)layerID layerTreeHost:(WebKit::RemoteLayerTreeHost*)layerTreeHost
{
if ((self = [super init])) {
_layerID = layerID;
@@ -98,6 +95,7 @@
@end
namespace WebKit {
+using namespace WebCore;
void PlatformCAAnimationRemote::KeyframeValue::encode(IPC::Encoder& encoder) const
{
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (239147 => 239148)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2018-12-13 03:15:13 UTC (rev 239147)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2018-12-13 03:21:51 UTC (rev 239148)
@@ -48,8 +48,6 @@
#import <pal/spi/mac/NSAccessibilitySPI.h>
#import <wtf/ObjCRuntimeExtras.h>
-using namespace WebCore;
-using namespace WebKit;
@implementation WKAccessibilityWebPageObject
@@ -218,7 +216,7 @@
// Some plugins may be able to figure out the scroll position and inset on their own.
bool applyContentOffset = true;
- if (auto pluginView = WebPage::pluginViewForFrame(m_page->mainFrame()))
+ if (auto pluginView = WebKit::WebPage::pluginViewForFrame(m_page->mainFrame()))
applyContentOffset = !pluginView->plugin()->pluginHandlesContentOffsetForAccessibilityHitTest();
if (applyContentOffset) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
