Attachment 355714 Details for Bug 191995 – Patch

[patch] Patch

bug-191995-20181127150012.patch (text/plain), 9.08 KB, created by Fujii Hironori on 2018-11-26 22:00:13 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-11-26 22:00:13 PST

Size: 9.08 KB

patch

obsolete

>Subversion Revision: 238541
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 77bcad82989d4fd9c956609f595edb2a0661c1c5..a62ba9a1435e5febaff9753961c61ce85426a387 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,35 @@
>+2018-11-26  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        Remove "using namespace WebCore" under Source/WebKit/WebProcess/InjectedBundle/API
>+        https://bugs.webkit.org/show_bug.cgi?id=191995
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The statement "using namespace WebCore" should be placed inside
>+        namespace WebKit for unified source builds. But, source files
>+        defining WebKit API can't be enclosed by namespace WebKit { }
>+        becuase they are defined in the global scope.
>+
>+        "using namespace WebCore" in global scope and unified source
>+        builds may cause build breaks (Bug 191853).
>+
>+        Remove "using namespace WebCore" in the global scope. Use
>+        "WebCore::" prefix instead.
>+
>+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
>+        (WKBundleClearAllDatabases):
>+        (WKBundleSetDatabaseQuota):
>+        (WKBundleClearResourceLoadStatistics):
>+        (WKBundleResourceLoadStatisticsNotifyObserver):
>+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
>+        (WKBundleFrameGetFrameLoadState):
>+        (WKBundleFrameClearOpener):
>+        (WKBundleFrameCallShouldCloseOnWebView):
>+        (WKBundleFrameCopySecurityOrigin):
>+        (WKBundleFrameFocus):
>+        * WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
>+
> 2018-11-26  Tim Horton  <timothy_horton@apple.com>
> 
>         Insert <attachment> elements under editable images to make their backing data accessible
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>index 7f74f7e076ad293deeb23d305f31fa9824789f2a..1ce2524edbaf2fbf1aa5b8d97ec8a5e30b875756 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>@@ -48,7 +48,6 @@
> #include <WebCore/ResourceLoadObserver.h>
> #include <WebCore/ServiceWorkerThreadProxy.h>
> 
>-using namespace WebCore;
> using namespace WebKit;
> 
> WKTypeID WKBundleGetTypeID()
>@@ -250,13 +249,13 @@ void WKBundleReportException(JSContextRef context, JSValueRef exception)
> 
> void WKBundleClearAllDatabases(WKBundleRef)
> {
>-    DatabaseTracker::singleton().deleteAllDatabasesImmediately();
>+    WebCore::DatabaseTracker::singleton().deleteAllDatabasesImmediately();
> }
> 
> void WKBundleSetDatabaseQuota(WKBundleRef bundleRef, uint64_t quota)
> {
>     // Historically, we've used the following (somewhat nonsensical) string for the databaseIdentifier of local files.
>-    DatabaseTracker::singleton().setQuota(*SecurityOriginData::fromDatabaseIdentifier("file__0"), quota);
>+    WebCore::DatabaseTracker::singleton().setQuota(*SecurityOriginData::fromDatabaseIdentifier("file__0"), quota);
> }
> 
> void WKBundleReleaseMemory(WKBundleRef)
>@@ -321,12 +320,12 @@ void WKBundleSetTabKeyCyclesThroughElements(WKBundleRef bundleRef, WKBundlePageR
> 
> void WKBundleClearResourceLoadStatistics(WKBundleRef)
> {
>-    ResourceLoadObserver::shared().clearState();
>+    WebCore::ResourceLoadObserver::shared().clearState();
> }
> 
> void WKBundleResourceLoadStatisticsNotifyObserver(WKBundleRef)
> {
>-    ResourceLoadObserver::shared().notifyObserver();
>+    WebCore::ResourceLoadObserver::shared().notifyObserver();
> }
> 
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
>index 2658fe03324da985f2425bc15d4fdcc5eee41d02..bef52fa954864ba4962901a4b1484fb08093f7ab 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
>@@ -45,7 +45,6 @@
> #include <WebCore/FrameView.h>
> #include <WebCore/Page.h>
> 
>-using namespace WebCore;
> using namespace WebKit;
> 
> WKTypeID WKBundleFrameGetTypeID()
>@@ -75,16 +74,16 @@ WKURLRef WKBundleFrameCopyProvisionalURL(WKBundleFrameRef frameRef)
> 
> WKFrameLoadState WKBundleFrameGetFrameLoadState(WKBundleFrameRef frameRef)
> {
>-    Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>     if (!coreFrame)
>         return kWKFrameLoadStateFinished;
> 
>     switch (coreFrame->loader().state()) {
>-    case FrameStateProvisional:
>+    case WebCore::FrameStateProvisional:
>         return kWKFrameLoadStateProvisional;
>-    case FrameStateCommittedPage:
>+    case WebCore::FrameStateCommittedPage:
>         return kWKFrameLoadStateCommitted;
>-    case FrameStateComplete:
>+    case WebCore::FrameStateComplete:
>         return kWKFrameLoadStateFinished;
>     }
> 
>@@ -149,7 +148,7 @@ WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frameRef)
> 
> void WKBundleFrameClearOpener(WKBundleFrameRef frameRef)
> {
>-    Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>     if (coreFrame)
>         coreFrame->loader().setOpener(0);
> }
>@@ -261,7 +260,7 @@ WKDataRef WKBundleFrameCopyWebArchiveFilteringSubframes(WKBundleFrameRef frameRe
> 
> bool WKBundleFrameCallShouldCloseOnWebView(WKBundleFrameRef frameRef)
> {
>-    Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>     if (!coreFrame)
>         return true;
> 
>@@ -275,7 +274,7 @@ WKBundleHitTestResultRef WKBundleFrameCreateHitTestResult(WKBundleFrameRef frame
> 
> WKSecurityOriginRef WKBundleFrameCopySecurityOrigin(WKBundleFrameRef frameRef)
> {
>-    Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>     if (!coreFrame)
>         return 0;
> 
>@@ -284,7 +283,7 @@ WKSecurityOriginRef WKBundleFrameCopySecurityOrigin(WKBundleFrameRef frameRef)
> 
> void WKBundleFrameFocus(WKBundleFrameRef frameRef)
> {
>-    Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>     if (!coreFrame)
>         return;
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
>index 7c9324fd754c76fe4f43dff2e0d25b5f19970e3f..55eb3dbc087771dbcad8b42f22ae9361fa826806 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
>@@ -30,7 +30,6 @@
> #include "WKBundleAPICast.h"
> #include "WebInspector.h"
> 
>-using namespace WebCore;
> using namespace WebKit;
> 
> WKTypeID WKBundleInspectorGetTypeID()
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>index df9286f41c8bd83702ae3eb1847b78f1fe230612..b7081d4244b87d87f78855fdab469bd3629d0202 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>@@ -53,7 +53,6 @@ template<> struct ClientTraits<WKBundlePageOverlayAccessibilityClientBase> {
> 
> }
> 
>-using namespace WebCore;
> using namespace WebKit;
> 
> class PageOverlayClientImpl : API::Client<WKBundlePageOverlayClientBase>, public WebPageOverlay::Client {
>@@ -86,7 +85,7 @@ private:
>         m_client.didMoveToPage(toAPI(&pageOverlay), toAPI(page), m_client.base.clientInfo);
>     }
> 
>-    void drawRect(WebPageOverlay& pageOverlay, GraphicsContext& graphicsContext, const IntRect& dirtyRect) override
>+    void drawRect(WebPageOverlay& pageOverlay, WebCore::GraphicsContext& graphicsContext, const WebCore::IntRect& dirtyRect) override
>     {
>         if (!m_client.drawRect)
>             return;
>@@ -94,23 +93,23 @@ private:
>         m_client.drawRect(toAPI(&pageOverlay), graphicsContext.platformContext(), toAPI(dirtyRect), m_client.base.clientInfo);
>     }
>     
>-    bool mouseEvent(WebPageOverlay& pageOverlay, const PlatformMouseEvent& event) override
>+    bool mouseEvent(WebPageOverlay& pageOverlay, const WebCore::PlatformMouseEvent& event) override
>     {
>         switch (event.type()) {
>-        case PlatformMouseEvent::Type::MousePressed: {
>+        case WebCore::PlatformMouseEvent::Type::MousePressed: {
>             if (!m_client.mouseDown)
>                 return false;
> 
>             return m_client.mouseDown(toAPI(&pageOverlay), toAPI(event.position()), toAPI(event.button()), m_client.base.clientInfo);
>         }
>-        case PlatformMouseEvent::Type::MouseReleased: {
>+        case WebCore::PlatformMouseEvent::Type::MouseReleased: {
>             if (!m_client.mouseUp)
>                 return false;
> 
>             return m_client.mouseUp(toAPI(&pageOverlay), toAPI(event.position()), toAPI(event.button()), m_client.base.clientInfo);
>         }
>-        case PlatformMouseEvent::Type::MouseMoved: {
>-            if (event.button() == MouseButton::NoButton) {
>+        case WebCore::PlatformMouseEvent::Type::MouseMoved: {
>+            if (event.button() == WebCore::MouseButton::NoButton) {
>                 if (!m_client.mouseMoved)
>                     return false;
>

Flags:

achristensen: review+
commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 191995: 355707 | 355708 | 355709 | 355714