Title: [178660] trunk
- Revision
- 178660
- Author
- d...@apple.com
- Date
- 2015-01-19 11:45:24 -0800 (Mon, 19 Jan 2015)
Log Message
Add "override" to fix the build with newer clangs.
Source/WebKit2:
* UIProcess/Cocoa/WebProcessProxyCocoa.mm:
(WebKit::WebProcessProxy::transformHandlesToObjects):
(WebKit::WebProcessProxy::transformObjectsToHandles):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::transformObjectsToHandles):
* UIProcess/ios/WebVideoFullscreenManagerProxy.h:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::transformHandlesToObjects):
(WebKit::WebProcess::transformObjectsToHandles):
Tools:
* TestWebKitAPI/Tests/WebCore/CalculationValue.cpp:
(TestWebKitAPI::CalculationDeletionTestNode::operator==):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (178659 => 178660)
--- trunk/Source/WebKit2/ChangeLog 2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-19 19:45:24 UTC (rev 178660)
@@ -1,3 +1,17 @@
+2015-01-19 Dean Jackson <d...@apple.com>
+
+ Add "override" to fix the build with newer clangs.
+
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+ (WebKit::WebProcessProxy::transformHandlesToObjects):
+ (WebKit::WebProcessProxy::transformObjectsToHandles):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::transformObjectsToHandles):
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.h:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::transformHandlesToObjects):
+ (WebKit::WebProcess::transformObjectsToHandles):
+
2015-01-19 Myles C. Maxfield <mmaxfi...@apple.com>
[SVG -> OTF Converter] Flip the switch on
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm (178659 => 178660)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2015-01-19 19:45:24 UTC (rev 178660)
@@ -53,7 +53,7 @@
return false;
}
- virtual RetainPtr<id> transformObject(id object) const
+ virtual RetainPtr<id> transformObject(id object) const override
{
#if WK_API_ENABLED
if (auto* handle = dynamic_objc_cast<WKBrowsingContextHandle>(object)) {
@@ -91,7 +91,7 @@
return false;
}
- virtual RetainPtr<id> transformObject(id object) const
+ virtual RetainPtr<id> transformObject(id object) const override
{
#if WK_API_ENABLED
if (auto* controller = dynamic_objc_cast<WKBrowsingContextController>(object))
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (178659 => 178660)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-19 19:45:24 UTC (rev 178660)
@@ -694,7 +694,7 @@
RefPtr<API::Object> WebProcessProxy::transformObjectsToHandles(API::Object* object)
{
struct Transformer final : UserData::Transformer {
- virtual bool shouldTransformObject(const API::Object& object) const
+ virtual bool shouldTransformObject(const API::Object& object) const override
{
switch (object.type()) {
case API::Object::Type::Frame:
Modified: trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h (178659 => 178660)
--- trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h 2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h 2015-01-19 19:45:24 UTC (rev 178660)
@@ -58,7 +58,7 @@
void setupFullscreenWithID(uint32_t, WebCore::IntRect initialRect, float hostingDeviceScaleFactor, WebCore::HTMLMediaElement::VideoFullscreenMode, bool allowOptimizedFullscreen);
void setSeekableRangesVector(const Vector<std::pair<double, double>>&);
void setExternalPlaybackProperties(bool enabled, uint32_t targetType, String localizedDeviceName);
- void fullscreenModeChanged(WebCore::HTMLMediaElement::VideoFullscreenMode);
+ void fullscreenModeChanged(WebCore::HTMLMediaElement::VideoFullscreenMode) override;
// Fullscreen Observer
virtual void didSetupFullscreen() override;
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (178659 => 178660)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-01-19 19:45:24 UTC (rev 178660)
@@ -314,7 +314,7 @@
return false;
}
- virtual RetainPtr<id> transformObject(id object) const
+ virtual RetainPtr<id> transformObject(id object) const override
{
#if WK_API_ENABLED
if (auto* handle = dynamic_objc_cast<WKBrowsingContextHandle>(object)) {
@@ -352,7 +352,7 @@
return false;
}
- virtual RetainPtr<id> transformObject(id object) const
+ virtual RetainPtr<id> transformObject(id object) const override
{
#if WK_API_ENABLED
if (auto* controller = dynamic_objc_cast<WKWebProcessPlugInBrowserContextController>(object))
Modified: trunk/Tools/ChangeLog (178659 => 178660)
--- trunk/Tools/ChangeLog 2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Tools/ChangeLog 2015-01-19 19:45:24 UTC (rev 178660)
@@ -1,3 +1,10 @@
+2015-01-19 Dean Jackson <d...@apple.com>
+
+ Add "override" to fix the build with newer clangs.
+
+ * TestWebKitAPI/Tests/WebCore/CalculationValue.cpp:
+ (TestWebKitAPI::CalculationDeletionTestNode::operator==):
+
2015-01-19 David Kilzer <ddkil...@apple.com>
[iOS] Do not hard-code iphoneos.internal SDK in buildXCodeProject()
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/CalculationValue.cpp (178659 => 178660)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/CalculationValue.cpp 2015-01-19 19:30:14 UTC (rev 178659)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/CalculationValue.cpp 2015-01-19 19:45:24 UTC (rev 178660)
@@ -39,7 +39,7 @@
}
virtual float evaluate(float) const override { return 0; }
- bool operator==(const CalcExpressionNode&) const { ASSERT_NOT_REACHED(); return false; }
+ bool operator==(const CalcExpressionNode&) const override { ASSERT_NOT_REACHED(); return false; }
};
static Ref<WebCore::CalculationValue> createTestValue()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
