Title: [120526] trunk/Source/WebKit/chromium
- Revision
- 120526
- Author
- [email protected]
- Date
- 2012-06-16 02:21:40 -0700 (Sat, 16 Jun 2012)
Log Message
[chromium] WebFrameClient::userAgentOverride() should take in a WebFrame* as its first argument
https://bugs.webkit.org/show_bug.cgi?id=89233
Patch by Dan Alcantara <[email protected]> on 2012-06-16
Reviewed by Darin Fisher.
Adds a WebFrame* to the WebFrameClient::userAgentOverride() function.
* public/WebFrameClient.h:
(WebKit::WebFrameClient::userAgentOverride):
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::userAgent):
* tests/FrameLoaderClientImplTest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (120525 => 120526)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-16 08:42:08 UTC (rev 120525)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-16 09:21:40 UTC (rev 120526)
@@ -1,3 +1,18 @@
+2012-06-16 Dan Alcantara <[email protected]>
+
+ [chromium] WebFrameClient::userAgentOverride() should take in a WebFrame* as its first argument
+ https://bugs.webkit.org/show_bug.cgi?id=89233
+
+ Reviewed by Darin Fisher.
+
+ Adds a WebFrame* to the WebFrameClient::userAgentOverride() function.
+
+ * public/WebFrameClient.h:
+ (WebKit::WebFrameClient::userAgentOverride):
+ * src/FrameLoaderClientImpl.cpp:
+ (WebKit::FrameLoaderClientImpl::userAgent):
+ * tests/FrameLoaderClientImplTest.cpp:
+
2012-06-15 Sheriff Bot <[email protected]>
Unreviewed, rolling out r120511.
Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (120525 => 120526)
--- trunk/Source/WebKit/chromium/public/WebFrameClient.h 2012-06-16 08:42:08 UTC (rev 120525)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h 2012-06-16 09:21:40 UTC (rev 120526)
@@ -400,7 +400,7 @@
// Asks the embedder if a specific user agent should be used for the given
// URL. Non-empty strings indicate an override should be used. Otherwise,
// WebKitPlatformSupport::userAgent() will be called to provide one.
- virtual WebString userAgentOverride(const WebURL& url) { return WebString(); }
+ virtual WebString userAgentOverride(WebFrame*, const WebURL& url) { return WebString(); }
protected:
~WebFrameClient() { }
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (120525 => 120526)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-06-16 08:42:08 UTC (rev 120525)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-06-16 09:21:40 UTC (rev 120526)
@@ -1383,7 +1383,7 @@
String FrameLoaderClientImpl::userAgent(const KURL& url)
{
- WebString override = m_webFrame->client()->userAgentOverride(WebURL(url));
+ WebString override = m_webFrame->client()->userAgentOverride(m_webFrame, WebURL(url));
if (!override.isEmpty())
return override;
Modified: trunk/Source/WebKit/chromium/tests/FrameLoaderClientImplTest.cpp (120525 => 120526)
--- trunk/Source/WebKit/chromium/tests/FrameLoaderClientImplTest.cpp 2012-06-16 08:42:08 UTC (rev 120525)
+++ trunk/Source/WebKit/chromium/tests/FrameLoaderClientImplTest.cpp 2012-06-16 09:21:40 UTC (rev 120526)
@@ -46,7 +46,7 @@
class TestWebFrameClient : public WebFrameClient {
public:
- WebString userAgentOverride(const WebURL& url) OVERRIDE
+ WebString userAgentOverride(WebFrame* frame, const WebURL& url) OVERRIDE
{
if (m_userAgentOverride.isEmpty())
return WebString();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
