<http://webkit.org/b/70158> Fix clang compiler warnings
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Oct 2011 04:37:31 +0000 (04:37 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Oct 2011 04:37:31 +0000 (04:37 +0000)
commit3b2fa1ddd4876ecaa08ed907640a5e506cc8fd3d
tree6eac81e0689546c450bf36cbb8146f3ba4d54a86
parent619fb36e3074ecfecad169f2806712ae36ed0634
<webkit.org/b/70158> Fix clang compiler warnings

Reviewed by Darin Adler.

Source/WebCore:

* dom/ViewportArguments.cpp:
(WebCore::computeViewportAttributes): Use std::max<float>()
instead of std::max().

Source/WebKit/mac:

The following two methods in WebDelegateImplementationCaching.h
are ambiguous in WebChromeClient::runJavaScriptPrompt() because
the compiler can't decide how to convert the WTF::String
defaultText argument:

    id CallUIDelegate(WebView *, SEL, id, id);
    id CallUIDelegate(WebView *, SEL, id, BOOL);

The fix is to perform the conversion explicitly.

* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::runJavaScriptPrompt): Extract a defaultString
variable to convert the WTF::String to an NSString*, then
use defaultString in place of defaultText.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@97538 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/dom/ViewportArguments.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm