Attachment 347625 Details for Bug 188739 – Patch

[patch] Patch

bug-188739-20180821191031.patch (text/plain), 11.40 KB, created by Fujii Hironori on 2018-08-21 03:10:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-08-21 03:10:33 PDT

Size: 11.40 KB

patch

obsolete

>Subversion Revision: 235106
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d33ed0a0891aec5fc92a63f8853ad821e4b28b42..4d52c71706481f7207e18068a98166b21d361f17 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,27 @@
>+2018-08-21  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        Don't place "using namespace XXX;" in global space for unified source builds
>+        https://bugs.webkit.org/show_bug.cgi?id=188739
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests (No behavior change).
>+
>+        * html/track/AudioTrackList.cpp:
>+        * html/track/TextTrackList.cpp:
>+        * html/track/VideoTrackList.cpp:
>+        * page/SecurityOriginData.cpp:
>+        * page/TextIndicator.cpp:
>+        * platform/geoclue/GeolocationProviderGeoclue.cpp:
>+        * platform/graphics/gstreamer/ImageGStreamerCairo.cpp:
>+        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
>+        * platform/graphics/win/FullScreenController.cpp:
>+        * platform/mediastream/CaptureDeviceManager.cpp:
>+        * platform/mock/MediaPlaybackTargetPickerMock.cpp:
>+        * svg/animation/SMILTime.cpp:
>+        * testing/js/WebCoreTestSupport.cpp:
>+        * xml/XPathParser.cpp:
>+
> 2018-08-20  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: allow breakpoints to be set for specific event listeners
>diff --git a/Source/WebCore/html/track/AudioTrackList.cpp b/Source/WebCore/html/track/AudioTrackList.cpp
>index f8b5d0accf0182f523223216292ed5454ec46b4d..aaddcde357567622a4d78b5c1f288f75f415d6dc 100644
>--- a/Source/WebCore/html/track/AudioTrackList.cpp
>+++ b/Source/WebCore/html/track/AudioTrackList.cpp
>@@ -31,7 +31,7 @@
> 
> #include "AudioTrack.h"
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> AudioTrackList::AudioTrackList(HTMLMediaElement* element, ScriptExecutionContext* context)
>     : TrackListBase(element, context)
>@@ -86,4 +86,5 @@ const char* AudioTrackList::activeDOMObjectName() const
>     return "AudioTrackList";
> }
> 
>+} // namespace WebCore
> #endif
>diff --git a/Source/WebCore/html/track/TextTrackList.cpp b/Source/WebCore/html/track/TextTrackList.cpp
>index 9b691f5b10550a280f1803003c7cf5c7cd621839..ea5930fdd1e3fc8bea2b21085617ae05a27a4788 100644
>--- a/Source/WebCore/html/track/TextTrackList.cpp
>+++ b/Source/WebCore/html/track/TextTrackList.cpp
>@@ -34,7 +34,7 @@
> #include "InbandTextTrackPrivate.h"
> #include "LoadableTextTrack.h"
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> TextTrackList::TextTrackList(HTMLMediaElement* element, ScriptExecutionContext* context)
>     : TrackListBase(element, context)
>@@ -270,4 +270,5 @@ const char* TextTrackList::activeDOMObjectName() const
>     return "TextTrackList";
> }
> 
>+} // namespace WebCore
> #endif
>diff --git a/Source/WebCore/html/track/VideoTrackList.cpp b/Source/WebCore/html/track/VideoTrackList.cpp
>index a1549abcc85f617416633537de5c955036594710..4d8b32553f7ae66b7bcf3d72c4e1bed79236125c 100644
>--- a/Source/WebCore/html/track/VideoTrackList.cpp
>+++ b/Source/WebCore/html/track/VideoTrackList.cpp
>@@ -31,7 +31,7 @@
> 
> #include "VideoTrack.h"
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> VideoTrackList::VideoTrackList(HTMLMediaElement* element, ScriptExecutionContext* context)
>     : TrackListBase(element, context)
>@@ -99,4 +99,5 @@ const char* VideoTrackList::activeDOMObjectName() const
>     return "VideoTrackList";
> }
> 
>+} // namespace WebCore
> #endif
>diff --git a/Source/WebCore/page/SecurityOriginData.cpp b/Source/WebCore/page/SecurityOriginData.cpp
>index 1a5790e28f7138c362c2d22f926e9662799aaedf..b7f83cee2674d55acfcc98e9e1139a407151a0a6 100644
>--- a/Source/WebCore/page/SecurityOriginData.cpp
>+++ b/Source/WebCore/page/SecurityOriginData.cpp
>@@ -34,8 +34,6 @@
> #include <wtf/text/StringBuilder.h>
> #include <wtf/text/StringConcatenateNumbers.h>
> 
>-using namespace WebCore;
>-
> namespace WebCore {
> 
> String SecurityOriginData::toString() const
>diff --git a/Source/WebCore/page/TextIndicator.cpp b/Source/WebCore/page/TextIndicator.cpp
>index a3746e0f9730913778451839fbff1de84760bb95..73120c4847bf9d13ff5850c1f5265cef4d50c423 100644
>--- a/Source/WebCore/page/TextIndicator.cpp
>+++ b/Source/WebCore/page/TextIndicator.cpp
>@@ -50,8 +50,6 @@
> #include "SelectionRect.h"
> #endif
> 
>-using namespace WebCore;
>-
> namespace WebCore {
> 
> static bool initializeIndicator(TextIndicatorData&, Frame&, const Range&, FloatSize margin, bool indicatesCurrentSelection);
>diff --git a/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp b/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp
>index 4a16220240a4223f6d919ba9a72c439587527cd8..983977357e94cd77a3da9c572a34679114303489 100644
>--- a/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp
>+++ b/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp
>@@ -35,7 +35,7 @@
> const char* gGeoclueBusName = "org.freedesktop.GeoClue2";
> const char* gGeoclueManagerPath = "/org/freedesktop/GeoClue2/Manager";
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> typedef enum {
>     GeoclueAccuracyLevelCountry = 1,
>@@ -210,4 +210,6 @@ void GeolocationProviderGeoclue::updateClientRequirements()
>     geoclue_client_set_requested_accuracy_level(m_clientProxy.get(), accuracyLevel);
> }
> 
>+} // namespace WebCore
>+
> #endif // ENABLE(GEOLOCATION)
>diff --git a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
>index bed66043e69a3d0267c710ac3e2565bd696a0697..c0de8c4cbbc9821649f2685cfe078b57293377b0 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
>@@ -29,7 +29,7 @@
> #include <gst/video/gstvideometa.h>
> 
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> ImageGStreamer::ImageGStreamer(GstSample* sample)
> {
>@@ -117,4 +117,7 @@ ImageGStreamer::~ImageGStreamer()
>     if (m_frameMapped)
>         gst_video_frame_unmap(&m_videoFrame);
> }
>+
>+} // namespace WebCore
>+
> #endif // USE(GSTREAMER)
>diff --git a/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
>index c893b473b3310ee5020717b182073c5510af51dc..51d056b3ede975a4795cc45d5c3a648250cb6d23 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
>@@ -38,7 +38,7 @@
> #include <wtf/Condition.h>
> #include <wtf/RunLoop.h>
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> // CAIRO_FORMAT_RGB24 used to render the video buffers is little/big endian dependant.
> #if G_BYTE_ORDER == G_LITTLE_ENDIAN
>@@ -327,4 +327,6 @@ GstElement* webkitVideoSinkNew()
>     return GST_ELEMENT(g_object_new(WEBKIT_TYPE_VIDEO_SINK, nullptr));
> }
> 
>+} // namespace WebCore
>+
> #endif // ENABLE(VIDEO) && USE(GSTREAMER)
>diff --git a/Source/WebCore/platform/graphics/win/FullScreenController.cpp b/Source/WebCore/platform/graphics/win/FullScreenController.cpp
>index ca07a784977182049530ffdab6a473928acf76b7..b9535503c306c501aa393f31ffd92885ede9bdef 100644
>--- a/Source/WebCore/platform/graphics/win/FullScreenController.cpp
>+++ b/Source/WebCore/platform/graphics/win/FullScreenController.cpp
>@@ -38,7 +38,7 @@
> #include "WebCoreInstanceHandle.h"
> #include <wtf/RefPtr.h>
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> static const int kFullScreenAnimationDuration = 500; // milliseconds 
> 
>@@ -217,4 +217,7 @@ void FullScreenController::close()
>     ::RedrawWindow(m_private->m_client->fullScreenClientWindow(), 0, 0, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE | RDW_ALLCHILDREN);
>     m_private->m_backgroundWindow = nullptr;
> }
>+
>+} // namespace WebCore
>+
> #endif
>diff --git a/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp b/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp
>index 8a39b292f938acd4905902a45ac4af8a87550cc0..01c856f0dfe9f1e8e4822e2dfd23064bd5e92ccd 100644
>--- a/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp
>+++ b/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp
>@@ -36,7 +36,7 @@
> #include <wtf/MainThread.h>
> #include <wtf/text/StringHash.h>
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> CaptureDeviceManager::~CaptureDeviceManager() = default;
> 
>@@ -60,4 +60,6 @@ void CaptureDeviceManager::deviceChanged()
>     });
> }
> 
>+} // namespace WebCore
>+
> #endif // ENABLE(MEDIA_STREAM)
>diff --git a/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp b/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp
>index d5700d14952f2935d3eb104c02c6f80576840f0f..f080082812a85557c158edcf1691ee7f6906e5c6 100644
>--- a/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp
>+++ b/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp
>@@ -33,8 +33,6 @@
> #include "MediaPlaybackTargetMock.h"
> #include "WebMediaSessionManager.h"
> 
>-using namespace WebCore;
>-
> namespace WebCore {
> 
> static const Seconds timerInterval { 100_ms };
>diff --git a/Source/WebCore/svg/animation/SMILTime.cpp b/Source/WebCore/svg/animation/SMILTime.cpp
>index 3e3d70771b8a8a42720ad63c5c890f251a50e9d8..3d5c9c9d6fe08ec0a2b066a88700e09e691170ae 100644
>--- a/Source/WebCore/svg/animation/SMILTime.cpp
>+++ b/Source/WebCore/svg/animation/SMILTime.cpp
>@@ -28,13 +28,13 @@
> 
> #include <float.h>
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> const double SMILTime::unresolvedValue = DBL_MAX;
> // Just a big value smaller than DBL_MAX. Our times are relative to 0, we don't really need the full range.
> const double SMILTime::indefiniteValue = FLT_MAX;    
> 
>-SMILTime WebCore::operator+(const SMILTime& a, const SMILTime& b)
>+SMILTime operator+(const SMILTime& a, const SMILTime& b)
> {
>     if (a.isUnresolved() || b.isUnresolved())
>         return SMILTime::unresolved();
>@@ -43,7 +43,7 @@ SMILTime WebCore::operator+(const SMILTime& a, const SMILTime& b)
>     return a.value() + b.value();
> }
> 
>-SMILTime WebCore::operator-(const SMILTime& a, const SMILTime& b)
>+SMILTime operator-(const SMILTime& a, const SMILTime& b)
> {
>     if (a.isUnresolved() || b.isUnresolved())
>         return SMILTime::unresolved();
>@@ -52,7 +52,7 @@ SMILTime WebCore::operator-(const SMILTime& a, const SMILTime& b)
>     return a.value() - b.value();
> }
> 
>-SMILTime WebCore::operator*(const SMILTime& a,  const SMILTime& b)
>+SMILTime operator*(const SMILTime& a,  const SMILTime& b)
> {
>     if (a.isUnresolved() || b.isUnresolved())
>         return SMILTime::unresolved();
>@@ -62,3 +62,5 @@ SMILTime WebCore::operator*(const SMILTime& a,  const SMILTime& b)
>         return SMILTime::indefinite();
>     return a.value() * b.value();
> }
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/testing/js/WebCoreTestSupport.cpp b/Source/WebCore/testing/js/WebCoreTestSupport.cpp
>index 07ded44d8953efb0bf88d362e2d2da1d48f71d8c..d241206a28dd5f6470da9fb84e9ed4fc74c287b0 100644
>--- a/Source/WebCore/testing/js/WebCoreTestSupport.cpp
>+++ b/Source/WebCore/testing/js/WebCoreTestSupport.cpp
>@@ -46,10 +46,9 @@
> #include <JavaScriptCore/IdentifierInlines.h>
> #include <JavaScriptCore/JSValueRef.h>
> 
>-using namespace WebCore;
>-
> namespace WebCoreTestSupport {
> using namespace JSC;
>+using namespace WebCore;
> 
> void injectInternalsObject(JSContextRef context)
> {
>diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
>index e86329ab2f327c56f30c7c91c775ee5283d49b98..2eb7e582a1c98ac762169ea6b17479df359e2f76 100644
>--- a/Source/WebCore/xml/XPathParser.cpp
>+++ b/Source/WebCore/xml/XPathParser.cpp
>@@ -38,9 +38,6 @@
> 
> extern int xpathyyparse(WebCore::XPath::Parser&);
> 
>-using namespace WebCore;
>-using namespace XPath;
>-
> #include "XPathGrammar.h"
> 
> namespace WebCore {

Actions: View | Formatted Diff | Diff

Attachments on bug 188739: 347624 | 347625 | 347626