Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-08-24 08:08:35 UTC (rev 235296)
@@ -1,3 +1,26 @@
+2018-08-21 Fujii Hironori <[email protected]>
+
+ Don't place "using namespace XXX;" in global space for unified source builds
+ https://bugs.webkit.org/show_bug.cgi?id=188739
+
+ Reviewed by Yusuke Suzuki.
+
+ 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/win/FullScreenController.cpp:
+ * platform/mediastream/CaptureDeviceManager.cpp:
+ * platform/mock/MediaPlaybackTargetPickerMock.cpp:
+ * svg/animation/SMILTime.cpp:
+ * testing/js/WebCoreTestSupport.cpp:
+ * xml/XPathParser.cpp:
+
2018-08-21 Philippe Normand <[email protected]>
[GStreamer] Warn early about incomplete MSE track switching support
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/AudioTrackList.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/AudioTrackList.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/AudioTrackList.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -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 @@
return "AudioTrackList";
}
+} // namespace WebCore
#endif
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/TextTrackList.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/TextTrackList.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/TextTrackList.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -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 @@
return "TextTrackList";
}
+} // namespace WebCore
#endif
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/VideoTrackList.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/VideoTrackList.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/html/track/VideoTrackList.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -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 @@
return "VideoTrackList";
}
+} // namespace WebCore
#endif
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/page/SecurityOriginData.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/page/SecurityOriginData.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/page/SecurityOriginData.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -34,8 +34,6 @@
#include <wtf/text/StringBuilder.h>
#include <wtf/text/StringConcatenateNumbers.h>
-using namespace WebCore;
-
namespace WebCore {
String SecurityOriginData::toString() const
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/page/TextIndicator.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/page/TextIndicator.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/page/TextIndicator.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -50,8 +50,6 @@
#include "SelectionRect.h"
#endif
-using namespace WebCore;
-
namespace WebCore {
static bool initializeIndicator(TextIndicatorData&, Frame&, const Range&, FloatSize margin, bool indicatesCurrentSelection);
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -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 @@
geoclue_client_set_requested_accuracy_level(m_clientProxy.get(), accuracyLevel);
}
+} // namespace WebCore
+
#endif // ENABLE(GEOLOCATION)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -29,7 +29,7 @@
#include <gst/video/gstvideometa.h>
-using namespace WebCore;
+namespace WebCore {
ImageGStreamer::ImageGStreamer(GstSample* sample)
{
@@ -117,4 +117,7 @@
if (m_frameMapped)
gst_video_frame_unmap(&m_videoFrame);
}
+
+} // namespace WebCore
+
#endif // USE(GSTREAMER)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/win/FullScreenController.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/win/FullScreenController.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/win/FullScreenController.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -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 @@
::RedrawWindow(m_private->m_client->fullScreenClientWindow(), 0, 0, RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE | RDW_ALLCHILDREN);
m_private->m_backgroundWindow = nullptr;
}
+
+} // namespace WebCore
+
#endif
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -36,7 +36,7 @@
#include <wtf/MainThread.h>
#include <wtf/text/StringHash.h>
-using namespace WebCore;
+namespace WebCore {
CaptureDeviceManager::~CaptureDeviceManager() = default;
@@ -69,5 +69,6 @@
m_observers.remove(token);
}
+} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -33,8 +33,6 @@
#include "MediaPlaybackTargetMock.h"
#include "WebMediaSessionManager.h"
-using namespace WebCore;
-
namespace WebCore {
static const Seconds timerInterval { 100_ms };
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/svg/animation/SMILTime.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/svg/animation/SMILTime.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/svg/animation/SMILTime.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -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 @@
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 @@
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 @@
return SMILTime::indefinite();
return a.value() * b.value();
}
+
+} // namespace WebCore
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/testing/js/WebCoreTestSupport.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -46,10 +46,9 @@
#include <_javascript_Core/IdentifierInlines.h>
#include <_javascript_Core/JSValueRef.h>
-using namespace WebCore;
-
namespace WebCoreTestSupport {
using namespace JSC;
+using namespace WebCore;
void injectInternalsObject(JSContextRef context)
{
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/xml/XPathParser.cpp (235295 => 235296)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/xml/XPathParser.cpp 2018-08-24 08:08:22 UTC (rev 235295)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/xml/XPathParser.cpp 2018-08-24 08:08:35 UTC (rev 235296)
@@ -38,9 +38,6 @@
extern int xpathyyparse(WebCore::XPath::Parser&);
-using namespace WebCore;
-using namespace XPath;
-
#include "XPathGrammar.h"
namespace WebCore {
