Diff
Modified: trunk/Source/WebCore/ChangeLog (126476 => 126477)
--- trunk/Source/WebCore/ChangeLog 2012-08-23 20:50:18 UTC (rev 126476)
+++ trunk/Source/WebCore/ChangeLog 2012-08-23 20:50:23 UTC (rev 126477)
@@ -1,3 +1,26 @@
+2012-08-23 Mark Rowe <[email protected]>
+
+ Make WebCore build with the latest version of clang.
+
+ Reviewed by Dan Bernstein.
+
+ * html/shadow/MediaControlRootElement.h: Remove m_textTrackDisplay as it is unused.
+ * platform/audio/mac/AudioFileReaderMac.cpp:
+ (WebCore::AudioFileReader::AudioFileReader): Remove m_filePath as it is unused.
+ * platform/audio/mac/AudioFileReaderMac.h:
+ (AudioFileReader): Ditto.
+ * platform/graphics/ImageSource.h:
+ (ImageSource): Guard m_alphaOption and m_gammaAndColorProfileOption with !USE(CG)
+ as they're unused on platforms using CG.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ (MediaPlayerPrivateAVFoundationObjC): Remove m_player as it is unused.
+ * platform/graphics/cg/ImageSourceCG.cpp:
+ (WebCore::ImageSource::ImageSource): Don't initialize the m_alphaOption and
+ m_gammaAndColorProfileOption members since we never use them.
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate): Remove m_graphicsContext3D
+ as it is unused.
+
2012-08-23 Alexandre Elias <[email protected]>
[chromium] Rename LayerRendererChromium to GL-specific name
Modified: trunk/Source/WebCore/html/shadow/MediaControlRootElement.h (126476 => 126477)
--- trunk/Source/WebCore/html/shadow/MediaControlRootElement.h 2012-08-23 20:50:18 UTC (rev 126476)
+++ trunk/Source/WebCore/html/shadow/MediaControlRootElement.h 2012-08-23 20:50:23 UTC (rev 126477)
@@ -152,7 +152,6 @@
MediaControlPanelElement* m_panel;
#if ENABLE(VIDEO_TRACK)
MediaControlTextTrackContainerElement* m_textDisplayContainer;
- MediaControlTextTrackDisplayElement* m_textTrackDisplay;
#endif
Timer<MediaControlRootElement> m_hideFullscreenControlsTimer;
bool m_isMouseOverControls;
Modified: trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp (126476 => 126477)
--- trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp 2012-08-23 20:50:18 UTC (rev 126476)
+++ trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp 2012-08-23 20:50:23 UTC (rev 126477)
@@ -60,7 +60,6 @@
AudioFileReader::AudioFileReader(const char* filePath)
: m_data(0)
, m_dataSize(0)
- , m_filePath(filePath)
, m_audioFileID(0)
, m_extAudioFileRef(0)
{
@@ -75,7 +74,6 @@
AudioFileReader::AudioFileReader(const void* data, size_t dataSize)
: m_data(data)
, m_dataSize(dataSize)
- , m_filePath(0)
, m_audioFileID(0)
, m_extAudioFileRef(0)
{
Modified: trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.h (126476 => 126477)
--- trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.h 2012-08-23 20:50:18 UTC (rev 126476)
+++ trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.h 2012-08-23 20:50:23 UTC (rev 126477)
@@ -57,7 +57,6 @@
const void* m_data;
size_t m_dataSize;
- const char* m_filePath;
AudioFileID m_audioFileID;
ExtAudioFileRef m_extAudioFileRef;
Modified: trunk/Source/WebCore/platform/graphics/ImageSource.h (126476 => 126477)
--- trunk/Source/WebCore/platform/graphics/ImageSource.h 2012-08-23 20:50:18 UTC (rev 126476)
+++ trunk/Source/WebCore/platform/graphics/ImageSource.h 2012-08-23 20:50:23 UTC (rev 126477)
@@ -153,8 +153,11 @@
private:
NativeImageSourcePtr m_decoder;
+
+#if !USE(CG)
AlphaOption m_alphaOption;
GammaAndColorProfileOption m_gammaAndColorProfileOption;
+#endif
#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
static unsigned s_maxPixelsPerDecodedImage;
#endif
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (126476 => 126477)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2012-08-23 20:50:18 UTC (rev 126476)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2012-08-23 20:50:23 UTC (rev 126477)
@@ -124,7 +124,6 @@
void paintWithVideoOutput(GraphicsContext*, const IntRect&);
#endif
- MediaPlayer* m_player;
RetainPtr<AVAsset> m_avAsset;
RetainPtr<AVPlayer> m_avPlayer;
RetainPtr<AVPlayerItem> m_avPlayerItem;
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp (126476 => 126477)
--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2012-08-23 20:50:18 UTC (rev 126476)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2012-08-23 20:50:23 UTC (rev 126477)
@@ -70,12 +70,10 @@
}
#endif
-ImageSource::ImageSource(ImageSource::AlphaOption alphaOption, ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption)
+ImageSource::ImageSource(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption)
: m_decoder(0)
- // FIXME: m_premultiplyAlpha is ignored in cg at the moment.
- , m_alphaOption(alphaOption)
- , m_gammaAndColorProfileOption(gammaAndColorProfileOption)
{
+ // FIXME: AlphaOption and GammaAndColorProfileOption are ignored.
}
ImageSource::~ImageSource()
Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (126476 => 126477)
--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2012-08-23 20:50:18 UTC (rev 126476)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2012-08-23 20:50:23 UTC (rev 126477)
@@ -57,15 +57,9 @@
// the restructuring in https://bugs.webkit.org/show_bug.cgi?id=66903 is done
class GraphicsContext3DPrivate {
public:
- GraphicsContext3DPrivate(GraphicsContext3D* graphicsContext3D)
- : m_graphicsContext3D(graphicsContext3D)
- {
- }
+ GraphicsContext3DPrivate(GraphicsContext3D*) { }
~GraphicsContext3DPrivate() { }
-
-private:
- GraphicsContext3D* m_graphicsContext3D; // Weak back-pointer
};
static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBits, int depthBits, bool accelerated, bool supersample, bool closest)
