Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (150667 => 150668)
--- trunk/Source/WebKit/mac/ChangeLog 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-05-24 23:52:21 UTC (rev 150668)
@@ -1,5 +1,57 @@
2013-05-24 Anders Carlsson <[email protected]>
+ Remove using namespace std from Mac WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=116747
+
+ Reviewed by Sam Weinig.
+
+ Use explicit std:: qualifiers instead.
+
+ * History/BinaryPropertyList.cpp:
+ (IntegerArray::deletedValueSize):
+ (BinaryPropertyListPlan::invalidObjectReference):
+ (bytesNeeded):
+ * History/WebHistory.mm:
+ (-[WebHistoryPrivate orderedLastVisitedDays]):
+ (WebHistoryWriter::WebHistoryWriter):
+ * History/WebHistoryItem.mm:
+ (-[WebHistoryItem initFromDictionaryRepresentation:]):
+ * Plugins/Hosted/NetscapePluginHostManager.mm:
+ (WebKit::NetscapePluginHostManager::instantiatePlugin):
+ * Plugins/Hosted/NetscapePluginHostProxy.mm:
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::idForObject):
+ (WebKit::NetscapePluginInstanceProxy::wheelEvent):
+ (WebKit::NetscapePluginInstanceProxy::print):
+ (WebKit::NetscapePluginInstanceProxy::snapshot):
+ (WebKit::NetscapePluginInstanceProxy::loadURL):
+ (WebKit::NetscapePluginInstanceProxy::createBindingsInstance):
+ * Plugins/Hosted/ProxyInstance.mm:
+ (WebKit::ProxyInstance::invoke):
+ (WebKit::ProxyInstance::supportsInvokeDefaultMethod):
+ (WebKit::ProxyInstance::supportsConstruct):
+ (WebKit::ProxyInstance::getPropertyNames):
+ (WebKit::ProxyInstance::methodNamed):
+ (WebKit::ProxyInstance::fieldNamed):
+ (WebKit::ProxyInstance::fieldValue):
+ (WebKit::ProxyInstance::setFieldValue):
+ * Plugins/WebBasePluginPackage.mm:
+ (-[WebBasePluginPackage supportsExtension:]):
+ (-[WebBasePluginPackage MIMETypeForExtension:]):
+ * Plugins/WebNetscapePluginStream.mm:
+ (WebNetscapePluginStream::deliverData):
+ * Plugins/WebNetscapePluginView.mm:
+ (PluginTimer::start):
+ (-[WebNetscapePluginView _postURL:target:len:buf:file:notifyData:sendNotification:allowHeaders:]):
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ * WebView/WebFrame.mm:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _adjustedBottomOfPageWithTop:bottom:limit:]):
+ * WebView/WebTextCompletionController.mm:
+ (-[WebTextCompletionController _placePopupWindow:]):
+
+2013-05-24 Anders Carlsson <[email protected]>
+
Move history property list writer to WebKit
https://bugs.webkit.org/show_bug.cgi?id=116746
Modified: trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp (150667 => 150668)
--- trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp 2013-05-24 23:52:21 UTC (rev 150668)
@@ -30,8 +30,6 @@
#include <wtf/HashSet.h>
#include <wtf/text/StringHash.h>
-using namespace std;
-
static const size_t headerSize = 8;
static const size_t trailerSize = 32;
@@ -62,7 +60,7 @@
size_t size() const { ASSERT(!isDeletedValue()); return m_size; }
private:
- static size_t deletedValueSize() { return numeric_limits<size_t>::max(); }
+ static size_t deletedValueSize() { return std::numeric_limits<size_t>::max(); }
friend bool operator==(const IntegerArray&, const IntegerArray&);
@@ -138,7 +136,7 @@
void writeStringObject(const String&);
void writeStringObject(const char*);
- static ObjectReference invalidObjectReference() { return numeric_limits<ObjectReference>::max(); }
+ static ObjectReference invalidObjectReference() { return std::numeric_limits<ObjectReference>::max(); }
typedef HashMap<IntegerArray, ObjectReference, IntegerArrayHash, IntegerArrayHashTraits> IntegerArrayMap;
@@ -414,7 +412,7 @@
{
ASSERT(count);
int bytesNeeded = 1;
- for (size_t mask = numeric_limits<size_t>::max() << 8; count & mask; mask <<= 8)
+ for (size_t mask = std::numeric_limits<size_t>::max() << 8; count & mask; mask <<= 8)
++bytesNeeded;
return bytesNeeded;
}
Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/History/WebHistory.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -37,7 +37,6 @@
#import <WebCore/PageGroup.h>
using namespace WebCore;
-using namespace std;
typedef int64_t WebHistoryDateKey;
typedef HashMap<WebHistoryDateKey, RetainPtr<NSMutableArray> > DateToEntriesMap;
@@ -444,7 +443,7 @@
for (DateToEntriesMap::const_iterator it = _entriesByDate->begin(); it != end; ++it)
daysAsTimeIntervals.append(it->key);
- sort(daysAsTimeIntervals.begin(), daysAsTimeIntervals.end());
+ std::sort(daysAsTimeIntervals.begin(), daysAsTimeIntervals.end());
size_t count = daysAsTimeIntervals.size();
_orderedLastVisitedDays = [[NSMutableArray alloc] initWithCapacity:count];
for (int i = count - 1; i >= 0; i--) {
@@ -900,7 +899,7 @@
DateToEntriesMap::const_iterator end = m_entriesByDate->end();
for (DateToEntriesMap::const_iterator it = m_entriesByDate->begin(); it != end; ++it)
m_dateKeys.append(it->key);
- sort(m_dateKeys.begin(), m_dateKeys.end());
+ std::sort(m_dateKeys.begin(), m_dateKeys.end());
}
void WebHistoryWriter::writeHistoryItems(BinaryPropertyListObjectStream& stream)
Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -73,7 +73,6 @@
NSString *WebHistoryItemChangedNotification = @"WebHistoryItemChangedNotification";
using namespace WebCore;
-using namespace std;
typedef HashMap<HistoryItem*, WebHistoryItem*> HistoryItemMap;
@@ -375,9 +374,9 @@
// Daily and weekly counts < 0 are errors in the data read from disk, so reset to 0.
for (size_t i = 0; i < coreDailyCounts.size(); ++i)
- coreDailyCounts[i] = max([[dailyCounts _webkit_numberAtIndex:i] intValue], 0);
+ coreDailyCounts[i] = std::max([[dailyCounts _webkit_numberAtIndex:i] intValue], 0);
for (size_t i = 0; i < coreWeeklyCounts.size(); ++i)
- coreWeeklyCounts[i] = max([[weeklyCounts _webkit_numberAtIndex:i] intValue], 0);
+ coreWeeklyCounts[i] = std::max([[weeklyCounts _webkit_numberAtIndex:i] intValue], 0);
core(_private)->adoptVisitCounts(coreDailyCounts, coreWeeklyCounts);
}
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -44,7 +44,6 @@
#import "WebKitPluginHost.h"
}
-using namespace std;
using namespace WebCore;
namespace WebKit {
@@ -268,7 +267,7 @@
kr = _WKPHInstantiatePlugin(hostProxy->port(), requestID, (uint8_t*)[data bytes], [data length], instance->pluginID());
}
- auto_ptr<NetscapePluginInstanceProxy::InstantiatePluginReply> reply = instance->waitForReply<NetscapePluginInstanceProxy::InstantiatePluginReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::InstantiatePluginReply> reply = instance->waitForReply<NetscapePluginInstanceProxy::InstantiatePluginReply>(requestID);
if (!reply.get() || reply->m_resultCode != KERN_SUCCESS) {
instance->cleanup();
return 0;
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -45,7 +45,6 @@
#import "WebKitPluginClientServer.h"
}
-using namespace std;
using namespace JSC;
using namespace WebCore;
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -73,7 +73,6 @@
using namespace JSC;
using namespace JSC::Bindings;
-using namespace std;
using namespace WebCore;
namespace WebKit {
@@ -152,7 +151,7 @@
} while (!m_objectIDCounter || m_objectIDCounter == static_cast<uint32_t>(-1) || m_idToJSObjectMap.contains(objectID));
m_idToJSObjectMap.set(objectID, Strong<JSObject>(vm, object));
- m_jsObjectToIDMap.set(object, make_pair(objectID, 1));
+ m_jsObjectToIDMap.set(object, std::make_pair(objectID, 1));
return objectID;
}
@@ -483,7 +482,7 @@
pluginPoint.x, pluginPoint.y, [event buttonNumber],
[event deltaX], [event deltaY], [event deltaZ]);
- auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
if (!reply.get() || !reply->m_result)
return false;
@@ -495,7 +494,7 @@
uint32_t requestID = nextRequestID();
_WKPHPluginInstancePrint(m_pluginHostProxy->port(), m_pluginID, requestID, width, height);
- auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
if (!reply.get() || !reply->m_returnValue)
return;
@@ -518,7 +517,7 @@
uint32_t requestID = nextRequestID();
_WKPHPluginInstanceSnapshot(m_pluginHostProxy->port(), m_pluginID, requestID, width, height);
- auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
if (!reply.get() || !reply->m_returnValue)
return;
@@ -596,7 +595,7 @@
NSString *contentLength = [header objectForKey:@"Content-Length"];
if (contentLength)
- dataLength = min(static_cast<unsigned>([contentLength intValue]), dataLength);
+ dataLength = std::min(static_cast<unsigned>([contentLength intValue]), dataLength);
[header removeObjectForKey:@"Content-Length"];
if ([header count] > 0)
@@ -1423,7 +1422,7 @@
if (_WKPHGetScriptableNPObject(m_pluginHostProxy->port(), m_pluginID, requestID) != KERN_SUCCESS)
return 0;
- auto_ptr<GetScriptableNPObjectReply> reply = waitForReply<GetScriptableNPObjectReply>(requestID);
+ std::auto_ptr<GetScriptableNPObjectReply> reply = waitForReply<GetScriptableNPObjectReply>(requestID);
if (!reply.get())
return 0;
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -43,7 +43,6 @@
using namespace JSC;
using namespace JSC::Bindings;
-using namespace std;
using namespace WebCore;
namespace WebKit {
@@ -163,7 +162,7 @@
return jsUndefined();
}
- auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
NetscapePluginInstanceProxy::moveGlobalExceptionToExecState(exec);
if (m_instanceProxy) {
@@ -242,7 +241,7 @@
m_objectID) != KERN_SUCCESS)
return false;
- auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
if (reply.get() && reply->m_result)
return true;
@@ -266,7 +265,7 @@
m_objectID) != KERN_SUCCESS)
return false;
- auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
if (reply.get() && reply->m_result)
return true;
@@ -320,7 +319,7 @@
if (_WKPHNPObjectEnumerate(m_instanceProxy->hostProxy()->port(), m_instanceProxy->pluginID(), requestID, m_objectID) != KERN_SUCCESS)
return;
- auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
NetscapePluginInstanceProxy::moveGlobalExceptionToExecState(exec);
if (!reply.get() || !reply->m_returnValue)
return;
@@ -367,7 +366,7 @@
m_objectID, methodName) != KERN_SUCCESS)
return 0;
- auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
if (!reply.get())
return 0;
@@ -404,7 +403,7 @@
m_objectID, identifier) != KERN_SUCCESS)
return 0;
- auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
if (!reply.get())
return 0;
@@ -431,7 +430,7 @@
m_objectID, serverIdentifier) != KERN_SUCCESS)
return jsUndefined();
- auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanAndDataReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanAndDataReply>(requestID);
NetscapePluginInstanceProxy::moveGlobalExceptionToExecState(exec);
if (!reply.get() || !reply->m_returnValue)
return jsUndefined();
@@ -461,7 +460,7 @@
if (kr != KERN_SUCCESS)
return;
- auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
+ std::auto_ptr<NetscapePluginInstanceProxy::BooleanReply> reply = waitForReply<NetscapePluginInstanceProxy::BooleanReply>(requestID);
NetscapePluginInstanceProxy::moveGlobalExceptionToExecState(exec);
}
Modified: trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -60,7 +60,6 @@
- (NSArray *)_web_lowercaseStrings;
@end;
-using namespace std;
using namespace WebCore;
@implementation WebBasePluginPackage
@@ -310,7 +309,7 @@
for (size_t i = 0; i < pluginInfo.mimes.size(); ++i) {
const Vector<String>& extensions = pluginInfo.mimes[i].extensions;
- if (find(extensions.begin(), extensions.end(), extension) != extensions.end())
+ if (std::find(extensions.begin(), extensions.end(), extension) != extensions.end())
return YES;
}
@@ -337,7 +336,7 @@
const MimeClassInfo& mimeClassInfo = pluginInfo.mimes[i];
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())
return mimeClassInfo.type;
}
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -54,7 +54,6 @@
#import <wtf/StdLibExtras.h>
using namespace WebCore;
-using namespace std;
#define WEB_REASON_NONE -1
@@ -523,7 +522,7 @@
m_deliverDataTimer.startOneShot(0);
break;
} else {
- deliveryBytes = min(deliveryBytes, totalBytes - totalBytesDelivered);
+ deliveryBytes = std::min(deliveryBytes, totalBytes - totalBytesDelivered);
NSData *subdata = [m_deliveryData.get() subdataWithRange:NSMakeRange(totalBytesDelivered, deliveryBytes)];
PluginStopDeferrer deferrer(m_pluginView.get());
deliveryBytes = m_pluginFuncs->write(m_plugin, &m_stream, m_offset, [subdata length], (void *)[subdata bytes]);
@@ -532,7 +531,7 @@
cancelLoadAndDestroyStreamWithError(pluginCancelledConnectionError());
return;
}
- deliveryBytes = min<int32_t>(deliveryBytes, [subdata length]);
+ deliveryBytes = std::min<int32_t>(deliveryBytes, [subdata length]);
m_offset += deliveryBytes;
totalBytesDelivered += deliveryBytes;
LOG(Plugins, "NPP_Write responseURL=%@ bytes=%d total-delivered=%d/%d", m_responseURL.get(), deliveryBytes, m_offset, m_stream.end);
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -91,7 +91,6 @@
using namespace WebCore;
using namespace WebKit;
-using namespace std;
static inline bool isDrawingModelQuickDraw(NPDrawingModel drawingModel)
{
@@ -136,7 +135,7 @@
double timeInterval = m_interval / 1000.0;
if (throttle)
- timeInterval = max(timeInterval, ThrottledTimerInterval);
+ timeInterval = std::max(timeInterval, ThrottledTimerInterval);
if (m_repeat)
startRepeating(timeInterval);
@@ -1851,7 +1850,7 @@
NSString *contentLength = [header objectForKey:@"Content-Length"];
if (contentLength != nil)
- dataLength = min<unsigned>([contentLength intValue], dataLength);
+ dataLength = std::min<unsigned>([contentLength intValue], dataLength);
[header removeObjectForKey:@"Content-Length"];
if ([header count] > 0) {
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -140,7 +140,6 @@
using namespace WebCore;
using namespace HTMLNames;
-using namespace std;
// For backwards compatibility with older WebKit plug-ins.
NSString *WebPluginBaseURLKey = @"WebPluginBaseURL";
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -104,7 +104,6 @@
#import <runtime/JSCJSValue.h>
#import <wtf/CurrentTime.h>
-using namespace std;
using namespace WebCore;
using namespace HTMLNames;
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -138,7 +138,6 @@
using namespace WebCore;
using namespace HTMLNames;
using namespace WTF;
-using namespace std;
@interface WebMenuTarget : NSObject {
WebCore::ContextMenuController* _menuController;
@@ -2215,7 +2214,7 @@
#ifdef __LP64__
// If the new bottom is equal to the old bottom (when both are treated as floats), we just return the original
// bottom. This prevents rounding errors that can occur when converting newBottom to a double.
- if (fabs(static_cast<float>(bottom) - newBottom) <= numeric_limits<float>::epsilon())
+ if (fabs(static_cast<float>(bottom) - newBottom) <= std::numeric_limits<float>::epsilon())
return bottom;
else
#endif
Modified: trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm (150667 => 150668)
--- trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm 2013-05-24 23:46:04 UTC (rev 150667)
+++ trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm 2013-05-24 23:52:21 UTC (rev 150668)
@@ -41,7 +41,6 @@
@end
using namespace WebCore;
-using namespace std;
// This class handles the complete: operation.
// It counts on its host view to call endRevertingChange: whenever the current completion needs to be aborted.
@@ -148,8 +147,8 @@
maxWidth = ceilf([NSScrollView frameSizeForContentSize:NSMakeSize(maxWidth, 100.0f) hasHorizontalScroller:NO hasVerticalScroller:YES borderType:NSNoBorder].width);
maxWidth = ceilf([NSWindow frameRectForContentRect:NSMakeRect(0.0f, 0.0f, maxWidth, 100.0f) styleMask:NSBorderlessWindowMask].size.width);
maxWidth += 5.0f;
- windowFrame.size.width = max(maxWidth, windowFrame.size.width);
- maxWidth = min<CGFloat>(400, windowFrame.size.width);
+ windowFrame.size.width = std::max(maxWidth, windowFrame.size.width);
+ maxWidth = std::min<CGFloat>(400, windowFrame.size.width);
}
[_popupWindow setFrame:windowFrame display:NO];
