diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-06 10:05:55 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-07 18:17:58 +0000 |
commit | 928cd15d3d3ab82734f49eb9d694faf59c3a0c6d (patch) | |
tree | b4ccd30048fc23f59c8f156d6a0d1060b7121f16 /Source/WebCore/platform | |
parent | be770ca621f6463339b7d15be088e1b9acd851e5 (diff) | |
download | qtwebkit-928cd15d3d3ab82734f49eb9d694faf59c3a0c6d.tar.gz |
Import WebKit commit 342c7c7c069db3ca1d09ae6c5f7d600f9b241778
Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/platform')
10 files changed, 19 insertions, 19 deletions
diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 00bcb8532..c560492fb 100644 --- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -1259,7 +1259,7 @@ FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& frect, RoundingM return FloatRect(roundedOrigin, roundedLowerRight - roundedOrigin); } -void GraphicsContext::setPlatformShadow(const FloatSize& size, float blur, const Color& color) +void GraphicsContext::setPlatformShadow(const FloatSize& size, float, const Color&) { // Qt doesn't support shadows natively, they are drawn manually in the draw* // functions @@ -1583,7 +1583,8 @@ void GraphicsContext::setURLForRect(const URL& url, const IntRect& rect) if (p->paintEngine()->type() == QPaintEngine::Pdf) static_cast<QPdfEngine *>(p->paintEngine())->drawHyperlink(p->worldTransform().mapRect(rect), url); #else - notImplemented(); + UNUSED_PARAM(url); + UNUSED_PARAM(rect); #endif } diff --git a/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h b/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h index bf577344b..fc3121271 100644 --- a/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h +++ b/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.h @@ -62,7 +62,7 @@ private: void markIsInUse() { m_lastUsedTime = monotonicallyIncreasingTime(); } RefPtr<BitmapTexture> m_texture; - double m_lastUsedTime; + double m_lastUsedTime { 0.0 }; }; void scheduleReleaseUnusedTextures(); diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h index 1664cffe7..133f3522b 100644 --- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h +++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h @@ -251,7 +251,7 @@ private: #endif Timer m_animationStartedTimer; TextureMapperAnimations m_animations; - double m_lastAnimationStartTime; + double m_lastAnimationStartTime { 0.0 }; ScrollableArea* m_scrollableArea; }; diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h index 84e7b274c..5859857f7 100644 --- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h +++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h @@ -131,9 +131,7 @@ struct CoordinatedGraphicsLayerState { , replica(InvalidCoordinatedLayerID) , mask(InvalidCoordinatedLayerID) , imageID(InvalidCoordinatedImageBackingID) -#if USE(GRAPHICS_SURFACE) - , platformLayerFrontBuffer(0) -#endif + , repaintCount(0) #if USE(COORDINATED_GRAPHICS_THREADED) , platformLayerProxy(0) #endif @@ -167,7 +165,7 @@ struct CoordinatedGraphicsLayerState { #if USE(GRAPHICS_SURFACE) IntSize platformLayerSize; GraphicsSurfaceToken platformLayerToken; - uint32_t platformLayerFrontBuffer; + uint32_t platformLayerFrontBuffer { 0 }; GraphicsSurface::Flags platformLayerSurfaceFlags; #endif diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h b/Source/WebCore/platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h index 38c72e370..0e749be93 100644 --- a/Source/WebCore/platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h +++ b/Source/WebCore/platform/graphics/texmap/coordinated/SurfaceUpdateInfo.h @@ -35,7 +35,7 @@ public: IntRect updateRect; // The id of the update atlas including the shareable bitmap containing the updates. - uint32_t atlasID; + uint32_t atlasID { 0 }; // The offset in the bitmap where the rendered contents are. IntPoint surfaceOffset; diff --git a/Source/WebCore/platform/network/MIMESniffing.cpp b/Source/WebCore/platform/network/MIMESniffing.cpp index 27aefcbcf..7f05a9a97 100644 --- a/Source/WebCore/platform/network/MIMESniffing.cpp +++ b/Source/WebCore/platform/network/MIMESniffing.cpp @@ -331,7 +331,8 @@ static inline const char* findSimpleMIMEType(const char* data, size_t dataSize, return 0; } -bool isTypeInList(const char* type, const MagicNumbers* types, size_t typesCount) +#if !ASSERT_DISABLED +static bool isTypeInList(const char* type, const MagicNumbers* types, size_t typesCount) { for (size_t i = 0; i < typesCount; ++i) { if (!strcmp(type, types[i].mimeType)) @@ -339,6 +340,7 @@ bool isTypeInList(const char* type, const MagicNumbers* types, size_t typesCount } return false; } +#endif // http://tools.ietf.org/html/draft-abarth-mime-sniff-06#page-8 static const char* internalTextOrBinaryTypeSniffingProcedure(const char* data, size_t dataSize) diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index 211cf892a..951873190 100644 --- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -92,10 +92,9 @@ void FormDataIODevice::prepareFormElements() } -qint64 FormDataIODevice::computeSize() +qint64 FormDataIODevice::computeSize() { - for (int i = 0; i < m_formElements.size(); ++i) { - const FormDataElement& element = m_formElements[i]; + for (const auto& element : m_formElements) { if (element.m_type == FormDataElement::Type::Data) m_dataSize += element.m_data.size(); else { diff --git a/Source/WebCore/platform/qt/LocalizedStringsQt.cpp b/Source/WebCore/platform/qt/LocalizedStringsQt.cpp index 8c4e4ee15..24e1ca22b 100644 --- a/Source/WebCore/platform/qt/LocalizedStringsQt.cpp +++ b/Source/WebCore/platform/qt/LocalizedStringsQt.cpp @@ -760,25 +760,25 @@ String validationMessagePatternMismatchText() return String(); } -String validationMessageTooLongText(int valueLength, int maxLength) +String validationMessageTooLongText(int, int) { notImplemented(); return String(); } -String validationMessageRangeUnderflowText(const String& minimum) +String validationMessageRangeUnderflowText(const String&) { notImplemented(); return String(); } -String validationMessageRangeOverflowText(const String& maximum) +String validationMessageRangeOverflowText(const String&) { notImplemented(); return String(); } -String validationMessageStepMismatchText(const String& base, const String& step) +String validationMessageStepMismatchText(const String&, const String&) { notImplemented(); return String(); diff --git a/Source/WebCore/platform/qt/PasteboardQt.cpp b/Source/WebCore/platform/qt/PasteboardQt.cpp index fc7011094..2bc766782 100644 --- a/Source/WebCore/platform/qt/PasteboardQt.cpp +++ b/Source/WebCore/platform/qt/PasteboardQt.cpp @@ -380,7 +380,7 @@ Vector<String> Pasteboard::readFilenames() } #if ENABLE(DRAG_SUPPORT) -void Pasteboard::setDragImage(DragImageRef, const IntPoint& hotSpot) +void Pasteboard::setDragImage(DragImageRef, const IntPoint&) { notImplemented(); } diff --git a/Source/WebCore/platform/text/LineEnding.cpp b/Source/WebCore/platform/text/LineEnding.cpp index 28db166e4..c350dc1d0 100644 --- a/Source/WebCore/platform/text/LineEnding.cpp +++ b/Source/WebCore/platform/text/LineEnding.cpp @@ -59,7 +59,7 @@ public: return reinterpret_cast<uint8_t*>(ptr); } - virtual void copy(const CString& source) + void copy(const CString& source) override { m_buffer = source; } |