Attachment 357195 Details for Bug 192449 – patch, part 5

[patch] patch, part 5

patch (text/plain), 3.98 KB, created by chris fleizach on 2018-12-12 16:41:43 PST

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2018-12-12 16:41:43 PST

Size: 3.98 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 239133)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-12-12  Chris Fleizach  <cfleizach@apple.com>
>+
>+        [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  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r239129 and r239131.
>Index: Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>===================================================================
>--- Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp	(revision 239132)
>+++ Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp	(working copy)
>@@ -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)
>Index: Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm	(revision 239132)
>+++ Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm	(working copy)
>@@ -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
> {
>Index: Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm	(revision 239132)
>+++ Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm	(working copy)
>@@ -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) {

Actions: View | Formatted Diff | Diff

Attachments on bug 192449: 356865 | 356866 | 356867 | 356868 | 356869 | 356870 | 356871 | 356872 | 356908 | 356926 | 356929 | 356950 | 356951 | 356989 | 356993 | 356995 | 357000 | 357014 | 357021 | 357109 | 357112 | 357115 | 357136 | 357139 | 357145 | 357152 | 357189 | 357191 | 357195 | 357211 | 357214 | 357218 | 357232 | 357237 | 357278 | 357318 | 357329