Title: [158414] trunk/Source/WebKit/win
- Revision
- 158414
- Author
- [email protected]
- Date
- 2013-10-31 18:01:18 -0700 (Thu, 31 Oct 2013)
Log Message
Compile fix for VS2012.
https://bugs.webkit.org/show_bug.cgi?id=123599
Patch by Alex Christensen <[email protected]> on 2013-10-31
Reviewed by Brent Fulgham.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::WebFramePolicyListenerPrivate::WebFramePolicyListenerPrivate):
(WebFrameLoaderClient::cancelPolicyCheck):
(WebFrameLoaderClient::receivedPolicyDecision):
Use nullptr instead of 0 for m_policyFunction, which is a std::function.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (158413 => 158414)
--- trunk/Source/WebKit/win/ChangeLog 2013-11-01 00:48:49 UTC (rev 158413)
+++ trunk/Source/WebKit/win/ChangeLog 2013-11-01 01:01:18 UTC (rev 158414)
@@ -1,3 +1,16 @@
+2013-10-31 Alex Christensen <[email protected]>
+
+ Compile fix for VS2012.
+ https://bugs.webkit.org/show_bug.cgi?id=123599
+
+ Reviewed by Brent Fulgham.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::WebFramePolicyListenerPrivate::WebFramePolicyListenerPrivate):
+ (WebFrameLoaderClient::cancelPolicyCheck):
+ (WebFrameLoaderClient::receivedPolicyDecision):
+ Use nullptr instead of 0 for m_policyFunction, which is a std::function.
+
2013-10-31 Patrick Gansterer <[email protected]>
[WIN] Make WebHistory compile without USE(CF)
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (158413 => 158414)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2013-11-01 00:48:49 UTC (rev 158413)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2013-11-01 01:01:18 UTC (rev 158414)
@@ -93,7 +93,7 @@
class WebFrameLoaderClient::WebFramePolicyListenerPrivate {
public:
WebFramePolicyListenerPrivate()
- : m_policyFunction(0)
+ : m_policyFunction(nullptr)
{
}
@@ -1347,7 +1347,7 @@
m_policyListenerPrivate->m_policyListener = 0;
}
- m_policyListenerPrivate->m_policyFunction = 0;
+ m_policyListenerPrivate->m_policyFunction = nullptr;
}
COMPtr<WebFramePolicyListener> WebFrameLoaderClient::setUpPolicyListener(WebCore::FramePolicyFunction function)
@@ -1374,7 +1374,7 @@
FramePolicyFunction function = m_policyListenerPrivate->m_policyFunction;
m_policyListenerPrivate->m_policyListener = 0;
- m_policyListenerPrivate->m_policyFunction = 0;
+ m_policyListenerPrivate->m_policyFunction = nullptr;
Frame* coreFrame = core(m_webFrame);
ASSERT(coreFrame);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
