Diff
Modified: trunk/Source/WebCore/ChangeLog (176911 => 176912)
--- trunk/Source/WebCore/ChangeLog 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/ChangeLog 2014-12-06 21:23:57 UTC (rev 176912)
@@ -1,5 +1,23 @@
2014-12-06 Anders Carlsson <[email protected]>
+ Fix build with newer versions of clang.
+ rdar://problem/18978687
+
+ Add a bunch of overrides since we're not disabling the "inconsistent missing override" warning in WebKit.
+
+ * html/HTMLElement.h:
+ * html/HTMLMediaElement.h:
+ * html/track/VTTCue.h:
+ * loader/FrameNetworkingContext.h:
+ (WebCore::FrameNetworkingContext::shouldClearReferrerOnHTTPSToHTTPRedirect): Deleted.
+ * loader/cache/CachedImage.h:
+ * page/SuspendableTimer.h:
+ * platform/Scrollbar.h:
+ * platform/graphics/InbandTextTrackPrivate.h:
+ * rendering/RenderBlockFlow.h:
+
+2014-12-06 Anders Carlsson <[email protected]>
+
Follow-up build fix.
* Configurations/Base.xcconfig:
Modified: trunk/Source/WebCore/html/HTMLElement.h (176911 => 176912)
--- trunk/Source/WebCore/html/HTMLElement.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/html/HTMLElement.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -107,7 +107,7 @@
void applyAlignmentAttributeToStyle(const AtomicString&, MutableStyleProperties&);
void applyBorderAttributeToStyle(const AtomicString&, MutableStyleProperties&);
- virtual bool matchesReadWritePseudoClass() const;
+ virtual bool matchesReadWritePseudoClass() const override;
virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
virtual bool isPresentationAttribute(const QualifiedName&) const override;
virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (176911 => 176912)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -577,7 +577,7 @@
virtual bool mediaPlayerIsPaused() const override;
virtual bool mediaPlayerIsLooping() const override;
virtual CachedResourceLoader* mediaPlayerCachedResourceLoader() override;
- virtual PassRefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader(std::unique_ptr<PlatformMediaResourceLoaderClient>);
+ virtual PassRefPtr<PlatformMediaResourceLoader> mediaPlayerCreateResourceLoader(std::unique_ptr<PlatformMediaResourceLoaderClient>) override;
#if PLATFORM(WIN) && USE(AVFOUNDATION)
virtual GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const override;
@@ -585,10 +585,10 @@
virtual bool mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&) override;
virtual void mediaPlayerHandlePlaybackCommand(MediaSession::RemoteControlCommandType command) override { didReceiveRemoteControlCommand(command); }
- virtual String mediaPlayerSourceApplicationIdentifier() const;
+ virtual String mediaPlayerSourceApplicationIdentifier() const override;
#if PLATFORM(IOS)
- virtual String mediaPlayerNetworkInterfaceName() const;
+ virtual String mediaPlayerNetworkInterfaceName() const override;
virtual bool mediaPlayerGetRawCookies(const URL&, Vector<Cookie>&) const override;
#endif
Modified: trunk/Source/WebCore/html/track/VTTCue.h (176911 => 176912)
--- trunk/Source/WebCore/html/track/VTTCue.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/html/track/VTTCue.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -123,7 +123,7 @@
void notifyRegionWhenRemovingDisplayTree(bool);
#endif
- virtual void setIsActive(bool);
+ virtual void setIsActive(bool) override;
bool hasDisplayTree() const { return m_displayTree; }
VTTCueBox* getDisplayTree(const IntSize& videoSize, int fontSize);
@@ -167,7 +167,7 @@
virtual bool cueContentsMatch(const TextTrackCue&) const override;
virtual bool doesExtendCue(const TextTrackCue&) const override;
- virtual CueType cueType() const { return WebVTT; }
+ virtual CueType cueType() const override { return WebVTT; }
virtual bool isRenderable() const override final { return true; }
virtual void didChange() override;
Modified: trunk/Source/WebCore/loader/FrameNetworkingContext.h (176911 => 176912)
--- trunk/Source/WebCore/loader/FrameNetworkingContext.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/loader/FrameNetworkingContext.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -34,7 +34,7 @@
m_frame = 0;
}
- virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const
+ virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const override
{
// FIXME: PingLoader finishes without a frame, but it should use its document's referrer policy.
if (!m_frame)
Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (176911 => 176912)
--- trunk/Source/WebCore/loader/cache/CachedImage.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -84,7 +84,7 @@
void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
bool isManuallyCached() const { return m_isManuallyCached; }
- virtual bool mustRevalidateDueToCacheHeaders(CachePolicy) const;
+ virtual bool mustRevalidateDueToCacheHeaders(CachePolicy) const override;
virtual void load(CachedResourceLoader*, const ResourceLoaderOptions&) override;
bool isOriginClean(SecurityOrigin*);
Modified: trunk/Source/WebCore/page/SuspendableTimer.h (176911 => 176912)
--- trunk/Source/WebCore/page/SuspendableTimer.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/page/SuspendableTimer.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -55,7 +55,7 @@
void cancel(); // Equivalent to TimerBase::stop(), whose name conflicts with ActiveDOMObject::stop().
private:
- virtual void fired() = 0;
+ virtual void fired() override = 0;
// ActiveDOMObject
virtual bool hasPendingActivity() const final override;
Modified: trunk/Source/WebCore/platform/Scrollbar.h (176911 => 176912)
--- trunk/Source/WebCore/platform/Scrollbar.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/platform/Scrollbar.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -156,7 +156,7 @@
virtual bool isAlphaLocked() const override { return m_isAlphaLocked; }
virtual void setIsAlphaLocked(bool flag) override { m_isAlphaLocked = flag; }
- virtual bool supportsUpdateOnSecondaryThread() const;
+ virtual bool supportsUpdateOnSecondaryThread() const override;
protected:
Scrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize, ScrollbarTheme* = 0, bool isCustomScrollbar = false);
Modified: trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h (176911 => 176912)
--- trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -69,9 +69,9 @@
virtual bool isMainProgramContent() const { return true; }
virtual bool isEasyToRead() const { return false; }
virtual bool isDefault() const { return false; }
- virtual AtomicString label() const { return emptyAtom; }
- virtual AtomicString language() const { return emptyAtom; }
- virtual AtomicString id() const { return emptyAtom; }
+ virtual AtomicString label() const override { return emptyAtom; }
+ virtual AtomicString language() const override { return emptyAtom; }
+ virtual AtomicString id() const override { return emptyAtom; }
virtual AtomicString inBandMetadataTrackDispatchType() const { return emptyAtom; }
virtual int textTrackIndex() const { return 0; }
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (176911 => 176912)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -510,7 +510,7 @@
virtual bool hitTestInlineChildren(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
void addOverflowFromFloats();
- virtual void addOverflowFromInlineChildren();
+ virtual void addOverflowFromInlineChildren() override;
void fitBorderToLinesIfNeeded(); // Shrink the box in which the border paints if border-fit is set.
void adjustForBorderFit(LayoutUnit x, LayoutUnit& left, LayoutUnit& right) const;
Modified: trunk/Source/WebKit/ios/ChangeLog (176911 => 176912)
--- trunk/Source/WebKit/ios/ChangeLog 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-12-06 21:23:57 UTC (rev 176912)
@@ -1,3 +1,15 @@
+2014-12-06 Anders Carlsson <[email protected]>
+
+ Fix build with newer versions of clang.
+ rdar://problem/18978687
+
+ Cast the result of +alloc to the right type.
+
+ * Misc/WebGeolocationCoreLocationProvider.mm:
+ (-[WebGeolocationCoreLocationProvider createLocationManager]):
+ * WebCoreSupport/WebSelectionRect.m:
+ (+[WebSelectionRect selectionRect]):
+
2014-11-20 Benjamin Poulain <[email protected]>
Remove the remaining vestiges of minimal-ui
Modified: trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm (176911 => 176912)
--- trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm 2014-12-06 21:23:57 UTC (rev 176912)
@@ -65,10 +65,8 @@
{
ASSERT(!_locationManager);
-#define CLLocationManager getCLLocationManagerClass()
- _locationManager = adoptNS([[CLLocationManager alloc] init]);
- _lastAuthorizationStatus = [CLLocationManager authorizationStatus];
-#undef CLLocationManager
+ _locationManager = adoptNS([(CLLocationManager *)[getCLLocationManagerClass() alloc] init]);
+ _lastAuthorizationStatus = [getCLLocationManagerClass() authorizationStatus];
[ _locationManager setDelegate:self];
}
Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.m (176911 => 176912)
--- trunk/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.m 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.m 2014-12-06 21:23:57 UTC (rev 176912)
@@ -41,7 +41,7 @@
+ (WebSelectionRect *)selectionRect
{
- return [[[self alloc] init] autorelease];
+ return [[(WebSelectionRect *)[self alloc] init] autorelease];
}
+ (CGRect)startEdge:(NSArray *)rects
Modified: trunk/Source/WebKit/mac/ChangeLog (176911 => 176912)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-06 21:23:57 UTC (rev 176912)
@@ -1,3 +1,20 @@
+2014-12-06 Anders Carlsson <[email protected]>
+
+ Fix build with newer versions of clang.
+ rdar://problem/18978687
+
+ Add missing overrides and missing casts.
+
+ * Storage/WebDatabaseManagerClient.h:
+ * Storage/WebStorageTrackerClient.h:
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebInspectorClient.h:
+ * WebView/WebDataSource.mm:
+ (-[WebDataSource _makeRepresentation]):
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView _makeDocumentViewForDataSource:]):
+
2014-12-05 Tim Horton <[email protected]>
Legacy WebKit should set deviceScaleFactor in _commonInitializationWithFrameName, not _initWithFrame
Modified: trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.h (176911 => 176912)
--- trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/mac/Storage/WebDatabaseManagerClient.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -32,8 +32,8 @@
static WebDatabaseManagerClient* sharedWebDatabaseManagerClient();
virtual ~WebDatabaseManagerClient();
- virtual void dispatchDidModifyOrigin(WebCore::SecurityOrigin*);
- virtual void dispatchDidModifyDatabase(WebCore::SecurityOrigin*, const WTF::String& databaseIdentifier);
+ virtual void dispatchDidModifyOrigin(WebCore::SecurityOrigin*) override;
+ virtual void dispatchDidModifyDatabase(WebCore::SecurityOrigin*, const WTF::String& databaseIdentifier) override;
#if PLATFORM(IOS)
virtual void dispatchDidAddNewOrigin(WebCore::SecurityOrigin*) override;
virtual void dispatchDidDeleteDatabase() override;
Modified: trunk/Source/WebKit/mac/Storage/WebStorageTrackerClient.h (176911 => 176912)
--- trunk/Source/WebKit/mac/Storage/WebStorageTrackerClient.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/mac/Storage/WebStorageTrackerClient.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -34,7 +34,7 @@
static void dispatchDidModifyOriginOnMainThread(void* context);
virtual ~WebStorageTrackerClient();
- virtual void dispatchDidModifyOrigin(const String& originIdentifier);
+ virtual void dispatchDidModifyOrigin(const String& originIdentifier) override;
virtual void dispatchDidModifyOrigin(PassRefPtr<SecurityOrigin>);
private:
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (176911 => 176912)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -166,7 +166,7 @@
virtual void setNeedsOneShotDrawingSynchronization() override;
virtual void scheduleCompositingLayerFlush() override;
- virtual CompositingTriggerFlags allowedCompositingTriggers() const
+ virtual CompositingTriggerFlags allowedCompositingTriggers() const override
{
return static_cast<CompositingTriggerFlags>(
ThreeDTransformTrigger |
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (176911 => 176912)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -119,7 +119,7 @@
virtual WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;
virtual void dispatchShow() override;
- virtual void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction);
+ virtual void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) override;
virtual void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName, WebCore::FramePolicyFunction) override;
virtual void dispatchDecidePolicyForNavigationAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, WebCore::FramePolicyFunction) override;
virtual void cancelPolicyCheck() override;
@@ -225,15 +225,15 @@
NSDictionary *actionDictionary(const WebCore::NavigationAction&, PassRefPtr<WebCore::FormState>) const;
- virtual bool canCachePage() const;
+ virtual bool canCachePage() const override;
- virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext();
+ virtual PassRefPtr<WebCore::FrameNetworkingContext> createNetworkingContext() override;
#if ENABLE(REQUEST_AUTOCOMPLETE)
virtual void didRequestAutocomplete(PassRefPtr<WebCore::FormState>) override { }
#endif
- virtual bool shouldPaintBrokenImage(const WebCore::URL&) const;
+ virtual bool shouldPaintBrokenImage(const WebCore::URL&) const override;
#if USE(QUICK_LOOK)
virtual void didCreateQuickLookHandle(WebCore::QuickLookHandle&) override;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h (176911 => 176912)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2014-12-06 21:23:57 UTC (rev 176912)
@@ -110,22 +110,22 @@
void attachAvailabilityChanged(bool);
- virtual void frontendLoaded();
+ virtual void frontendLoaded() override;
- virtual String localizedStringsURL();
+ virtual String localizedStringsURL() override;
- virtual void bringToFront();
- virtual void closeWindow();
+ virtual void bringToFront() override;
+ virtual void closeWindow() override;
virtual void disconnectFromBackend();
- virtual void attachWindow(DockSide);
- virtual void detachWindow();
+ virtual void attachWindow(DockSide) override;
+ virtual void detachWindow() override;
- virtual void setAttachedWindowHeight(unsigned height);
- virtual void setAttachedWindowWidth(unsigned height);
+ virtual void setAttachedWindowHeight(unsigned height) override;
+ virtual void setAttachedWindowWidth(unsigned height) override;
virtual void setToolbarHeight(unsigned) override;
- virtual void inspectedURLChanged(const String& newURL);
+ virtual void inspectedURLChanged(const String& newURL) override;
private:
void updateWindowTitle() const;
Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (176911 => 176912)
--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-12-06 21:23:57 UTC (rev 176912)
@@ -382,7 +382,7 @@
// Check if the data source was already bound?
if (![[self representation] isKindOfClass:repClass]) {
- id newRep = repClass != nil ? [[repClass alloc] init] : nil;
+ id newRep = repClass != nil ? [(NSObject *)[repClass alloc] init] : nil;
[self _setRepresentation:(id <WebDocumentRepresentation>)newRep];
[newRep release];
}
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (176911 => 176912)
--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2014-12-06 21:10:23 UTC (rev 176911)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2014-12-06 21:23:57 UTC (rev 176912)
@@ -211,7 +211,7 @@
if (dataSourceRepresentation && [dataSourceRepresentation class] == viewClass)
documentView = (NSView <WebDocumentView> *)[dataSourceRepresentation retain];
else
- documentView = [[viewClass alloc] init];
+ documentView = [(NSView <WebDocumentView> *)[viewClass alloc] init];
} else
documentView = nil;
