Title: [104181] trunk/Source/WebKit/mac
- Revision
- 104181
- Author
- [email protected]
- Date
- 2012-01-05 11:03:26 -0800 (Thu, 05 Jan 2012)
Log Message
WebFrameLoaderClient::userAgent does unnecessary NSString/NSURL conversions
https://bugs.webkit.org/show_bug.cgi?id=75586
Reviewed by Alexey Proskuryakov.
We do unnecessary KURL->NSURL* and String<->NSString* when calling [WebView
userAgentForURL:] from WebFrameLoaderClient::userAgent. Instead we add a separate function,
_userAgentString that returns a WTF::String to make this call faster.
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::userAgent):
* WebView/WebView.mm:
(-[WebView _userAgentString]):
(-[WebView userAgentForURL:]):
* WebView/WebViewInternal.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (104180 => 104181)
--- trunk/Source/WebKit/mac/ChangeLog 2012-01-05 18:59:00 UTC (rev 104180)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-01-05 19:03:26 UTC (rev 104181)
@@ -1,3 +1,21 @@
+2012-01-05 Pratik Solanki <[email protected]>
+
+ WebFrameLoaderClient::userAgent does unnecessary NSString/NSURL conversions
+ https://bugs.webkit.org/show_bug.cgi?id=75586
+
+ Reviewed by Alexey Proskuryakov.
+
+ We do unnecessary KURL->NSURL* and String<->NSString* when calling [WebView
+ userAgentForURL:] from WebFrameLoaderClient::userAgent. Instead we add a separate function,
+ _userAgentString that returns a WTF::String to make this call faster.
+
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::userAgent):
+ * WebView/WebView.mm:
+ (-[WebView _userAgentString]):
+ (-[WebView userAgentForURL:]):
+ * WebView/WebViewInternal.h:
+
2012-01-04 Anders Carlsson <[email protected]>
Ambiguous if-then-else in Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (104180 => 104181)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2012-01-05 18:59:00 UTC (rev 104180)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2012-01-05 19:03:26 UTC (rev 104181)
@@ -1294,7 +1294,7 @@
if (!webView)
return String("");
- return [webView userAgentForURL:url];
+ return [webView _userAgentString];
}
static const MouseEvent* findMouseEvent(const Event* event)
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (104180 => 104181)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2012-01-05 18:59:00 UTC (rev 104180)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2012-01-05 19:03:26 UTC (rev 104181)
@@ -3874,19 +3874,20 @@
return coreFrame->script()->windowScriptObject();
}
-// Get the appropriate user-agent string for a particular URL.
-- (NSString *)userAgentForURL:(NSURL *)url
+- (String)_userAgentString
{
- if (_private->useSiteSpecificSpoofing) {
- // No current site-specific spoofs.
- }
-
if (_private->userAgent.isNull())
_private->userAgent = [[self class] _standardUserAgentWithApplicationName:_private->applicationNameForUserAgent];
return _private->userAgent;
}
+// Get the appropriate user-agent string for a particular URL.
+- (NSString *)userAgentForURL:(NSURL *)url
+{
+ return [self _userAgentString];
+}
+
- (void)setHostWindow:(NSWindow *)hostWindow
{
if (_private->closed && hostWindow)
Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (104180 => 104181)
--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2012-01-05 18:59:00 UTC (rev 104180)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2012-01-05 19:03:26 UTC (rev 104181)
@@ -108,6 +108,7 @@
#ifdef __cplusplus
- (WebCore::Page*)page;
- (void)_setGlobalHistoryItem:(WebCore::HistoryItem*)historyItem;
+- (WTF::String)_userAgentString;
#endif
- (NSMenu *)_menuForElement:(NSDictionary *)element defaultItems:(NSArray *)items;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
