Diff
Modified: trunk/Source/WebKit2/ChangeLog (149831 => 149832)
--- trunk/Source/WebKit2/ChangeLog 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-09 19:03:52 UTC (rev 149832)
@@ -1,3 +1,34 @@
+2013-05-09 Anders Carlsson <[email protected]>
+
+ Use explicit qualifiers for names in the std:: namespace
+ https://bugs.webkit.org/show_bug.cgi?id=115868
+
+ Reviewed by Andreas Kling.
+
+ * Shared/mac/ArgumentCodersMac.mm:
+ (CoreIPC::encode):
+ * UIProcess/API/C/WKPluginSiteDataManager.cpp:
+ (WKPluginSiteDataManagerClearAllSiteData):
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::PluginInfoStore::findPluginForExtension):
+ * UIProcess/WebFrameProxy.cpp:
+ * UIProcess/WebProcessProxy.cpp:
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::parsePostBuffer):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::loadURL):
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
+ (WebKit::NetscapePluginStream::deliverDataToPlugin):
+ * WebProcess/Plugins/PDF/SimplePDFPlugin.mm:
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::countStringMatches):
+ (WebKit::FindController::updateFindUIAfterPageScroll):
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::drawPDFPage):
+ * WebProcess/mac/WebProcessMac.mm:
+
2013-05-09 Max Feil <[email protected]>
shouldUsePluginDocument() needs to be respected when a document is created
Modified: trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm (149831 => 149832)
--- trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2013-05-09 19:03:52 UTC (rev 149832)
@@ -33,7 +33,6 @@
#import <WebCore/ColorMac.h>
using namespace WebCore;
-using namespace std;
namespace CoreIPC {
@@ -230,7 +229,7 @@
ASSERT(effectiveRange.length);
ASSERT(NSMaxRange(effectiveRange) <= length);
- ranges.append(make_pair(effectiveRange, attributesAtIndex));
+ ranges.append(std::make_pair(effectiveRange, attributesAtIndex));
position = NSMaxRange(effectiveRange);
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (149831 => 149832)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -35,7 +35,6 @@
#endif
using namespace WebKit;
-using namespace std;
WKTypeID WKPluginSiteDataManagerGetTypeID()
{
@@ -87,7 +86,7 @@
void WKPluginSiteDataManagerClearAllSiteData(WKPluginSiteDataManagerRef managerRef, void* context, WKPluginSiteDataManagerClearSiteDataFunction function)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
- toImpl(managerRef)->clearSiteData(0, NP_CLEAR_ALL, numeric_limits<uint64_t>::max(), VoidCallback::create(context, function));
+ toImpl(managerRef)->clearSiteData(0, NP_CLEAR_ALL, std::numeric_limits<uint64_t>::max(), VoidCallback::create(context, function));
#else
UNUSED_PARAM(managerRef);
UNUSED_PARAM(context);
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (149831 => 149832)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -35,7 +35,6 @@
#include <wtf/ListHashSet.h>
#include <wtf/StdLibExtras.h>
-using namespace std;
using namespace WebCore;
namespace WebKit {
@@ -151,7 +150,7 @@
const Vector<String>& extensions = mimeClassInfo.extensions;
- if (find(extensions.begin(), extensions.end(), extension) != extensions.end()) {
+ if (std::find(extensions.begin(), extensions.end(), extension) != extensions.end()) {
// We found a supported extension, set the correct MIME type.
mimeType = mimeClassInfo.type;
return plugin;
Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (149831 => 149832)
--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -39,7 +39,6 @@
#include <wtf/text/WTFString.h>
using namespace WebCore;
-using namespace std;
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (149831 => 149832)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -62,7 +62,6 @@
#endif
using namespace WebCore;
-using namespace std;
#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, connection())
#define MESSAGE_CHECK_URL(url) MESSAGE_CHECK_BASE(checkURLReceivedFromWebProcess(url), connection())
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -40,7 +40,6 @@
#include <wtf/text/StringBuilder.h>
using namespace WebCore;
-using namespace std;
namespace WebKit {
@@ -248,7 +247,7 @@
String contentLength = headerFields.get("Content-Length");
if (!contentLength.isNull())
- dataLength = min(contentLength.toInt(), (int)dataLength);
+ dataLength = std::min(contentLength.toInt(), (int)dataLength);
headerFields.remove("Content-Length");
postBuffer += location;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -43,7 +43,6 @@
#include <wtf/text/CString.h>
using namespace WebCore;
-using namespace std;
namespace WebKit {
@@ -188,7 +187,7 @@
// Eventually we are going to get a frameDidFinishLoading or frameDidFail call for this request.
// Keep track of the notification data so we can call NPP_URLNotify.
ASSERT(!m_pendingURLNotifications.contains(requestID));
- m_pendingURLNotifications.set(requestID, make_pair(urlString, notificationData));
+ m_pendingURLNotifications.set(requestID, std::make_pair(urlString, notificationData));
}
}
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -34,7 +34,6 @@
#include <wtf/Vector.h>
using namespace WebCore;
-using namespace std;
namespace WebKit {
@@ -221,7 +220,7 @@
}
// Figure out how much data to send to the plug-in.
- int32_t dataLength = min(numBytesPluginCanHandle, numBytesToDeliver - numBytesDelivered);
+ int32_t dataLength = std::min(numBytesPluginCanHandle, numBytesToDeliver - numBytesDelivered);
uint8_t* data = "" + numBytesDelivered;
int32_t numBytesWritten = m_plugin->NPP_Write(&m_npStream, m_offset, dataLength, data);
@@ -235,7 +234,7 @@
if (!m_isStarted)
return;
- numBytesWritten = min(numBytesWritten, dataLength);
+ numBytesWritten = std::min(numBytesWritten, dataLength);
m_offset += numBytesWritten;
numBytesDelivered += numBytesWritten;
}
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.mm (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.mm 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/SimplePDFPlugin.mm 2013-05-09 19:03:52 UTC (rev 149832)
@@ -52,7 +52,6 @@
#import <WebCore/ScrollbarTheme.h>
using namespace WebCore;
-using namespace std;
static const char* postScriptMIMEType = "application/postscript";
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -38,7 +38,6 @@
#include <WebCore/Settings.h>
using namespace WebCore;
-using namespace std;
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -41,7 +41,6 @@
#include <WebCore/Page.h>
#include <WebCore/PluginDocument.h>
-using namespace std;
using namespace WebCore;
namespace WebKit {
@@ -77,7 +76,7 @@
void FindController::countStringMatches(const String& string, FindOptions options, unsigned maxMatchCount)
{
- if (maxMatchCount == numeric_limits<unsigned>::max())
+ if (maxMatchCount == std::numeric_limits<unsigned>::max())
--maxMatchCount;
PluginView* pluginView = pluginViewForFrame(m_webPage->mainFrame());
@@ -131,8 +130,7 @@
unsigned matchCount = 1;
if (shouldShowOverlay || shouldShowHighlight) {
-
- if (maxMatchCount == numeric_limits<unsigned>::max())
+ if (maxMatchCount == std::numeric_limits<unsigned>::max())
--maxMatchCount;
if (pluginView) {
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-05-09 19:03:52 UTC (rev 149832)
@@ -195,7 +195,6 @@
using namespace JSC;
using namespace WebCore;
-using namespace std;
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-05-09 19:03:52 UTC (rev 149832)
@@ -70,7 +70,6 @@
#import <WebKitSystemInterface.h>
using namespace WebCore;
-using namespace std;
namespace WebKit {
@@ -933,7 +932,7 @@
bool shouldRotate = (paperSize.width < paperSize.height) != (cropBox.size.width < cropBox.size.height);
if (shouldRotate)
- swap(cropBox.size.width, cropBox.size.height);
+ std::swap(cropBox.size.width, cropBox.size.height);
// Center.
CGFloat widthDifference = paperSize.width / pageSetupScaleFactor - cropBox.size.width;
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (149831 => 149832)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2013-05-09 19:00:22 UTC (rev 149831)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2013-05-09 19:03:52 UTC (rev 149832)
@@ -55,7 +55,6 @@
#endif
using namespace WebCore;
-using namespace std;
const CFStringRef kLSActivePageUserVisibleOriginsKey = CFSTR("LSActivePageUserVisibleOriginsKey");
