Created attachment 111110 [details] Patch Reviewed by NOBODY (OOPS!). 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 WebCore::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 WebCore::String to an NSString*, then use defaultString in place of defaultText. --- 4 files changed, 39 insertions(+), 7 deletions(-)
Attachment 111110 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/mac/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 111110 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111110&action=review > Source/WebKit/mac/ChangeLog:19 > + variable to convert the WebCore::String to an NSString*, then Nit: "WebCore::String" => "WTF::String"
Committed r97538: <http://trac.webkit.org/changeset/97538>