<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192140] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192140">192140</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-11-07 23:17:53 -0800 (Sat, 07 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove ColorSpace argument to all the drawing calls
https://bugs.webkit.org/show_bug.cgi?id=150967
Reviewed by Darin Adler.
Source/WebCore:
Since the -webkit-color-correction CSS property was removed in <a href="http://trac.webkit.org/projects/webkit/changeset/188202">r188202</a>, and ColorSpaceDeviceRGB
and ColorSpaceSRGB are functionally equivalent, we can remove all the ColorSpace arguments passed
to drawing functions, and remove RenderStyle::colorSpace(), which was hardcoded to return ColorSpaceSRGB.
Fill and stroke ColorSpaces are also remove from graphics state, simplifying color save/restore.
* bindings/scripts/CodeGeneratorObjC.pm:
(GenerateImplementation):
* css/CSSFilterImageValue.cpp:
(WebCore::CSSFilterImageValue::image):
* editing/FrameSelection.cpp:
(WebCore::CaretBase::paintCaret):
* editing/cocoa/HTMLConverter.mm:
(_platformColor):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::paint):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::clearRect):
(WebCore::CanvasRenderingContext2D::applyShadow):
(WebCore::CanvasRenderingContext2D::drawImage):
(WebCore::CanvasRenderingContext2D::compositeBuffer):
(WebCore::drawImageToContext):
(WebCore::CanvasRenderingContext2D::fullCanvasCompositedDrawImage):
(WebCore::CanvasRenderingContext2D::drawTextInternal):
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/CanvasStyle.cpp:
(WebCore::CanvasStyle::applyStrokeColor):
(WebCore::CanvasStyle::applyFillColor):
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::drawImageIntoBuffer):
* page/DebugPageOverlays.cpp:
(WebCore::RegionOverlay::drawRect):
* page/FrameView.cpp:
(WebCore::FrameView::paintScrollCorner):
(WebCore::FrameView::paintScrollbar):
(WebCore::FrameView::paintContents):
* page/PrintContext.cpp:
(WebCore::PrintContext::spoolAllPagesWithBoundaries):
* platform/ScrollView.cpp:
(WebCore::ScrollView::paintPanScrollIcon):
* platform/ScrollbarTheme.h:
(WebCore::ScrollbarTheme::defaultPaintScrollCorner):
* platform/ScrollbarThemeComposite.cpp:
(WebCore::ScrollbarThemeComposite::paintScrollCorner):
(WebCore::ScrollbarThemeComposite::paintOverhangAreas):
* platform/Theme.cpp:
(WebCore::Theme::drawNamedImage):
* platform/cocoa/ThemeCocoa.cpp:
(WebCore::ThemeCocoa::drawNamedImage):
* platform/graphics/BitmapImage.cpp:
(WebCore::BitmapImage::drawPattern):
* platform/graphics/BitmapImage.h:
* platform/graphics/Color.h:
* platform/graphics/CrossfadeGeneratedImage.cpp:
(WebCore::drawCrossfadeSubimage):
(WebCore::CrossfadeGeneratedImage::draw):
(WebCore::CrossfadeGeneratedImage::drawPattern):
* platform/graphics/CrossfadeGeneratedImage.h:
* platform/graphics/GeneratedImage.h:
* platform/graphics/GradientImage.cpp:
(WebCore::GradientImage::draw):
(WebCore::GradientImage::drawPattern):
* platform/graphics/GradientImage.h:
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::drawRaisedEllipse):
(WebCore::GraphicsContext::setStrokeColor):
(WebCore::GraphicsContext::setShadow):
(WebCore::GraphicsContext::setLegacyShadow):
(WebCore::GraphicsContext::getShadow):
(WebCore::GraphicsContext::setFillColor):
(WebCore::GraphicsContext::drawImage):
(WebCore::GraphicsContext::drawTiledImage):
(WebCore::GraphicsContext::drawImageBuffer):
(WebCore::GraphicsContext::fillRect):
(WebCore::GraphicsContext::fillRoundedRect):
(WebCore::GraphicsContext::fillRectWithRoundedHole):
(WebCore::GraphicsContext::clearShadow): Deleted.
* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContext::strokeColorSpace): Deleted.
(WebCore::GraphicsContext::fillColorSpace): Deleted.
* platform/graphics/Image.cpp:
(WebCore::Image::fillWithSolidColor):
(WebCore::Image::drawTiled):
* platform/graphics/Image.h:
(WebCore::Image::drawFrameMatchingSourceSize):
* platform/graphics/ImageBuffer.h:
(WebCore::ImageBuffer::create):
* platform/graphics/NamedImageGeneratedImage.cpp:
(WebCore::NamedImageGeneratedImage::draw):
(WebCore::NamedImageGeneratedImage::drawPattern):
* platform/graphics/NamedImageGeneratedImage.h:
* platform/graphics/ShadowBlur.cpp:
(WebCore::ScratchBuffer::setCachedShadowValues):
(WebCore::ScratchBuffer::setCachedInsetShadowValues):
(WebCore::ShadowBlur::ShadowBlur):
(WebCore::ShadowBlur::setShadowValues):
(WebCore::ShadowBlur::drawShadowBuffer):
(WebCore::ShadowBlur::drawRectShadowWithoutTiling):
(WebCore::ShadowBlur::drawInsetShadowWithoutTiling):
(WebCore::ShadowBlur::drawInsetShadowWithTiling):
(WebCore::ShadowBlur::drawRectShadowWithTiling):
(WebCore::ShadowBlur::drawLayerPieces):
(WebCore::ShadowBlur::blurAndColorShadowBuffer):
(WebCore::ShadowBlur::beginShadowLayer):
(WebCore::ShadowBlur::endShadowLayer):
* platform/graphics/ShadowBlur.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setContentsToImage): Deleted.
* platform/graphics/ca/TileGrid.cpp:
(WebCore::TileGrid::platformCALayerPaintContents):
* platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
(PlatformCALayerWinInternal::drawRepaintCounters):
* platform/graphics/cairo/BitmapImageCairo.cpp:
(WebCore::BitmapImage::draw):
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::fillRect):
(WebCore::GraphicsContext::setPlatformFillColor):
(WebCore::GraphicsContext::setPlatformStrokeColor):
(WebCore::GraphicsContext::setPlatformShadow):
(WebCore::GraphicsContext::platformFillRoundedRect):
(WebCore::GraphicsContext::fillRectWithRoundedHole):
(WebCore::GraphicsContext::drawPattern):
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::draw):
(WebCore::ImageBuffer::drawPattern):
* platform/graphics/cairo/ImageCairo.cpp:
(WebCore::Image::drawPattern):
* platform/graphics/cg/BitmapImageCG.cpp:
(WebCore::BitmapImage::draw):
* platform/graphics/cg/ColorCG.cpp:
(WebCore::leakCGColor):
(WebCore::cachedCGColor):
* platform/graphics/cg/GraphicsContext3DCG.cpp:
(WebCore::GraphicsContext3D::paintToCanvas):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::setCGFillColor):
(WebCore::setCGStrokeColor):
(WebCore::GraphicsContext::platformInit):
(WebCore::GraphicsContext::drawNativeImage):
(WebCore::GraphicsContext::drawPattern):
(WebCore::GraphicsContext::drawRect):
(WebCore::GraphicsContext::drawLine):
(WebCore::GraphicsContext::applyFillPattern):
(WebCore::GraphicsContext::fillRect):
(WebCore::GraphicsContext::platformFillRoundedRect):
(WebCore::GraphicsContext::fillRectWithRoundedHole):
(WebCore::GraphicsContext::setPlatformShadow):
(WebCore::GraphicsContext::drawLinesForText):
(WebCore::GraphicsContext::setPlatformStrokeColor):
(WebCore::GraphicsContext::setPlatformFillColor):
(WebCore::sRGBColorSpaceRef): Deleted.
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::copyImage):
(WebCore::ImageBuffer::draw):
(WebCore::ImageBuffer::drawPattern):
* platform/graphics/cg/ImageCG.cpp:
(WebCore::Image::drawPattern):
(WebCore::Image::imageWithColorSpace): Deleted.
* platform/graphics/cg/PDFDocumentImage.cpp:
(WebCore::PDFDocumentImage::draw):
* platform/graphics/cg/PDFDocumentImage.h:
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::FontCascade::drawGlyphs):
* platform/graphics/filters/FEBlend.cpp:
(WebCore::FEBlend::platformApplySoftware):
* platform/graphics/filters/FEColorMatrix.cpp:
(WebCore::FEColorMatrix::platformApplySoftware):
* platform/graphics/filters/FEComposite.cpp:
(WebCore::FEComposite::platformApplySoftware):
* platform/graphics/filters/FEDropShadow.cpp:
(WebCore::FEDropShadow::platformApplySoftware):
* platform/graphics/filters/FEFlood.cpp:
(WebCore::FEFlood::platformApplySoftware):
* platform/graphics/filters/FEMerge.cpp:
(WebCore::FEMerge::platformApplySoftware):
* platform/graphics/filters/FEOffset.cpp:
(WebCore::FEOffset::platformApplySoftware):
* platform/graphics/filters/FETile.cpp:
(WebCore::FETile::platformApplySoftware):
* platform/graphics/filters/SourceAlpha.cpp:
(WebCore::SourceAlpha::platformApplySoftware):
* platform/graphics/filters/SourceGraphic.cpp:
(WebCore::SourceGraphic::platformApplySoftware):
* platform/graphics/ios/IconIOS.mm:
(WebCore::Icon::paint):
* platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:
* platform/graphics/texmap/coordinated/UpdateAtlas.cpp:
* platform/graphics/win/FontCGWin.cpp:
(WebCore::FontCascade::drawGlyphs):
* platform/graphics/win/GraphicsContextCGWin.cpp:
(WebCore::GraphicsContext::drawFocusRing):
* platform/graphics/win/ImageCGWin.cpp:
(WebCore::BitmapImage::getHBITMAPOfSize):
(WebCore::BitmapImage::drawFrameMatchingSourceSize):
* platform/graphics/win/ImageCairoWin.cpp:
(WebCore::BitmapImage::getHBITMAPOfSize):
(WebCore::BitmapImage::drawFrameMatchingSourceSize):
* platform/ios/LegacyTileCache.mm:
(WebCore::LegacyTileCache::drawLayer):
* platform/ios/LegacyTileGridTile.mm:
(WebCore::LegacyTileGridTile::showBorder):
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(WebVideoFullscreenControllerContext::didSetupFullscreen):
* platform/mac/DragImageMac.mm:
(WebCore::drawAtPoint):
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::setUpOverhangAreaBackground):
* platform/mac/ThemeMac.mm:
(WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext):
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::paintCurrentFrameInContext):
* platform/mock/ScrollbarThemeMock.cpp:
(WebCore::ScrollbarThemeMock::paintTrackBackground):
(WebCore::ScrollbarThemeMock::paintThumb):
* platform/win/DragImageWin.cpp:
(WebCore::createDragImageForLink):
* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenuWin::paint):
* platform/win/WebCoreTextRenderer.cpp:
(WebCore::doDrawTextAtPoint):
* rendering/EllipsisBox.cpp:
(WebCore::EllipsisBox::paint):
(WebCore::EllipsisBox::paintSelection):
* rendering/FilterEffectRenderer.cpp:
(WebCore::FilterEffectRendererHelper::applyFilterEffect):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintSelection):
(WebCore::InlineTextBox::paintCompositionBackground):
(WebCore::InlineTextBox::paintDecoration):
(WebCore::InlineTextBox::paintTextMatchMarker):
(WebCore::InlineTextBox::paintCompositionUnderline):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::blockSelectionGap):
(WebCore::RenderBlock::logicalLeftSelectionGap):
(WebCore::RenderBlock::logicalRightSelectionGap):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintClippingMask):
* rendering/RenderBoxModelObject.cpp:
(WebCore::applyBoxShadowForBackground):
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::paintBorder):
(WebCore::RenderBoxModelObject::drawBoxSideFromPath):
(WebCore::RenderBoxModelObject::paintBoxShadow):
* rendering/RenderDetailsMarker.cpp:
(WebCore::RenderDetailsMarker::paint):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::drawLineForBoxSide):
(WebCore::RenderElement::paintOutline):
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::paintSnapshotImage):
(WebCore::RenderEmbeddedObject::paintReplaced):
* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::paintObject):
* rendering/RenderFrameSet.cpp:
(WebCore::RenderFrameSet::paintColumnBorder):
(WebCore::RenderFrameSet::paintRowBorder):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::paintReplaced):
(WebCore::RenderImage::paintIntoRect):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::beginTransparencyLayers):
(WebCore::RenderLayer::paintScrollCorner):
(WebCore::RenderLayer::drawPlatformResizerImage):
(WebCore::RenderLayer::paintResizer):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::paintItemForeground):
(WebCore::RenderListBox::paintItemBackground):
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::paint):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::paint):
* rendering/RenderScrollbarTheme.cpp:
(WebCore::RenderScrollbarTheme::paintScrollCorner):
* rendering/RenderSnapshottedPlugIn.cpp:
(WebCore::RenderSnapshottedPlugIn::paintSnapshot):
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::paintSliderTicks):
* rendering/RenderThemeIOS.mm:
(WebCore::drawAxialGradient):
(WebCore::drawRadialGradient):
(WebCore::RenderThemeIOS::paintCheckboxDecorations):
(WebCore::RenderThemeIOS::paintRadioDecorations):
(WebCore::RenderThemeIOS::paintMenuListButtonDecorations):
(WebCore::RenderThemeIOS::paintSliderTrack):
(WebCore::RenderThemeIOS::paintProgressBar):
(WebCore::RenderThemeIOS::paintFileUploadIconDecorations):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintProgressBar):
(WebCore::RenderThemeMac::paintMenuListButtonDecorations):
(WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):
(WebCore::titleTextColorForAttachment):
(WebCore::AttachmentLayout::layOutSubtitle):
(WebCore::paintAttachmentIconBackground):
(WebCore::paintAttachmentTitleBackground):
(WebCore::paintAttachmentProgress):
* rendering/RenderView.cpp:
(WebCore::RenderView::paint):
(WebCore::RenderView::paintBoxDecorations):
* rendering/RenderWidget.cpp:
(WebCore::RenderWidget::paint):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::lineSelectionGap):
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintDebugBorders):
* rendering/TextPaintStyle.cpp:
(WebCore::TextPaintStyle::TextPaintStyle):
(WebCore::adjustColorForVisibilityOnBackground):
(WebCore::computeTextPaintStyle):
(WebCore::updateGraphicsContext):
* rendering/TextPaintStyle.h:
(WebCore::TextPaintStyle::TextPaintStyle):
* rendering/TextPainter.cpp:
(WebCore::ShadowApplier::ShadowApplier):
(WebCore::paintTextWithShadows):
* rendering/mathml/RenderMathMLBlock.cpp:
(WebCore::RenderMathMLBlock::paint):
* rendering/mathml/RenderMathMLFraction.cpp:
(WebCore::RenderMathMLFraction::paint):
* rendering/mathml/RenderMathMLMenclose.cpp:
(WebCore::RenderMathMLMenclose::paint):
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::paint):
* rendering/mathml/RenderMathMLRadicalOperator.cpp:
(WebCore::RenderMathMLRadicalOperator::paint):
* rendering/mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRoot::paint):
* rendering/shapes/Shape.cpp:
(WebCore::Shape::createRasterShape):
* rendering/style/NinePieceImage.cpp:
(WebCore::NinePieceImage::paint):
* rendering/style/RenderStyle.h:
* rendering/svg/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::paintForeground):
* rendering/svg/RenderSVGPath.cpp:
(WebCore::useStrokeStyleToFill):
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::postApplyResource):
* rendering/svg/RenderSVGResourceSolidColor.cpp:
(WebCore::RenderSVGResourceSolidColor::applyResource):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::paintSelectionBackground):
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::prepareToRenderSVGContent):
(WebCore::SVGRenderingContext::bufferForeground):
* svg/SVGAnimatedColor.cpp:
(WebCore::SVGAnimatedColorAnimator::calculateAnimatedValue):
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::drawForContainer):
(WebCore::SVGImage::nativeImageForCurrentFrame):
(WebCore::SVGImage::drawPatternForContainer):
(WebCore::SVGImage::draw):
* svg/graphics/SVGImage.h:
* svg/graphics/SVGImageForContainer.cpp:
(WebCore::SVGImageForContainer::draw):
(WebCore::SVGImageForContainer::drawPattern):
* svg/graphics/SVGImageForContainer.h:
* svg/graphics/filters/SVGFEImage.cpp:
(WebCore::FEImage::platformApplySoftware):
* testing/MockPageOverlayClient.cpp:
(WebCore::MockPageOverlayClient::drawRect):
Source/WebKit/ios:
Since the -webkit-color-correction CSS property was removed in <a href="http://trac.webkit.org/projects/webkit/changeset/188202">r188202</a>, and ColorSpaceDeviceRGB
and ColorSpaceSRGB are functionally equivalent, we can remove all the ColorSpace arguments passed
to drawing functions, and remove RenderStyle::colorSpace(), which was hardcoded to return ColorSpaceSRGB.
* WebView/WebPDFViewIOS.mm:
(-[WebPDFView drawPage:]):
* WebView/WebPlainWhiteView.mm:
Source/WebKit/mac:
Since the -webkit-color-correction CSS property was removed in <a href="http://trac.webkit.org/projects/webkit/changeset/188202">r188202</a>, and ColorSpaceDeviceRGB
and ColorSpaceSRGB are functionally equivalent, we can remove all the ColorSpace arguments passed
to drawing functions, and remove RenderStyle::colorSpace(), which was hardcoded to return ColorSpaceSRGB.
* Misc/WebKitNSStringExtras.mm:
(-[NSString _web_drawAtPoint:font:textColor:allowingFontSmoothing:]):
* WebInspector/WebNodeHighlightView.mm:
(-[WebNodeHighlightView _layoutForNodeHighlight:parent:]):
(-[WebNodeHighlightView _layoutForRectsHighlight:parent:]):
* WebView/WebFrame.mm:
(-[WebFrame _bodyBackgroundColor]):
* WebView/WebFrameView.mm:
(-[WebFrameView drawRect:]):
* WebView/WebIndicateLayer.mm:
Source/WebKit2:
* Shared/API/c/cg/WKImageCG.cpp:
(WKImageCreateFromCGImage):
* Shared/ContextMenuContextData.cpp:
(WebKit::ContextMenuContextData::ContextMenuContextData):
* Shared/WebCoreArgumentCoders.cpp:
(IPC::encodeImage):
* Shared/mac/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::drawInContext):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _updateScrollViewBackground]):
* UIProcess/WKInspectorHighlightView.mm:
(-[WKInspectorHighlightView _layoutForNodeHighlight:offset:]):
(-[WKInspectorHighlightView _layoutForRectsHighlight:]):
* UIProcess/ios/ViewGestureControllerIOS.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _updateTapHighlight]):
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
* WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::drawRect):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::createSelectionSnapshot):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::snapshotAtSize):
* WebProcess/WebPage/ios/FindControllerIOS.mm:
(WebKit::FindIndicatorOverlayClientIOS::drawRect):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):
* WebProcess/ios/WebVideoFullscreenManager.mm:
(WebKit::WebVideoFullscreenManager::didSetupFullscreen):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasStylecpp">trunk/Source/WebCore/html/canvas/CanvasStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDebugPageOverlayscpp">trunk/Source/WebCore/page/DebugPageOverlays.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePrintContextcpp">trunk/Source/WebCore/page/PrintContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarThemeh">trunk/Source/WebCore/platform/ScrollbarTheme.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarThemeCompositecpp">trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformThemecpp">trunk/Source/WebCore/platform/Theme.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaThemeCocoacpp">trunk/Source/WebCore/platform/cocoa/ThemeCocoa.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImagecpp">trunk/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImageh">trunk/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp">trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImageh">trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGeneratedImageh">trunk/Source/WebCore/platform/graphics/GeneratedImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientImagecpp">trunk/Source/WebCore/platform/graphics/GradientImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientImageh">trunk/Source/WebCore/platform/graphics/GradientImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImagecpp">trunk/Source/WebCore/platform/graphics/Image.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageh">trunk/Source/WebCore/platform/graphics/Image.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsNamedImageGeneratedImagecpp">trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsNamedImageGeneratedImageh">trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurh">trunk/Source/WebCore/platform/graphics/ShadowBlur.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileGridcpp">trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalcpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoBitmapImageCairocpp">trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgBitmapImageCGcpp">trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgColorCGcpp">trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContext3DCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPDFDocumentImagecpp">trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPDFDocumentImageh">trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFEBlendcpp">trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFEColorMatrixcpp">trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFECompositecpp">trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFEDropShadowcpp">trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFEFloodcpp">trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFEMergecpp">trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFEOffsetcpp">trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFETilecpp">trunk/Source/WebCore/platform/graphics/filters/FETile.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersSourceAlphacpp">trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersSourceGraphiccpp">trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosIconIOSmm">trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedUpdateAtlascpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCGWincpp">trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGraphicsContextCGWincpp">trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGraphicsContextCairoWincpp">trunk/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageCGWincpp">trunk/Source/WebCore/platform/graphics/win/ImageCGWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinImageCairoWincpp">trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCachemm">trunk/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileGridTilemm">trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragImageMacmm">trunk/Source/WebCore/platform/mac/DragImageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollbarThemeMacmm">trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMacmm">trunk/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockScrollbarThemeMockcpp">trunk/Source/WebCore/platform/mock/ScrollbarThemeMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinDragImageWincpp">trunk/Source/WebCore/platform/win/DragImageWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWincpp">trunk/Source/WebCore/platform/win/PopupMenuWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinWebCoreTextRenderercpp">trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingEllipsisBoxcpp">trunk/Source/WebCore/rendering/EllipsisBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFilterEffectRenderercpp">trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDetailsMarkercpp">trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFileUploadControlcpp">trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFrameSetcpp">trunk/Source/WebCore/rendering/RenderFrameSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListMarkercpp">trunk/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarThemecpp">trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp">trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderWidgetcpp">trunk/Source/WebCore/rendering/RenderWidget.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxcpp">trunk/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStylecpp">trunk/Source/WebCore/rendering/TextPaintStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStyleh">trunk/Source/WebCore/rendering/TextPaintStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintercpp">trunk/Source/WebCore/rendering/TextPainter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLBlockcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFractioncpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLMenclosecpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRadicalOperatorcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRadicalOperator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRootcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapecpp">trunk/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleNinePieceImagecpp">trunk/Source/WebCore/rendering/style/NinePieceImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGImagecpp">trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGPathcpp">trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceSolidColorcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimatedColorcpp">trunk/Source/WebCore/svg/SVGAnimatedColor.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImagecpp">trunk/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageh">trunk/Source/WebCore/svg/graphics/SVGImage.h</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageForContainercpp">trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImageForContainerh">trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsfiltersSVGFEImagecpp">trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingMockPageOverlayClientcpp">trunk/Source/WebCore/testing/MockPageOverlayClient.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebViewWebPDFViewIOSmm">trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebViewWebPlainWhiteViewmm">trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitNSStringExtrasmm">trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebInspectorWebNodeHighlightViewmm">trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewmm">trunk/Source/WebKit/mac/WebView/WebFrameView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebIndicateLayermm">trunk/Source/WebKit/mac/WebView/WebIndicateLayer.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccgWKImageCGcpp">trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatacpp">trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWKInspectorHighlightViewmm">trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcesscairoBackingStoreCairocpp">trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm">trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm">trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageFindControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosFindControllerIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/FindControllerIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessiosWebVideoFullscreenManagermm">trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/ChangeLog 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1,5 +1,376 @@
</span><span class="cx"> 2015-11-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Remove ColorSpace argument to all the drawing calls
+ https://bugs.webkit.org/show_bug.cgi?id=150967
+
+ Reviewed by Darin Adler.
+
+ Since the -webkit-color-correction CSS property was removed in r188202, and ColorSpaceDeviceRGB
+ and ColorSpaceSRGB are functionally equivalent, we can remove all the ColorSpace arguments passed
+ to drawing functions, and remove RenderStyle::colorSpace(), which was hardcoded to return ColorSpaceSRGB.
+
+ Fill and stroke ColorSpaces are also remove from graphics state, simplifying color save/restore.
+
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (GenerateImplementation):
+ * css/CSSFilterImageValue.cpp:
+ (WebCore::CSSFilterImageValue::image):
+ * editing/FrameSelection.cpp:
+ (WebCore::CaretBase::paintCaret):
+ * editing/cocoa/HTMLConverter.mm:
+ (_platformColor):
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::paint):
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::clearRect):
+ (WebCore::CanvasRenderingContext2D::applyShadow):
+ (WebCore::CanvasRenderingContext2D::drawImage):
+ (WebCore::CanvasRenderingContext2D::compositeBuffer):
+ (WebCore::drawImageToContext):
+ (WebCore::CanvasRenderingContext2D::fullCanvasCompositedDrawImage):
+ (WebCore::CanvasRenderingContext2D::drawTextInternal):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasStyle.cpp:
+ (WebCore::CanvasStyle::applyStrokeColor):
+ (WebCore::CanvasStyle::applyFillColor):
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::drawImageIntoBuffer):
+ * page/DebugPageOverlays.cpp:
+ (WebCore::RegionOverlay::drawRect):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::paintScrollCorner):
+ (WebCore::FrameView::paintScrollbar):
+ (WebCore::FrameView::paintContents):
+ * page/PrintContext.cpp:
+ (WebCore::PrintContext::spoolAllPagesWithBoundaries):
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::paintPanScrollIcon):
+ * platform/ScrollbarTheme.h:
+ (WebCore::ScrollbarTheme::defaultPaintScrollCorner):
+ * platform/ScrollbarThemeComposite.cpp:
+ (WebCore::ScrollbarThemeComposite::paintScrollCorner):
+ (WebCore::ScrollbarThemeComposite::paintOverhangAreas):
+ * platform/Theme.cpp:
+ (WebCore::Theme::drawNamedImage):
+ * platform/cocoa/ThemeCocoa.cpp:
+ (WebCore::ThemeCocoa::drawNamedImage):
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::drawPattern):
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/Color.h:
+ * platform/graphics/CrossfadeGeneratedImage.cpp:
+ (WebCore::drawCrossfadeSubimage):
+ (WebCore::CrossfadeGeneratedImage::draw):
+ (WebCore::CrossfadeGeneratedImage::drawPattern):
+ * platform/graphics/CrossfadeGeneratedImage.h:
+ * platform/graphics/GeneratedImage.h:
+ * platform/graphics/GradientImage.cpp:
+ (WebCore::GradientImage::draw):
+ (WebCore::GradientImage::drawPattern):
+ * platform/graphics/GradientImage.h:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::drawRaisedEllipse):
+ (WebCore::GraphicsContext::setStrokeColor):
+ (WebCore::GraphicsContext::setShadow):
+ (WebCore::GraphicsContext::setLegacyShadow):
+ (WebCore::GraphicsContext::getShadow):
+ (WebCore::GraphicsContext::setFillColor):
+ (WebCore::GraphicsContext::drawImage):
+ (WebCore::GraphicsContext::drawTiledImage):
+ (WebCore::GraphicsContext::drawImageBuffer):
+ (WebCore::GraphicsContext::fillRect):
+ (WebCore::GraphicsContext::fillRoundedRect):
+ (WebCore::GraphicsContext::fillRectWithRoundedHole):
+ (WebCore::GraphicsContext::clearShadow): Deleted.
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContext::strokeColorSpace): Deleted.
+ (WebCore::GraphicsContext::fillColorSpace): Deleted.
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::fillWithSolidColor):
+ (WebCore::Image::drawTiled):
+ * platform/graphics/Image.h:
+ (WebCore::Image::drawFrameMatchingSourceSize):
+ * platform/graphics/ImageBuffer.h:
+ (WebCore::ImageBuffer::create):
+ * platform/graphics/NamedImageGeneratedImage.cpp:
+ (WebCore::NamedImageGeneratedImage::draw):
+ (WebCore::NamedImageGeneratedImage::drawPattern):
+ * platform/graphics/NamedImageGeneratedImage.h:
+ * platform/graphics/ShadowBlur.cpp:
+ (WebCore::ScratchBuffer::setCachedShadowValues):
+ (WebCore::ScratchBuffer::setCachedInsetShadowValues):
+ (WebCore::ShadowBlur::ShadowBlur):
+ (WebCore::ShadowBlur::setShadowValues):
+ (WebCore::ShadowBlur::drawShadowBuffer):
+ (WebCore::ShadowBlur::drawRectShadowWithoutTiling):
+ (WebCore::ShadowBlur::drawInsetShadowWithoutTiling):
+ (WebCore::ShadowBlur::drawInsetShadowWithTiling):
+ (WebCore::ShadowBlur::drawRectShadowWithTiling):
+ (WebCore::ShadowBlur::drawLayerPieces):
+ (WebCore::ShadowBlur::blurAndColorShadowBuffer):
+ (WebCore::ShadowBlur::beginShadowLayer):
+ (WebCore::ShadowBlur::endShadowLayer):
+ * platform/graphics/ShadowBlur.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setContentsToImage): Deleted.
+ * platform/graphics/ca/TileGrid.cpp:
+ (WebCore::TileGrid::platformCALayerPaintContents):
+ * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+ (PlatformCALayerWinInternal::drawRepaintCounters):
+ * platform/graphics/cairo/BitmapImageCairo.cpp:
+ (WebCore::BitmapImage::draw):
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::fillRect):
+ (WebCore::GraphicsContext::setPlatformFillColor):
+ (WebCore::GraphicsContext::setPlatformStrokeColor):
+ (WebCore::GraphicsContext::setPlatformShadow):
+ (WebCore::GraphicsContext::platformFillRoundedRect):
+ (WebCore::GraphicsContext::fillRectWithRoundedHole):
+ (WebCore::GraphicsContext::drawPattern):
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::draw):
+ (WebCore::ImageBuffer::drawPattern):
+ * platform/graphics/cairo/ImageCairo.cpp:
+ (WebCore::Image::drawPattern):
+ * platform/graphics/cg/BitmapImageCG.cpp:
+ (WebCore::BitmapImage::draw):
+ * platform/graphics/cg/ColorCG.cpp:
+ (WebCore::leakCGColor):
+ (WebCore::cachedCGColor):
+ * platform/graphics/cg/GraphicsContext3DCG.cpp:
+ (WebCore::GraphicsContext3D::paintToCanvas):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::setCGFillColor):
+ (WebCore::setCGStrokeColor):
+ (WebCore::GraphicsContext::platformInit):
+ (WebCore::GraphicsContext::drawNativeImage):
+ (WebCore::GraphicsContext::drawPattern):
+ (WebCore::GraphicsContext::drawRect):
+ (WebCore::GraphicsContext::drawLine):
+ (WebCore::GraphicsContext::applyFillPattern):
+ (WebCore::GraphicsContext::fillRect):
+ (WebCore::GraphicsContext::platformFillRoundedRect):
+ (WebCore::GraphicsContext::fillRectWithRoundedHole):
+ (WebCore::GraphicsContext::setPlatformShadow):
+ (WebCore::GraphicsContext::drawLinesForText):
+ (WebCore::GraphicsContext::setPlatformStrokeColor):
+ (WebCore::GraphicsContext::setPlatformFillColor):
+ (WebCore::sRGBColorSpaceRef): Deleted.
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::copyImage):
+ (WebCore::ImageBuffer::draw):
+ (WebCore::ImageBuffer::drawPattern):
+ * platform/graphics/cg/ImageCG.cpp:
+ (WebCore::Image::drawPattern):
+ (WebCore::Image::imageWithColorSpace): Deleted.
+ * platform/graphics/cg/PDFDocumentImage.cpp:
+ (WebCore::PDFDocumentImage::draw):
+ * platform/graphics/cg/PDFDocumentImage.h:
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::FontCascade::drawGlyphs):
+ * platform/graphics/filters/FEBlend.cpp:
+ (WebCore::FEBlend::platformApplySoftware):
+ * platform/graphics/filters/FEColorMatrix.cpp:
+ (WebCore::FEColorMatrix::platformApplySoftware):
+ * platform/graphics/filters/FEComposite.cpp:
+ (WebCore::FEComposite::platformApplySoftware):
+ * platform/graphics/filters/FEDropShadow.cpp:
+ (WebCore::FEDropShadow::platformApplySoftware):
+ * platform/graphics/filters/FEFlood.cpp:
+ (WebCore::FEFlood::platformApplySoftware):
+ * platform/graphics/filters/FEMerge.cpp:
+ (WebCore::FEMerge::platformApplySoftware):
+ * platform/graphics/filters/FEOffset.cpp:
+ (WebCore::FEOffset::platformApplySoftware):
+ * platform/graphics/filters/FETile.cpp:
+ (WebCore::FETile::platformApplySoftware):
+ * platform/graphics/filters/SourceAlpha.cpp:
+ (WebCore::SourceAlpha::platformApplySoftware):
+ * platform/graphics/filters/SourceGraphic.cpp:
+ (WebCore::SourceGraphic::platformApplySoftware):
+ * platform/graphics/ios/IconIOS.mm:
+ (WebCore::Icon::paint):
+ * platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:
+ * platform/graphics/texmap/coordinated/UpdateAtlas.cpp:
+ * platform/graphics/win/FontCGWin.cpp:
+ (WebCore::FontCascade::drawGlyphs):
+ * platform/graphics/win/GraphicsContextCGWin.cpp:
+ (WebCore::GraphicsContext::drawFocusRing):
+ * platform/graphics/win/ImageCGWin.cpp:
+ (WebCore::BitmapImage::getHBITMAPOfSize):
+ (WebCore::BitmapImage::drawFrameMatchingSourceSize):
+ * platform/graphics/win/ImageCairoWin.cpp:
+ (WebCore::BitmapImage::getHBITMAPOfSize):
+ (WebCore::BitmapImage::drawFrameMatchingSourceSize):
+ * platform/ios/LegacyTileCache.mm:
+ (WebCore::LegacyTileCache::drawLayer):
+ * platform/ios/LegacyTileGridTile.mm:
+ (WebCore::LegacyTileGridTile::showBorder):
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (WebVideoFullscreenControllerContext::didSetupFullscreen):
+ * platform/mac/DragImageMac.mm:
+ (WebCore::drawAtPoint):
+ * platform/mac/ScrollbarThemeMac.mm:
+ (WebCore::ScrollbarThemeMac::setUpOverhangAreaBackground):
+ * platform/mac/ThemeMac.mm:
+ (WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext):
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::paintCurrentFrameInContext):
+ * platform/mock/ScrollbarThemeMock.cpp:
+ (WebCore::ScrollbarThemeMock::paintTrackBackground):
+ (WebCore::ScrollbarThemeMock::paintThumb):
+ * platform/win/DragImageWin.cpp:
+ (WebCore::createDragImageForLink):
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::PopupMenuWin::paint):
+ * platform/win/WebCoreTextRenderer.cpp:
+ (WebCore::doDrawTextAtPoint):
+ * rendering/EllipsisBox.cpp:
+ (WebCore::EllipsisBox::paint):
+ (WebCore::EllipsisBox::paintSelection):
+ * rendering/FilterEffectRenderer.cpp:
+ (WebCore::FilterEffectRendererHelper::applyFilterEffect):
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintSelection):
+ (WebCore::InlineTextBox::paintCompositionBackground):
+ (WebCore::InlineTextBox::paintDecoration):
+ (WebCore::InlineTextBox::paintTextMatchMarker):
+ (WebCore::InlineTextBox::paintCompositionUnderline):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::blockSelectionGap):
+ (WebCore::RenderBlock::logicalLeftSelectionGap):
+ (WebCore::RenderBlock::logicalRightSelectionGap):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::paintClippingMask):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::applyBoxShadowForBackground):
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ (WebCore::RenderBoxModelObject::paintBorder):
+ (WebCore::RenderBoxModelObject::drawBoxSideFromPath):
+ (WebCore::RenderBoxModelObject::paintBoxShadow):
+ * rendering/RenderDetailsMarker.cpp:
+ (WebCore::RenderDetailsMarker::paint):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::drawLineForBoxSide):
+ (WebCore::RenderElement::paintOutline):
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::paintSnapshotImage):
+ (WebCore::RenderEmbeddedObject::paintReplaced):
+ * rendering/RenderFileUploadControl.cpp:
+ (WebCore::RenderFileUploadControl::paintObject):
+ * rendering/RenderFrameSet.cpp:
+ (WebCore::RenderFrameSet::paintColumnBorder):
+ (WebCore::RenderFrameSet::paintRowBorder):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::paintReplaced):
+ (WebCore::RenderImage::paintIntoRect):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::beginTransparencyLayers):
+ (WebCore::RenderLayer::paintScrollCorner):
+ (WebCore::RenderLayer::drawPlatformResizerImage):
+ (WebCore::RenderLayer::paintResizer):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::paintItemForeground):
+ (WebCore::RenderListBox::paintItemBackground):
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::paint):
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::paint):
+ * rendering/RenderScrollbarTheme.cpp:
+ (WebCore::RenderScrollbarTheme::paintScrollCorner):
+ * rendering/RenderSnapshottedPlugIn.cpp:
+ (WebCore::RenderSnapshottedPlugIn::paintSnapshot):
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::paintSliderTicks):
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::drawAxialGradient):
+ (WebCore::drawRadialGradient):
+ (WebCore::RenderThemeIOS::paintCheckboxDecorations):
+ (WebCore::RenderThemeIOS::paintRadioDecorations):
+ (WebCore::RenderThemeIOS::paintMenuListButtonDecorations):
+ (WebCore::RenderThemeIOS::paintSliderTrack):
+ (WebCore::RenderThemeIOS::paintProgressBar):
+ (WebCore::RenderThemeIOS::paintFileUploadIconDecorations):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintProgressBar):
+ (WebCore::RenderThemeMac::paintMenuListButtonDecorations):
+ (WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):
+ (WebCore::titleTextColorForAttachment):
+ (WebCore::AttachmentLayout::layOutSubtitle):
+ (WebCore::paintAttachmentIconBackground):
+ (WebCore::paintAttachmentTitleBackground):
+ (WebCore::paintAttachmentProgress):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::paint):
+ (WebCore::RenderView::paintBoxDecorations):
+ * rendering/RenderWidget.cpp:
+ (WebCore::RenderWidget::paint):
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::lineSelectionGap):
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::paintDebugBorders):
+ * rendering/TextPaintStyle.cpp:
+ (WebCore::TextPaintStyle::TextPaintStyle):
+ (WebCore::adjustColorForVisibilityOnBackground):
+ (WebCore::computeTextPaintStyle):
+ (WebCore::updateGraphicsContext):
+ * rendering/TextPaintStyle.h:
+ (WebCore::TextPaintStyle::TextPaintStyle):
+ * rendering/TextPainter.cpp:
+ (WebCore::ShadowApplier::ShadowApplier):
+ (WebCore::paintTextWithShadows):
+ * rendering/mathml/RenderMathMLBlock.cpp:
+ (WebCore::RenderMathMLBlock::paint):
+ * rendering/mathml/RenderMathMLFraction.cpp:
+ (WebCore::RenderMathMLFraction::paint):
+ * rendering/mathml/RenderMathMLMenclose.cpp:
+ (WebCore::RenderMathMLMenclose::paint):
+ * rendering/mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::paint):
+ * rendering/mathml/RenderMathMLRadicalOperator.cpp:
+ (WebCore::RenderMathMLRadicalOperator::paint):
+ * rendering/mathml/RenderMathMLRoot.cpp:
+ (WebCore::RenderMathMLRoot::paint):
+ * rendering/shapes/Shape.cpp:
+ (WebCore::Shape::createRasterShape):
+ * rendering/style/NinePieceImage.cpp:
+ (WebCore::NinePieceImage::paint):
+ * rendering/style/RenderStyle.h:
+ * rendering/svg/RenderSVGImage.cpp:
+ (WebCore::RenderSVGImage::paintForeground):
+ * rendering/svg/RenderSVGPath.cpp:
+ (WebCore::useStrokeStyleToFill):
+ * rendering/svg/RenderSVGResourceFilter.cpp:
+ (WebCore::RenderSVGResourceFilter::postApplyResource):
+ * rendering/svg/RenderSVGResourceSolidColor.cpp:
+ (WebCore::RenderSVGResourceSolidColor::applyResource):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::paintSelectionBackground):
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+ (WebCore::SVGRenderingContext::bufferForeground):
+ * svg/SVGAnimatedColor.cpp:
+ (WebCore::SVGAnimatedColorAnimator::calculateAnimatedValue):
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::drawForContainer):
+ (WebCore::SVGImage::nativeImageForCurrentFrame):
+ (WebCore::SVGImage::drawPatternForContainer):
+ (WebCore::SVGImage::draw):
+ * svg/graphics/SVGImage.h:
+ * svg/graphics/SVGImageForContainer.cpp:
+ (WebCore::SVGImageForContainer::draw):
+ (WebCore::SVGImageForContainer::drawPattern):
+ * svg/graphics/SVGImageForContainer.h:
+ * svg/graphics/filters/SVGFEImage.cpp:
+ (WebCore::FEImage::platformApplySoftware):
+ * testing/MockPageOverlayClient.cpp:
+ (WebCore::MockPageOverlayClient::drawRect):
+
+2015-11-07 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Use ColorSpaceSRGB for image buffers everywhere
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150990
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1347,7 +1347,7 @@
</span><span class="cx"> } elsif ($idlType eq "Color") {
</span><span class="cx"> if ($shouldUseCGColor) {
</span><span class="cx"> $getterContentHead = "WebCore::cachedCGColor($getterContentHead";
</span><del>- $getterContentTail .= ", WebCore::ColorSpaceDeviceRGB)";
</del><ins>+ $getterContentTail .= ")";
</ins><span class="cx"> } else {
</span><span class="cx"> $getterContentHead = "WebCore::nsColor($getterContentHead";
</span><span class="cx"> $getterContentTail .= ")";
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> return Image::nullImage();
</span><span class="cx">
</span><span class="cx"> FloatRect imageRect = FloatRect(FloatPoint(), size);
</span><del>- texture->context().drawImage(*image, ColorSpaceDeviceRGB, imageRect);
</del><ins>+ texture->context().drawImage(*image, imageRect);
</ins><span class="cx">
</span><span class="cx"> RefPtr<FilterEffectRenderer> filterRenderer = FilterEffectRenderer::create();
</span><span class="cx"> filterRenderer->setSourceImage(WTF::move(texture));
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1570,7 +1570,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Color caretColor = Color::black;
</span><del>- ColorSpace colorSpace = ColorSpaceDeviceRGB;
</del><span class="cx"> Element* element = is<Element>(*node) ? downcast<Element>(node) : node->parentElement();
</span><span class="cx"> Element* rootEditableElement = node->rootEditableElement();
</span><span class="cx">
</span><span class="lines">@@ -1583,17 +1582,14 @@
</span><span class="cx"> auto elementBGColor = elementStyle.visitedDependentColor(CSSPropertyBackgroundColor);
</span><span class="cx"> if (disappearsIntoBackground(elementBGColor, rootEditableBGColor)) {
</span><span class="cx"> caretColor = rootEditableStyle.visitedDependentColor(CSSPropertyColor);
</span><del>- colorSpace = rootEditableStyle.colorSpace();
</del><span class="cx"> setToRootEditableElement = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (!setToRootEditableElement) {
</del><ins>+ if (!setToRootEditableElement)
</ins><span class="cx"> caretColor = element->renderer()->style().visitedDependentColor(CSSPropertyColor);
</span><del>- colorSpace = element->renderer()->style().colorSpace();
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>- context.fillRect(caret, caretColor, colorSpace);
</del><ins>+ context.fillRect(caret, caretColor);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(node);
</span><span class="cx"> UNUSED_PARAM(context);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -873,7 +873,7 @@
</span><span class="cx">
</span><span class="cx"> static inline UIColor *_platformColor(Color color)
</span><span class="cx"> {
</span><del>- return [getUIColorClass() _disambiguated_due_to_CIImage_colorWithCGColor:cachedCGColor(color, WebCore::ColorSpaceDeviceRGB)];
</del><ins>+ return [getUIColorClass() _disambiguated_due_to_CIImage_colorWithCGColor:cachedCGColor(color)];
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> static inline NSColor *_platformColor(Color color)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -388,9 +388,9 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(renderer()->style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context.drawImage(*m_presentedImage, ColorSpaceDeviceRGB, snappedIntRect(r), ImagePaintingOptions(orientationDescription, useLowQualityScale));
</del><ins>+ context.drawImage(*m_presentedImage, snappedIntRect(r), ImagePaintingOptions(orientationDescription, useLowQualityScale));
</ins><span class="cx"> } else
</span><del>- context.drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, snappedIntRect(r), useLowQualityScale);
</del><ins>+ context.drawImageBuffer(*imageBuffer, snappedIntRect(r), useLowQualityScale);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1154,7 +1154,7 @@
</span><span class="cx"> if (shouldDrawShadows()) {
</span><span class="cx"> context->save();
</span><span class="cx"> saved = true;
</span><del>- context->setLegacyShadow(FloatSize(), 0, Color::transparent, ColorSpaceDeviceRGB);
</del><ins>+ context->setLegacyShadow(FloatSize(), 0, Color::transparent);
</ins><span class="cx"> }
</span><span class="cx"> if (state().globalAlpha != 1) {
</span><span class="cx"> if (!saved) {
</span><span class="lines">@@ -1319,9 +1319,9 @@
</span><span class="cx"> if (shouldDrawShadows()) {
</span><span class="cx"> float width = state().shadowOffset.width();
</span><span class="cx"> float height = state().shadowOffset.height();
</span><del>- c->setLegacyShadow(FloatSize(width, -height), state().shadowBlur, state().shadowColor, ColorSpaceDeviceRGB);
</del><ins>+ c->setLegacyShadow(FloatSize(width, -height), state().shadowBlur, state().shadowColor);
</ins><span class="cx"> } else
</span><del>- c->setLegacyShadow(FloatSize(), 0, Color::transparent, ColorSpaceDeviceRGB);
</del><ins>+ c->setLegacyShadow(FloatSize(), 0, Color::transparent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CanvasRenderingContext2D::shouldDrawShadows() const
</span><span class="lines">@@ -1448,17 +1448,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (rectContainsCanvas(normalizedDstRect)) {
</span><del>- c->drawImage(*image, ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, ImagePaintingOptions(op, blendMode));
</del><ins>+ c->drawImage(*image, normalizedDstRect, normalizedSrcRect, ImagePaintingOptions(op, blendMode));
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (isFullCanvasCompositeMode(op)) {
</span><del>- fullCanvasCompositedDrawImage(*image, ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op);
</del><ins>+ fullCanvasCompositedDrawImage(*image, normalizedDstRect, normalizedSrcRect, op);
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (op == CompositeCopy) {
</span><span class="cx"> clearCanvas();
</span><del>- c->drawImage(*image, ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, ImagePaintingOptions(op, blendMode));
</del><ins>+ c->drawImage(*image, normalizedDstRect, normalizedSrcRect, ImagePaintingOptions(op, blendMode));
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else {
</span><del>- c->drawImage(*image, ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, ImagePaintingOptions(op, blendMode));
</del><ins>+ c->drawImage(*image, normalizedDstRect, normalizedSrcRect, ImagePaintingOptions(op, blendMode));
</ins><span class="cx"> didDraw(normalizedDstRect);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1536,17 +1536,17 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (rectContainsCanvas(dstRect)) {
</span><del>- c->drawImageBuffer(*buffer, ColorSpaceDeviceRGB, dstRect, srcRect, ImagePaintingOptions(state().globalComposite, state().globalBlend));
</del><ins>+ c->drawImageBuffer(*buffer, dstRect, srcRect, ImagePaintingOptions(state().globalComposite, state().globalBlend));
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (isFullCanvasCompositeMode(state().globalComposite)) {
</span><del>- fullCanvasCompositedDrawImage(*buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().globalComposite);
</del><ins>+ fullCanvasCompositedDrawImage(*buffer, dstRect, srcRect, state().globalComposite);
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (state().globalComposite == CompositeCopy) {
</span><span class="cx"> clearCanvas();
</span><del>- c->drawImageBuffer(*buffer, ColorSpaceDeviceRGB, dstRect, srcRect, ImagePaintingOptions(state().globalComposite, state().globalBlend));
</del><ins>+ c->drawImageBuffer(*buffer, dstRect, srcRect, ImagePaintingOptions(state().globalComposite, state().globalBlend));
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else {
</span><del>- c->drawImageBuffer(*buffer, ColorSpaceDeviceRGB, dstRect, srcRect, ImagePaintingOptions(state().globalComposite, state().globalBlend));
</del><ins>+ c->drawImageBuffer(*buffer, dstRect, srcRect, ImagePaintingOptions(state().globalComposite, state().globalBlend));
</ins><span class="cx"> didDraw(dstRect);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1612,7 +1612,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> if (PassNativeImagePtr image = video->nativeImageForCurrentTime()) {
</span><del>- c->drawNativeImage(image, FloatSize(video->videoWidth(), video->videoHeight()), ColorSpaceDeviceRGB, dstRect, srcRect);
</del><ins>+ c->drawNativeImage(image, FloatSize(video->videoWidth(), video->videoHeight()), dstRect, srcRect);
</ins><span class="cx"> if (rectContainsCanvas(dstRect))
</span><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> else
</span><span class="lines">@@ -1726,21 +1726,21 @@
</span><span class="cx"> c->clipOut(bufferRect);
</span><span class="cx"> c->clearRect(canvasRect);
</span><span class="cx"> c->restore();
</span><del>- c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, bufferRect.location(), state().globalComposite);
</del><ins>+ c->drawImageBuffer(buffer, bufferRect.location(), state().globalComposite);
</ins><span class="cx"> c->restore();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void drawImageToContext(Image& image, GraphicsContext& context, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
</del><ins>+static void drawImageToContext(Image& image, GraphicsContext& context, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
</ins><span class="cx"> {
</span><del>- context.drawImage(image, styleColorSpace, dest, src, op);
</del><ins>+ context.drawImage(image, dest, src, op);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void drawImageToContext(ImageBuffer& imageBuffer, GraphicsContext& context, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
</del><ins>+static void drawImageToContext(ImageBuffer& imageBuffer, GraphicsContext& context, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
</ins><span class="cx"> {
</span><del>- context.drawImageBuffer(imageBuffer, styleColorSpace, dest, src, op);
</del><ins>+ context.drawImageBuffer(imageBuffer, dest, src, op);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<class T> void CanvasRenderingContext2D::fullCanvasCompositedDrawImage(T& image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
</del><ins>+template<class T> void CanvasRenderingContext2D::fullCanvasCompositedDrawImage(T& image, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isFullCanvasCompositeMode(op));
</span><span class="cx">
</span><span class="lines">@@ -1766,7 +1766,7 @@
</span><span class="cx"> buffer->context().translate(-transformedAdjustedRect.location().x(), -transformedAdjustedRect.location().y());
</span><span class="cx"> buffer->context().translate(croppedOffset.width(), croppedOffset.height());
</span><span class="cx"> buffer->context().concatCTM(effectiveTransform);
</span><del>- drawImageToContext(image, buffer->context(), styleColorSpace, adjustedDest, src, CompositeSourceOver);
</del><ins>+ drawImageToContext(image, buffer->context(), adjustedDest, src, CompositeSourceOver);
</ins><span class="cx">
</span><span class="cx"> compositeBuffer(*buffer, bufferRect, op);
</span><span class="cx"> }
</span><span class="lines">@@ -2440,8 +2440,7 @@
</span><span class="cx"> FloatSize shadowOffset;
</span><span class="cx"> float shadowRadius;
</span><span class="cx"> Color shadowColor;
</span><del>- ColorSpace shadowColorSpace;
- c->getShadow(shadowOffset, shadowRadius, shadowColor, shadowColorSpace);
</del><ins>+ c->getShadow(shadowOffset, shadowRadius, shadowColor);
</ins><span class="cx">
</span><span class="cx"> FloatRect shadowRect(maskRect);
</span><span class="cx"> shadowRect.inflate(shadowRadius * 1.4);
</span><span class="lines">@@ -2450,12 +2449,12 @@
</span><span class="cx">
</span><span class="cx"> shadowOffset += offset;
</span><span class="cx">
</span><del>- c->setLegacyShadow(shadowOffset, shadowRadius, shadowColor, shadowColorSpace);
</del><ins>+ c->setLegacyShadow(shadowOffset, shadowRadius, shadowColor);
</ins><span class="cx">
</span><span class="cx"> if (fill)
</span><del>- c->setFillColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ c->setFillColor(Color::black);
</ins><span class="cx"> else
</span><del>- c->setStrokeColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ c->setStrokeColor(Color::black);
</ins><span class="cx">
</span><span class="cx"> fontProxy.drawBidiText(*c, textRun, location + offset, FontCascade::UseFallbackIfFontNotReady);
</span><span class="cx"> }
</span><span class="lines">@@ -2467,9 +2466,9 @@
</span><span class="cx"> GraphicsContext& maskImageContext = maskImage->context();
</span><span class="cx">
</span><span class="cx"> if (fill)
</span><del>- maskImageContext.setFillColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ maskImageContext.setFillColor(Color::black);
</ins><span class="cx"> else {
</span><del>- maskImageContext.setStrokeColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ maskImageContext.setStrokeColor(Color::black);
</ins><span class="cx"> maskImageContext.setStrokeThickness(c->strokeThickness());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "CanvasRenderingContext.h"
</span><span class="cx"> #include "CanvasStyle.h"
</span><span class="cx"> #include "Color.h"
</span><del>-#include "ColorSpace.h"
</del><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "FontCascade.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="lines">@@ -367,7 +366,7 @@
</span><span class="cx">
</span><span class="cx"> void inflateStrokeRect(FloatRect&) const;
</span><span class="cx">
</span><del>- template<class T> void fullCanvasCompositedDrawImage(T&, ColorSpace, const FloatRect&, const FloatRect&, CompositeOperator);
</del><ins>+ template<class T> void fullCanvasCompositedDrawImage(T&, const FloatRect&, const FloatRect&, CompositeOperator);
</ins><span class="cx">
</span><span class="cx"> void prepareGradientForDashboard(CanvasGradient& gradient) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasStyle.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasStyle.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/html/canvas/CanvasStyle.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> return;
</span><span class="cx"> switch (m_type) {
</span><span class="cx"> case RGBA:
</span><del>- context->setStrokeColor(m_rgba, ColorSpaceDeviceRGB);
</del><ins>+ context->setStrokeColor(m_rgba);
</ins><span class="cx"> break;
</span><span class="cx"> case CMYKA: {
</span><span class="cx"> // FIXME: Do this through platform-independent GraphicsContext API.
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> CGContextSetCMYKStrokeColor(context->platformContext(), m_cmyka->c, m_cmyka->m, m_cmyka->y, m_cmyka->k, m_cmyka->a);
</span><span class="cx"> #else
</span><del>- context->setStrokeColor(m_cmyka->rgba, ColorSpaceDeviceRGB);
</del><ins>+ context->setStrokeColor(m_cmyka->rgba);
</ins><span class="cx"> #endif
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> return;
</span><span class="cx"> switch (m_type) {
</span><span class="cx"> case RGBA:
</span><del>- context->setFillColor(m_rgba, ColorSpaceDeviceRGB);
</del><ins>+ context->setFillColor(m_rgba);
</ins><span class="cx"> break;
</span><span class="cx"> case CMYKA: {
</span><span class="cx"> // FIXME: Do this through platform-independent GraphicsContext API.
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> CGContextSetCMYKFillColor(context->platformContext(), m_cmyka->c, m_cmyka->m, m_cmyka->y, m_cmyka->k, m_cmyka->a);
</span><span class="cx"> #else
</span><del>- context->setFillColor(m_cmyka->rgba, ColorSpaceDeviceRGB);
</del><ins>+ context->setFillColor(m_cmyka->rgba);
</ins><span class="cx"> #endif
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -3176,7 +3176,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect srcRect(FloatPoint(), image.size());
</span><span class="cx"> FloatRect destRect(FloatPoint(), size);
</span><del>- buf->context().drawImage(image, ColorSpaceDeviceRGB, destRect, srcRect);
</del><ins>+ buf->context().drawImage(image, destRect, srcRect);
</ins><span class="cx"> return buf->copyImage(ImageBuffer::fastCopyImageMode());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDebugPageOverlayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DebugPageOverlays.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver saver(context);
</span><del>- context.setFillColor(m_color, ColorSpaceSRGB);
</del><ins>+ context.setFillColor(m_color);
</ins><span class="cx"> for (auto rect : m_region->rects()) {
</span><span class="cx">
</span><span class="cx"> if (rect.intersects(dirtyRect))
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -3735,7 +3735,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_scrollCorner) {
</span><span class="cx"> if (frame().isMainFrame())
</span><del>- context.fillRect(cornerRect, baseBackgroundColor(), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(cornerRect, baseBackgroundColor());
</ins><span class="cx"> m_scrollCorner->paintIntoRect(context, cornerRect.location(), cornerRect);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -3748,7 +3748,7 @@
</span><span class="cx"> if (bar.isCustomScrollbar() && frame().isMainFrame()) {
</span><span class="cx"> IntRect toFill = bar.frameRect();
</span><span class="cx"> toFill.intersect(rect);
</span><del>- context.fillRect(toFill, baseBackgroundColor(), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(toFill, baseBackgroundColor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollView::paintScrollbar(context, bar, rect);
</span><span class="lines">@@ -4016,7 +4016,7 @@
</span><span class="cx"> fillWithRed = true;
</span><span class="cx">
</span><span class="cx"> if (fillWithRed)
</span><del>- context.fillRect(dirtyRect, Color(0xFF, 0, 0), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(dirtyRect, Color(0xFF, 0, 0));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_layoutPhase == InViewSizeAdjust)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePrintContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PrintContext.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PrintContext.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/page/PrintContext.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> int totalHeight = pageRects.size() * (pageSizeInPixels.height() + 1) - 1;
</span><span class="cx">
</span><span class="cx"> // Fill the whole background by white.
</span><del>- graphicsContext.setFillColor(Color(255, 255, 255), ColorSpaceDeviceRGB);
</del><ins>+ graphicsContext.setFillColor(Color(255, 255, 255));
</ins><span class="cx"> graphicsContext.fillRect(FloatRect(0, 0, pageWidth, totalHeight));
</span><span class="cx">
</span><span class="cx"> graphicsContext.save();
</span><span class="lines">@@ -356,8 +356,8 @@
</span><span class="cx"> int boundaryLineY = currentHeight - 1;
</span><span class="cx"> #endif
</span><span class="cx"> graphicsContext.save();
</span><del>- graphicsContext.setStrokeColor(Color(0, 0, 255), ColorSpaceDeviceRGB);
- graphicsContext.setFillColor(Color(0, 0, 255), ColorSpaceDeviceRGB);
</del><ins>+ graphicsContext.setStrokeColor(Color(0, 0, 255));
+ graphicsContext.setFillColor(Color(0, 0, 255));
</ins><span class="cx"> graphicsContext.drawLine(IntPoint(0, boundaryLineY), IntPoint(pageWidth, boundaryLineY));
</span><span class="cx"> graphicsContext.restore();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1183,7 +1183,7 @@
</span><span class="cx"> IntPoint iconGCPoint = m_panScrollIconPoint;
</span><span class="cx"> if (parent())
</span><span class="cx"> iconGCPoint = parent()->windowToContents(iconGCPoint);
</span><del>- context.drawImage(*panScrollIcon, ColorSpaceDeviceRGB, iconGCPoint);
</del><ins>+ context.drawImage(*panScrollIcon, iconGCPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollView::paint(GraphicsContext& context, const IntRect& rect)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollbarTheme.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollbarTheme.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/ScrollbarTheme.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> virtual void invalidatePart(Scrollbar&, ScrollbarPart) { }
</span><span class="cx">
</span><span class="cx"> virtual void paintScrollCorner(ScrollView*, GraphicsContext& context, const IntRect& cornerRect) { defaultPaintScrollCorner(context, cornerRect); }
</span><del>- static void defaultPaintScrollCorner(GraphicsContext& context, const IntRect& cornerRect) { context.fillRect(cornerRect, Color::white, ColorSpaceDeviceRGB); }
</del><ins>+ static void defaultPaintScrollCorner(GraphicsContext& context, const IntRect& cornerRect) { context.fillRect(cornerRect, Color::white); }
</ins><span class="cx">
</span><span class="cx"> virtual void paintTickmarks(GraphicsContext&, Scrollbar&, const IntRect&) { }
</span><span class="cx"> virtual void paintOverhangAreas(ScrollView&, GraphicsContext&, const IntRect&, const IntRect&, const IntRect&) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarThemeCompositecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/ScrollbarThemeComposite.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeComposite::paintScrollCorner(ScrollView*, GraphicsContext& context, const IntRect& cornerRect)
</span><span class="cx"> {
</span><del>- context.fillRect(cornerRect, Color::white, ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(cornerRect, Color::white);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect ScrollbarThemeComposite::thumbRect(Scrollbar& scrollbar)
</span><span class="lines">@@ -281,11 +281,11 @@
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeComposite::paintOverhangAreas(ScrollView&, GraphicsContext& context, const IntRect& horizontalOverhangRect, const IntRect& verticalOverhangRect, const IntRect& dirtyRect)
</span><span class="cx"> {
</span><del>- context.setFillColor(Color::white, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(Color::white);
</ins><span class="cx"> if (!horizontalOverhangRect.isEmpty())
</span><span class="cx"> context.fillRect(intersection(horizontalOverhangRect, dirtyRect));
</span><span class="cx">
</span><del>- context.setFillColor(Color::white, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(Color::white);
</ins><span class="cx"> if (!verticalOverhangRect.isEmpty())
</span><span class="cx"> context.fillRect(intersection(verticalOverhangRect, dirtyRect));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Theme.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Theme.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/Theme.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><del>- context.setFillColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(Color::black);
</ins><span class="cx">
</span><span class="cx"> // Draw a generic Wireless Playback icon.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaThemeCocoacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ThemeCocoa.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ThemeCocoa.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/cocoa/ThemeCocoa.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><del>- context.setFillColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(Color::black);
</ins><span class="cx">
</span><span class="cx"> FloatSize wirelessPlaybackSrcSize(32, 24.016);
</span><span class="cx"> fitContextToBox(context, wirelessPlaybackSrcSize, rect.size());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -607,13 +607,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BitmapImage::drawPattern(GraphicsContext& ctxt, const FloatRect& tileRect, const AffineTransform& transform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (tileRect.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!ctxt.drawLuminanceMask()) {
</span><del>- Image::drawPattern(ctxt, tileRect, transform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</del><ins>+ Image::drawPattern(ctxt, tileRect, transform, phase, spacing, op, destRect, blendMode);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!m_cachedImage) {
</span><span class="lines">@@ -627,7 +627,7 @@
</span><span class="cx"> // Temporarily reset image observer, we don't want to receive any changeInRect() calls due to this relayout.
</span><span class="cx"> setImageObserver(nullptr);
</span><span class="cx">
</span><del>- draw(buffer->context(), tileRect, tileRect, styleColorSpace, op, blendMode, ImageOrientationDescription());
</del><ins>+ draw(buffer->context(), tileRect, tileRect, op, blendMode, ImageOrientationDescription());
</ins><span class="cx">
</span><span class="cx"> setImageObserver(observer);
</span><span class="cx"> buffer->convertToLuminanceMask();
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ctxt.setDrawLuminanceMask(false);
</span><del>- m_cachedImage->drawPattern(ctxt, tileRect, transform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</del><ins>+ m_cachedImage->drawPattern(ctxt, tileRect, transform, phase, spacing, op, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> virtual void resetAnimation() override;
</span><span class="cx">
</span><span class="cx"> virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal) override;
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal) override;
</ins><span class="cx">
</span><span class="cx"> // Accessors for native image formats.
</span><span class="cx">
</span><span class="lines">@@ -201,13 +201,13 @@
</span><span class="cx"> WEBCORE_EXPORT BitmapImage(ImageObserver* = 0);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- virtual void drawFrameMatchingSourceSize(GraphicsContext&, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator) override;
</del><ins>+ virtual void drawFrameMatchingSourceSize(GraphicsContext&, const FloatRect& dstRect, const IntSize& srcSize, CompositeOperator) override;
</ins><span class="cx"> #endif
</span><del>- virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</ins><span class="cx">
</span><span class="cx"> #if USE(WINGDI)
</span><span class="cx"> virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& destRect);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> size_t currentFrame() const { return m_currentFrame; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> uint16_t fastDivideBy255(uint16_t);
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><del>-WEBCORE_EXPORT CGColorRef cachedCGColor(const Color&, ColorSpace);
</del><ins>+WEBCORE_EXPORT CGColorRef cachedCGColor(const Color&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> inline RGBA::RGBA()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> if (targetSize != imageSize)
</span><span class="cx"> context.scale(FloatSize(targetSize.width() / imageSize.width(), targetSize.height() / imageSize.height()));
</span><del>- context.drawImage(image, ColorSpaceDeviceRGB, IntPoint());
</del><ins>+ context.drawImage(image, IntPoint());
</ins><span class="cx">
</span><span class="cx"> if (useTransparencyLayer)
</span><span class="cx"> context.endTransparencyLayer();
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> context.endTransparencyLayer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CrossfadeGeneratedImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</del><ins>+void CrossfadeGeneratedImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="cx"> context.setCompositeOperation(compositeOp, blendMode);
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> drawCrossfade(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CrossfadeGeneratedImage::drawPattern(GraphicsContext& context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</del><ins>+void CrossfadeGeneratedImage::drawPattern(GraphicsContext& context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), context.renderingMode());
</span><span class="cx"> if (!imageBuffer)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> drawCrossfade(graphicsContext);
</span><span class="cx">
</span><span class="cx"> // Tile the image buffer into the context.
</span><del>- imageBuffer->drawPattern(context, srcRect, patternTransform, phase, spacing, styleColorSpace, compositeOp, dstRect, blendMode);
</del><ins>+ imageBuffer->drawPattern(context, srcRect, patternTransform, phase, spacing, compositeOp, dstRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CrossfadeGeneratedImage::dump(TextStream& ts) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> virtual FloatSize size() const override { return m_crossfadeSize; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
- virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode) override;
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription) override;
+ virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& dstRect, BlendMode) override;
</ins><span class="cx">
</span><span class="cx"> CrossfadeGeneratedImage(Image& fromImage, Image& toImage, float percentage, const FloatSize& crossfadeSize, const FloatSize&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGeneratedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GeneratedImage.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GeneratedImage.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/GeneratedImage.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> virtual void destroyDecodedData(bool /*destroyAll*/ = true) override { }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override = 0;
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription) override = 0;
</ins><span class="cx"> virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) override = 0;
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& destRect, BlendMode) override = 0;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Implement this to be less conservative.
</span><span class="cx"> virtual bool currentFrameKnownToBeOpaque() override { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GradientImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GradientImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/GradientImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GradientImage::draw(GraphicsContext& destContext, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</del><ins>+void GradientImage::draw(GraphicsContext& destContext, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(destContext);
</span><span class="cx"> destContext.setCompositeOperation(compositeOp, blendMode);
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GradientImage::drawPattern(GraphicsContext& destContext, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator compositeOp, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> // Allow the generator to provide visually-equivalent tiling parameters for better performance.
</span><span class="cx"> FloatSize adjustedSize = size();
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> destContext.setDrawLuminanceMask(false);
</span><span class="cx">
</span><span class="cx"> // Tile the image buffer into the context.
</span><del>- m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, spacing, styleColorSpace, compositeOp, destRect, blendMode);
</del><ins>+ m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, spacing, compositeOp, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GradientImage::dump(TextStream& ts) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GradientImage.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GradientImage.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/GradientImage.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> virtual ~GradientImage();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</ins><span class="cx"> virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) override;
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& destRect, BlendMode) override;
</ins><span class="cx">
</span><span class="cx"> GradientImage(PassRefPtr<Gradient>, const FloatSize&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -142,20 +142,20 @@
</span><span class="cx"> restorePlatformState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawRaisedEllipse(const FloatRect& rect, const Color& ellipseColor, ColorSpace ellipseColorSpace, const Color& shadowColor, ColorSpace shadowColorSpace)
</del><ins>+void GraphicsContext::drawRaisedEllipse(const FloatRect& rect, const Color& ellipseColor, const Color& shadowColor)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> save();
</span><span class="cx">
</span><del>- setStrokeColor(shadowColor, shadowColorSpace);
- setFillColor(shadowColor, shadowColorSpace);
</del><ins>+ setStrokeColor(shadowColor);
+ setFillColor(shadowColor);
</ins><span class="cx">
</span><span class="cx"> drawEllipse(FloatRect(rect.x(), rect.y() + 1, rect.width(), rect.height()));
</span><span class="cx">
</span><del>- setStrokeColor(ellipseColor, ellipseColorSpace);
- setFillColor(ellipseColor, ellipseColorSpace);
</del><ins>+ setStrokeColor(ellipseColor);
+ setFillColor(ellipseColor);
</ins><span class="cx">
</span><span class="cx"> drawEllipse(rect);
</span><span class="cx">
</span><span class="lines">@@ -174,34 +174,31 @@
</span><span class="cx"> setPlatformStrokeStyle(style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setStrokeColor(const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::setStrokeColor(const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> m_state.strokeColor = color;
</span><del>- m_state.strokeColorSpace = colorSpace;
</del><span class="cx"> m_state.strokeGradient = nullptr;
</span><span class="cx"> m_state.strokePattern = nullptr;
</span><del>- setPlatformStrokeColor(color, colorSpace);
</del><ins>+ setPlatformStrokeColor(color);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setShadow(const FloatSize& offset, float blur, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::setShadow(const FloatSize& offset, float blur, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> m_state.shadowOffset = offset;
</span><span class="cx"> m_state.shadowBlur = blur;
</span><span class="cx"> m_state.shadowColor = color;
</span><del>- m_state.shadowColorSpace = colorSpace;
- setPlatformShadow(offset, blur, color, colorSpace);
</del><ins>+ setPlatformShadow(offset, blur, color);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setLegacyShadow(const FloatSize& offset, float blur, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::setLegacyShadow(const FloatSize& offset, float blur, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> m_state.shadowOffset = offset;
</span><span class="cx"> m_state.shadowBlur = blur;
</span><span class="cx"> m_state.shadowColor = color;
</span><del>- m_state.shadowColorSpace = colorSpace;
</del><span class="cx"> #if USE(CG)
</span><span class="cx"> m_state.shadowsUseLegacyRadius = true;
</span><span class="cx"> #endif
</span><del>- setPlatformShadow(offset, blur, color, colorSpace);
</del><ins>+ setPlatformShadow(offset, blur, color);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::clearShadow()
</span><span class="lines">@@ -209,16 +206,14 @@
</span><span class="cx"> m_state.shadowOffset = FloatSize();
</span><span class="cx"> m_state.shadowBlur = 0;
</span><span class="cx"> m_state.shadowColor = Color();
</span><del>- m_state.shadowColorSpace = ColorSpaceDeviceRGB;
</del><span class="cx"> clearPlatformShadow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GraphicsContext::getShadow(FloatSize& offset, float& blur, Color& color, ColorSpace& colorSpace) const
</del><ins>+bool GraphicsContext::getShadow(FloatSize& offset, float& blur, Color& color) const
</ins><span class="cx"> {
</span><span class="cx"> offset = m_state.shadowOffset;
</span><span class="cx"> blur = m_state.shadowBlur;
</span><span class="cx"> color = m_state.shadowColor;
</span><del>- colorSpace = m_state.shadowColorSpace;
</del><span class="cx">
</span><span class="cx"> return hasShadow();
</span><span class="cx"> }
</span><span class="lines">@@ -241,13 +236,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void GraphicsContext::setFillColor(const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::setFillColor(const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> m_state.fillColor = color;
</span><del>- m_state.fillColorSpace = colorSpace;
</del><span class="cx"> m_state.fillGradient = nullptr;
</span><span class="cx"> m_state.fillPattern = nullptr;
</span><del>- setPlatformFillColor(color, colorSpace);
</del><ins>+ setPlatformFillColor(color);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setShouldAntialias(bool shouldAntialias)
</span><span class="lines">@@ -378,12 +372,12 @@
</span><span class="cx"> bidiRuns.deleteRuns();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImage(Image& image, ColorSpace colorSpace, const FloatPoint& destination, const ImagePaintingOptions& imagePaintingOptions)
</del><ins>+void GraphicsContext::drawImage(Image& image, const FloatPoint& destination, const ImagePaintingOptions& imagePaintingOptions)
</ins><span class="cx"> {
</span><del>- drawImage(image, colorSpace, FloatRect(destination, image.size()), FloatRect(FloatPoint(), image.size()), imagePaintingOptions);
</del><ins>+ drawImage(image, FloatRect(destination, image.size()), FloatRect(FloatPoint(), image.size()), imagePaintingOptions);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImage(Image& image, ColorSpace colorSpace, const FloatRect& destination, const ImagePaintingOptions& imagePaintingOptions)
</del><ins>+void GraphicsContext::drawImage(Image& image, const FloatRect& destination, const ImagePaintingOptions& imagePaintingOptions)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> FloatRect srcRect(FloatPoint(), image.originalSize());
</span><span class="lines">@@ -391,29 +385,29 @@
</span><span class="cx"> FloatRect srcRect(FloatPoint(), image.size());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- drawImage(image, colorSpace, destination, srcRect, imagePaintingOptions);
</del><ins>+ drawImage(image, destination, srcRect, imagePaintingOptions);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImage(Image& image, ColorSpace colorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions)
</del><ins>+void GraphicsContext::drawImage(Image& image, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME (49002): Should be InterpolationLow
</span><span class="cx"> InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingOptions.m_useLowQualityScale ? InterpolationNone : imageInterpolationQuality());
</span><del>- image.draw(*this, destination, source, colorSpace, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode, imagePaintingOptions.m_orientationDescription);
</del><ins>+ image.draw(*this, destination, source, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode, imagePaintingOptions.m_orientationDescription);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawTiledImage(Image& image, ColorSpace colorSpace, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& imagePaintingOptions)
</del><ins>+void GraphicsContext::drawTiledImage(Image& image, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& imagePaintingOptions)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingOptions.m_useLowQualityScale ? InterpolationLow : imageInterpolationQuality());
</span><del>- image.drawTiled(*this, destination, source, tileSize, spacing, colorSpace, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode);
</del><ins>+ image.drawTiled(*this, destination, source, tileSize, spacing, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawTiledImage(Image& image, ColorSpace colorSpace, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor,
</del><ins>+void GraphicsContext::drawTiledImage(Image& image, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor,
</ins><span class="cx"> Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingOptions& imagePaintingOptions)
</span><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="lines">@@ -421,32 +415,32 @@
</span><span class="cx">
</span><span class="cx"> if (hRule == Image::StretchTile && vRule == Image::StretchTile) {
</span><span class="cx"> // Just do a scale.
</span><del>- drawImage(image, colorSpace, destination, source, imagePaintingOptions);
</del><ins>+ drawImage(image, destination, source, imagePaintingOptions);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingOptions.m_useLowQualityScale ? InterpolationLow : imageInterpolationQuality());
</span><del>- image.drawTiled(*this, destination, source, tileScaleFactor, hRule, vRule, colorSpace, imagePaintingOptions.m_compositeOperator);
</del><ins>+ image.drawTiled(*this, destination, source, tileScaleFactor, hRule, vRule, imagePaintingOptions.m_compositeOperator);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImageBuffer(ImageBuffer& image, ColorSpace colorSpace, const FloatPoint& destination, const ImagePaintingOptions& imagePaintingOptions)
</del><ins>+void GraphicsContext::drawImageBuffer(ImageBuffer& image, const FloatPoint& destination, const ImagePaintingOptions& imagePaintingOptions)
</ins><span class="cx"> {
</span><del>- drawImageBuffer(image, colorSpace, FloatRect(destination, image.logicalSize()), FloatRect(FloatPoint(), image.logicalSize()), imagePaintingOptions);
</del><ins>+ drawImageBuffer(image, FloatRect(destination, image.logicalSize()), FloatRect(FloatPoint(), image.logicalSize()), imagePaintingOptions);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImageBuffer(ImageBuffer& image, ColorSpace colorSpace, const FloatRect& destination, const ImagePaintingOptions& imagePaintingOptions)
</del><ins>+void GraphicsContext::drawImageBuffer(ImageBuffer& image, const FloatRect& destination, const ImagePaintingOptions& imagePaintingOptions)
</ins><span class="cx"> {
</span><del>- drawImageBuffer(image, colorSpace, destination, FloatRect(FloatPoint(), FloatSize(image.logicalSize())), imagePaintingOptions);
</del><ins>+ drawImageBuffer(image, destination, FloatRect(FloatPoint(), FloatSize(image.logicalSize())), imagePaintingOptions);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImageBuffer(ImageBuffer& image, ColorSpace colorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions)
</del><ins>+void GraphicsContext::drawImageBuffer(ImageBuffer& image, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& imagePaintingOptions)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME (49002): Should be InterpolationLow
</span><span class="cx"> InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingOptions.m_useLowQualityScale ? InterpolationNone : imageInterpolationQuality());
</span><del>- image.draw(*this, colorSpace, destination, source, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode, imagePaintingOptions.m_useLowQualityScale);
</del><ins>+ image.draw(*this, destination, source, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode, imagePaintingOptions.m_useLowQualityScale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::clip(const IntRect& rect)
</span><span class="lines">@@ -509,29 +503,29 @@
</span><span class="cx"> gradient.fill(this, rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
</del><ins>+void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, CompositeOperator op, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CompositeOperator previousOperator = compositeOperation();
</span><span class="cx"> setCompositeOperation(op, blendMode);
</span><del>- fillRect(rect, color, styleColorSpace);
</del><ins>+ fillRect(rect, color);
</ins><span class="cx"> setCompositeOperation(previousOperator);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRoundedRect(const FloatRoundedRect& rect, const Color& color, ColorSpace colorSpace, BlendMode blendMode)
</del><ins>+void GraphicsContext::fillRoundedRect(const FloatRoundedRect& rect, const Color& color, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (rect.isRounded()) {
</span><span class="cx"> setCompositeOperation(compositeOperation(), blendMode);
</span><del>- platformFillRoundedRect(rect, color, colorSpace);
</del><ins>+ platformFillRoundedRect(rect, color);
</ins><span class="cx"> setCompositeOperation(compositeOperation());
</span><span class="cx"> } else
</span><del>- fillRect(rect.rect(), color, colorSpace, compositeOperation(), blendMode);
</del><ins>+ fillRect(rect.rect(), color, compositeOperation(), blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !USE(CG) && !USE(CAIRO)
</span><del>-void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const FloatRoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const FloatRoundedRect& roundedHoleRect, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -546,15 +540,14 @@
</span><span class="cx">
</span><span class="cx"> WindRule oldFillRule = fillRule();
</span><span class="cx"> Color oldFillColor = fillColor();
</span><del>- ColorSpace oldFillColorSpace = fillColorSpace();
</del><span class="cx">
</span><span class="cx"> setFillRule(RULE_EVENODD);
</span><del>- setFillColor(color, colorSpace);
</del><ins>+ setFillColor(color);
</ins><span class="cx">
</span><span class="cx"> fillPath(path);
</span><span class="cx">
</span><span class="cx"> setFillRule(oldFillRule);
</span><del>- setFillColor(oldFillColor, oldFillColorSpace);
</del><ins>+ setFillColor(oldFillColor);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #ifndef GraphicsContext_h
</span><span class="cx"> #define GraphicsContext_h
</span><span class="cx">
</span><del>-#include "ColorSpace.h"
</del><span class="cx"> #include "DashArray.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FontCascade.h"
</span><span class="lines">@@ -148,10 +147,6 @@
</span><span class="cx"> StrokeStyle strokeStyle { SolidStroke };
</span><span class="cx"> WindRule fillRule { RULE_NONZERO };
</span><span class="cx">
</span><del>- ColorSpace strokeColorSpace { ColorSpaceDeviceRGB };
- ColorSpace fillColorSpace { ColorSpaceDeviceRGB };
- ColorSpace shadowColorSpace { ColorSpaceDeviceRGB };
-
</del><span class="cx"> float alpha { 1 };
</span><span class="cx"> CompositeOperator compositeOperator { CompositeSourceOver };
</span><span class="cx"> BlendMode blendMode { BlendModeNormal };
</span><span class="lines">@@ -214,9 +209,8 @@
</span><span class="cx"> void setStrokeStyle(StrokeStyle);
</span><span class="cx"> StrokeStyle strokeStyle() const { return m_state.strokeStyle; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setStrokeColor(const Color&, ColorSpace);
</del><ins>+ WEBCORE_EXPORT void setStrokeColor(const Color&);
</ins><span class="cx"> Color strokeColor() const { return m_state.strokeColor; }
</span><del>- ColorSpace strokeColorSpace() const { return m_state.strokeColorSpace; }
</del><span class="cx">
</span><span class="cx"> void setStrokePattern(Ref<Pattern>&&);
</span><span class="cx"> Pattern* strokePattern() const { return m_state.strokePattern.get(); }
</span><span class="lines">@@ -227,9 +221,8 @@
</span><span class="cx"> void setFillRule(WindRule fillRule) { m_state.fillRule = fillRule; }
</span><span class="cx"> WindRule fillRule() const { return m_state.fillRule; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setFillColor(const Color&, ColorSpace);
</del><ins>+ WEBCORE_EXPORT void setFillColor(const Color&);
</ins><span class="cx"> Color fillColor() const { return m_state.fillColor; }
</span><del>- ColorSpace fillColorSpace() const { return m_state.fillColorSpace; }
</del><span class="cx">
</span><span class="cx"> void setFillPattern(Ref<Pattern>&&);
</span><span class="cx"> Pattern* fillPattern() const { return m_state.fillPattern.get(); }
</span><span class="lines">@@ -261,7 +254,7 @@
</span><span class="cx"> void applyFillPattern();
</span><span class="cx"> void drawPath(const Path&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void drawNativeImage(PassNativeImagePtr, const FloatSize& selfSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientation = DefaultImageOrientation);
</del><ins>+ WEBCORE_EXPORT void drawNativeImage(PassNativeImagePtr, const FloatSize& selfSize, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientation = DefaultImageOrientation);
</ins><span class="cx">
</span><span class="cx"> void clipToNativeImage(PassNativeImagePtr, const FloatRect& destRect, const FloatSize& bufferSize);
</span><span class="cx">
</span><span class="lines">@@ -288,7 +281,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void drawEllipse(const FloatRect&);
</span><del>- void drawRaisedEllipse(const FloatRect&, const Color& ellipseColor, ColorSpace ellipseColorSpace, const Color& shadowColor, ColorSpace shadowColorSpace);
</del><ins>+ void drawRaisedEllipse(const FloatRect&, const Color& ellipseColor, const Color& shadowColor);
</ins><span class="cx"> void drawConvexPolygon(size_t numPoints, const FloatPoint*, bool shouldAntialias = false);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void fillPath(const Path&);
</span><span class="lines">@@ -298,29 +291,29 @@
</span><span class="cx"> void strokeEllipse(const FloatRect&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void fillRect(const FloatRect&);
</span><del>- WEBCORE_EXPORT void fillRect(const FloatRect&, const Color&, ColorSpace);
</del><ins>+ WEBCORE_EXPORT void fillRect(const FloatRect&, const Color&);
</ins><span class="cx"> void fillRect(const FloatRect&, Gradient&);
</span><del>- void fillRect(const FloatRect&, const Color&, ColorSpace, CompositeOperator, BlendMode = BlendModeNormal);
- void fillRoundedRect(const FloatRoundedRect&, const Color&, ColorSpace, BlendMode = BlendModeNormal);
- void fillRectWithRoundedHole(const FloatRect&, const FloatRoundedRect& roundedHoleRect, const Color&, ColorSpace);
</del><ins>+ void fillRect(const FloatRect&, const Color&, CompositeOperator, BlendMode = BlendModeNormal);
+ void fillRoundedRect(const FloatRoundedRect&, const Color&, BlendMode = BlendModeNormal);
+ void fillRectWithRoundedHole(const FloatRect&, const FloatRoundedRect& roundedHoleRect, const Color&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void clearRect(const FloatRect&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void strokeRect(const FloatRect&, float lineWidth);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void drawImage(Image&, ColorSpace, const FloatPoint& destination, const ImagePaintingOptions& = ImagePaintingOptions());
- WEBCORE_EXPORT void drawImage(Image&, ColorSpace, const FloatRect& destination, const ImagePaintingOptions& = ImagePaintingOptions());
- void drawImage(Image&, ColorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& = ImagePaintingOptions());
</del><ins>+ WEBCORE_EXPORT void drawImage(Image&, const FloatPoint& destination, const ImagePaintingOptions& = ImagePaintingOptions());
+ WEBCORE_EXPORT void drawImage(Image&, const FloatRect& destination, const ImagePaintingOptions& = ImagePaintingOptions());
+ void drawImage(Image&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& = ImagePaintingOptions());
</ins><span class="cx">
</span><del>- void drawTiledImage(Image&, ColorSpace, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& = ImagePaintingOptions());
- void drawTiledImage(Image&, ColorSpace, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor,
</del><ins>+ void drawTiledImage(Image&, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& = ImagePaintingOptions());
+ void drawTiledImage(Image&, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor,
</ins><span class="cx"> Image::TileRule, Image::TileRule, const ImagePaintingOptions& = ImagePaintingOptions());
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void drawImageBuffer(ImageBuffer&, ColorSpace, const FloatPoint& destination, const ImagePaintingOptions& = ImagePaintingOptions());
- void drawImageBuffer(ImageBuffer&, ColorSpace, const FloatRect& destination, const ImagePaintingOptions& = ImagePaintingOptions());
- void drawImageBuffer(ImageBuffer&, ColorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& = ImagePaintingOptions());
</del><ins>+ WEBCORE_EXPORT void drawImageBuffer(ImageBuffer&, const FloatPoint& destination, const ImagePaintingOptions& = ImagePaintingOptions());
+ void drawImageBuffer(ImageBuffer&, const FloatRect& destination, const ImagePaintingOptions& = ImagePaintingOptions());
+ void drawImageBuffer(ImageBuffer&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& = ImagePaintingOptions());
</ins><span class="cx">
</span><del>- void drawPattern(Image&, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, ColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</del><ins>+ void drawPattern(Image&, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setImageInterpolationQuality(InterpolationQuality);
</span><span class="cx"> InterpolationQuality imageInterpolationQuality() const { return m_state.imageInterpolationQuality; }
</span><span class="lines">@@ -376,13 +369,13 @@
</span><span class="cx"> WEBCORE_EXPORT void endTransparencyLayer();
</span><span class="cx"> bool isInTransparencyLayer() const { return (m_transparencyCount > 0) && supportsTransparencyLayers(); }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setShadow(const FloatSize&, float blur, const Color&, ColorSpace);
</del><ins>+ WEBCORE_EXPORT void setShadow(const FloatSize&, float blur, const Color&);
</ins><span class="cx"> // Legacy shadow blur radius is used for canvas, and -webkit-box-shadow.
</span><span class="cx"> // It has different treatment of radii > 8px.
</span><del>- void setLegacyShadow(const FloatSize&, float blur, const Color&, ColorSpace);
</del><ins>+ void setLegacyShadow(const FloatSize&, float blur, const Color&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void clearShadow();
</span><del>- bool getShadow(FloatSize&, float&, Color&, ColorSpace&) const;
</del><ins>+ bool getShadow(FloatSize&, float&, Color&) const;
</ins><span class="cx">
</span><span class="cx"> bool hasVisibleShadow() const { return m_state.shadowColor.isValid() && m_state.shadowColor.alpha(); }
</span><span class="cx"> bool hasShadow() const { return hasVisibleShadow() && (m_state.shadowBlur || m_state.shadowOffset.width() || m_state.shadowOffset.height()); }
</span><span class="lines">@@ -463,8 +456,8 @@
</span><span class="cx"> void drawFrameControl(const IntRect& rect, unsigned type, unsigned state);
</span><span class="cx"> void drawFocusRect(const IntRect& rect);
</span><span class="cx"> void paintTextField(const IntRect& rect, unsigned state);
</span><del>- void drawBitmap(SharedBitmap*, const IntRect& dstRect, const IntRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode);
- void drawBitmapPattern(SharedBitmap*, const FloatRect& tileRectIn, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, const IntSize& origSourceSize);
</del><ins>+ void drawBitmap(SharedBitmap*, const IntRect& dstRect, const IntRect& srcRect, CompositeOperator, BlendMode);
+ void drawBitmapPattern(SharedBitmap*, const FloatRect& tileRectIn, const AffineTransform& patternTransform, const FloatPoint& phase, CompositeOperator, const FloatRect& destRect, const IntSize& origSourceSize);
</ins><span class="cx"> void drawIcon(HICON icon, const IntRect& dstRect, UINT flags);
</span><span class="cx"> void drawRoundCorner(bool newClip, RECT clipRect, RECT rectWin, HDC dc, int width, int height);
</span><span class="cx"> #else
</span><span class="lines">@@ -529,17 +522,17 @@
</span><span class="cx">
</span><span class="cx"> void setPlatformTextDrawingMode(TextDrawingModeFlags);
</span><span class="cx">
</span><del>- void setPlatformStrokeColor(const Color&, ColorSpace);
</del><ins>+ void setPlatformStrokeColor(const Color&);
</ins><span class="cx"> void setPlatformStrokeStyle(StrokeStyle);
</span><span class="cx"> void setPlatformStrokeThickness(float);
</span><span class="cx">
</span><del>- void setPlatformFillColor(const Color&, ColorSpace);
</del><ins>+ void setPlatformFillColor(const Color&);
</ins><span class="cx">
</span><span class="cx"> void setPlatformShouldAntialias(bool);
</span><span class="cx"> void setPlatformShouldSmoothFonts(bool);
</span><span class="cx"> void setPlatformImageInterpolationQuality(InterpolationQuality);
</span><span class="cx">
</span><del>- void setPlatformShadow(const FloatSize&, float blur, const Color&, ColorSpace);
</del><ins>+ void setPlatformShadow(const FloatSize&, float blur, const Color&);
</ins><span class="cx"> void clearPlatformShadow();
</span><span class="cx">
</span><span class="cx"> void setPlatformAlpha(float);
</span><span class="lines">@@ -555,7 +548,7 @@
</span><span class="cx"> void platformFillEllipse(const FloatRect&);
</span><span class="cx"> void platformStrokeEllipse(const FloatRect&);
</span><span class="cx">
</span><del>- void platformFillRoundedRect(const FloatRoundedRect&, const Color&, ColorSpace);
</del><ins>+ void platformFillRoundedRect(const FloatRoundedRect&, const Color&);
</ins><span class="cx">
</span><span class="cx"> FloatRect computeLineBoundsAndAntialiasingModeForText(const FloatPoint&, float width, bool printing, bool& shouldAntialias, Color&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Image.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/Image.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -79,21 +79,21 @@
</span><span class="cx"> return dataChanged(allDataReceived);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Image::fillWithSolidColor(GraphicsContext& ctxt, const FloatRect& dstRect, const Color& color, ColorSpace styleColorSpace, CompositeOperator op)
</del><ins>+void Image::fillWithSolidColor(GraphicsContext& ctxt, const FloatRect& dstRect, const Color& color, CompositeOperator op)
</ins><span class="cx"> {
</span><span class="cx"> if (!color.alpha())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CompositeOperator previousOperator = ctxt.compositeOperation();
</span><span class="cx"> ctxt.setCompositeOperation(!color.hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op);
</span><del>- ctxt.fillRect(dstRect, color, styleColorSpace);
</del><ins>+ ctxt.fillRect(dstRect, color);
</ins><span class="cx"> ctxt.setCompositeOperation(previousOperator);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
</del><ins>+void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, const FloatSize& spacing, CompositeOperator op, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (mayFillWithSolidColor()) {
</span><del>- fillWithSolidColor(ctxt, destRect, solidColor(), styleColorSpace, op);
</del><ins>+ fillWithSolidColor(ctxt, destRect, solidColor(), op);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> visibleSrcRect.setY((destRect.y() - oneTileRect.y()) / scale.height());
</span><span class="cx"> visibleSrcRect.setWidth(destRect.width() / scale.width());
</span><span class="cx"> visibleSrcRect.setHeight(destRect.height() / scale.height());
</span><del>- draw(ctxt, destRect, visibleSrcRect, styleColorSpace, op, blendMode, ImageOrientationDescription());
</del><ins>+ draw(ctxt, destRect, visibleSrcRect, op, blendMode, ImageOrientationDescription());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> visibleSrcRect.setY((destRect.y() - oneTileRect.y()) / scale.height());
</span><span class="cx"> visibleSrcRect.setWidth(1);
</span><span class="cx"> visibleSrcRect.setHeight(destRect.height() / scale.height());
</span><del>- draw(ctxt, destRect, visibleSrcRect, styleColorSpace, op, BlendModeNormal, ImageOrientationDescription());
</del><ins>+ draw(ctxt, destRect, visibleSrcRect, op, BlendModeNormal, ImageOrientationDescription());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (size().height() == 1 && intersection(oneTileRect, destRect).width() == destRect.width()) {
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> visibleSrcRect.setY(0);
</span><span class="cx"> visibleSrcRect.setWidth(destRect.width() / scale.width());
</span><span class="cx"> visibleSrcRect.setHeight(1);
</span><del>- draw(ctxt, destRect, visibleSrcRect, styleColorSpace, op, BlendModeNormal, ImageOrientationDescription());
</del><ins>+ draw(ctxt, destRect, visibleSrcRect, op, BlendModeNormal, ImageOrientationDescription());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> FloatRect fromRect(toFloatPoint(currentTileRect.location() - oneTileRect.location()), currentTileRect.size());
</span><span class="cx"> fromRect.scale(1 / scale.width(), 1 / scale.height());
</span><span class="cx">
</span><del>- draw(ctxt, toRect, fromRect, styleColorSpace, op, BlendModeNormal, ImageOrientationDescription());
</del><ins>+ draw(ctxt, toRect, fromRect, op, BlendModeNormal, ImageOrientationDescription());
</ins><span class="cx"> toX += currentTileRect.width();
</span><span class="cx"> currentTileRect.shiftXEdgeTo(oneTileRect.x());
</span><span class="cx"> }
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> AffineTransform patternTransform = AffineTransform().scaleNonUniform(scale.width(), scale.height());
</span><span class="cx"> FloatRect tileRect(FloatPoint(), intrinsicTileSize);
</span><del>- drawPattern(ctxt, tileRect, patternTransform, oneTileRect.location(), spacing, styleColorSpace, op, destRect, blendMode);
</del><ins>+ drawPattern(ctxt, tileRect, patternTransform, oneTileRect.location(), spacing, op, destRect, blendMode);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> startAnimation(DoNotCatchUp);
</span><span class="lines">@@ -202,10 +202,10 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Merge with the other drawTiled eventually, since we need a combination of both for some things.
</span><span class="cx"> void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& dstRect, const FloatRect& srcRect,
</span><del>- const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, ColorSpace styleColorSpace, CompositeOperator op)
</del><ins>+ const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, CompositeOperator op)
</ins><span class="cx"> {
</span><span class="cx"> if (mayFillWithSolidColor()) {
</span><del>- fillWithSolidColor(ctxt, dstRect, solidColor(), styleColorSpace, op);
</del><ins>+ fillWithSolidColor(ctxt, dstRect, solidColor(), op);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> vPhase -= (dstRect.height() - scaledTileHeight) / 2;
</span><span class="cx">
</span><span class="cx"> FloatPoint patternPhase(dstRect.x() - hPhase, dstRect.y() - vPhase);
</span><del>- drawPattern(ctxt, srcRect, patternTransform, patternPhase, spacing, styleColorSpace, op, dstRect);
</del><ins>+ drawPattern(ctxt, srcRect, patternTransform, patternPhase, spacing, op, dstRect);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> startAnimation(DoNotCatchUp);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Image.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #define Image_h
</span><span class="cx">
</span><span class="cx"> #include "Color.h"
</span><del>-#include "ColorSpace.h"
</del><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "GraphicsTypes.h"
</span><span class="lines">@@ -154,7 +153,6 @@
</span><span class="cx"> virtual CGImageRef getCGImageRef() { return 0; }
</span><span class="cx"> virtual CGImageRef getFirstCGImageRefOfSize(const IntSize&) { return 0; }
</span><span class="cx"> virtual RetainPtr<CFArrayRef> getCGImageArray() { return 0; }
</span><del>- static RetainPtr<CGImageRef> imageWithColorSpace(CGImageRef originalImage, ColorSpace);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -171,7 +169,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
</span><span class="cx"> FloatRect adjustSourceRectForDownSampling(const FloatRect& srcRect, const IntSize& scaledSize) const;
</span><span class="lines">@@ -186,16 +184,14 @@
</span><span class="cx"> protected:
</span><span class="cx"> Image(ImageObserver* = nullptr);
</span><span class="cx">
</span><del>- static void fillWithSolidColor(GraphicsContext&, const FloatRect& dstRect, const Color&, ColorSpace styleColorSpace, CompositeOperator);
</del><ins>+ static void fillWithSolidColor(GraphicsContext&, const FloatRect& dstRect, const Color&, CompositeOperator);
</ins><span class="cx">
</span><del>- // The ColorSpace parameter will only be used for untagged images.
</del><span class="cx"> #if PLATFORM(WIN)
</span><del>- virtual void drawFrameMatchingSourceSize(GraphicsContext&, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator) { }
</del><ins>+ virtual void drawFrameMatchingSourceSize(GraphicsContext&, const FloatRect& dstRect, const IntSize& srcSize, CompositeOperator) { }
</ins><span class="cx"> #endif
</span><del>- virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) = 0;
- void drawTiled(GraphicsContext&, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize, const FloatSize& spacing, ColorSpace styleColorSpace,
- CompositeOperator , BlendMode);
- void drawTiled(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, ColorSpace styleColorSpace, CompositeOperator);
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription) = 0;
+ void drawTiled(GraphicsContext&, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize, const FloatSize& spacing, CompositeOperator, BlendMode);
+ void drawTiled(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, CompositeOperator);
</ins><span class="cx">
</span><span class="cx"> // Supporting tiled drawing
</span><span class="cx"> virtual bool mayFillWithSolidColor() { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -134,8 +134,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> void clip(GraphicsContext&, const FloatRect&) const;
</span><span class="cx">
</span><del>- void draw(GraphicsContext&, ColorSpace, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
- void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</del><ins>+ void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
+ void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</ins><span class="cx">
</span><span class="cx"> inline void genericConvertToLuminanceMask();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsNamedImageGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> setContainerSize(size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NamedImageGeneratedImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</del><ins>+void NamedImageGeneratedImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(NEW_THEME)
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NamedImageGeneratedImage::drawPattern(GraphicsContext& context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</del><ins>+void NamedImageGeneratedImage::drawPattern(GraphicsContext& context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(NEW_THEME)
</span><span class="cx"> std::unique_ptr<ImageBuffer> imageBuffer = context.createCompatibleBuffer(size(), true);
</span><span class="lines">@@ -72,14 +72,13 @@
</span><span class="cx"> platformTheme()->drawNamedImage(m_name, graphicsContext, FloatRect(0, 0, size().width(), size().height()));
</span><span class="cx">
</span><span class="cx"> // Tile the image buffer into the context.
</span><del>- imageBuffer->drawPattern(context, srcRect, patternTransform, phase, spacing, styleColorSpace, compositeOp, dstRect, blendMode);
</del><ins>+ imageBuffer->drawPattern(context, srcRect, patternTransform, phase, spacing, compositeOp, dstRect, blendMode);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> UNUSED_PARAM(srcRect);
</span><span class="cx"> UNUSED_PARAM(patternTransform);
</span><span class="cx"> UNUSED_PARAM(phase);
</span><span class="cx"> UNUSED_PARAM(spacing);
</span><del>- UNUSED_PARAM(styleColorSpace);
</del><span class="cx"> UNUSED_PARAM(dstRect);
</span><span class="cx"> UNUSED_PARAM(compositeOp);
</span><span class="cx"> UNUSED_PARAM(blendMode);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsNamedImageGeneratedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
- virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode) override;
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription) override;
+ virtual void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& dstRect, BlendMode) override;
</ins><span class="cx">
</span><span class="cx"> NamedImageGeneratedImage(String name, const FloatSize&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -85,15 +85,14 @@
</span><span class="cx"> return m_imageBuffer.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool setCachedShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const FloatRoundedRect::Radii& radii, const FloatSize& layerSize)
</del><ins>+ bool setCachedShadowValues(const FloatSize& radius, const Color& color, const FloatRect& shadowRect, const FloatRoundedRect::Radii& radii, const FloatSize& layerSize)
</ins><span class="cx"> {
</span><del>- if (!m_lastWasInset && m_lastRadius == radius && m_lastColor == color && m_lastColorSpace == colorSpace && m_lastShadowRect == shadowRect && m_lastRadii == radii && m_lastLayerSize == layerSize)
</del><ins>+ if (!m_lastWasInset && m_lastRadius == radius && m_lastColor == color && m_lastShadowRect == shadowRect && m_lastRadii == radii && m_lastLayerSize == layerSize)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> m_lastWasInset = false;
</span><span class="cx"> m_lastRadius = radius;
</span><span class="cx"> m_lastColor = color;
</span><del>- m_lastColorSpace = colorSpace;
</del><span class="cx"> m_lastShadowRect = shadowRect;
</span><span class="cx"> m_lastRadii = radii;
</span><span class="cx"> m_lastLayerSize = layerSize;
</span><span class="lines">@@ -101,16 +100,15 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool setCachedInsetShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const FloatRoundedRect::Radii& radii)
</del><ins>+ bool setCachedInsetShadowValues(const FloatSize& radius, const Color& color, const FloatRect& bounds, const FloatRect& shadowRect, const FloatRoundedRect::Radii& radii)
</ins><span class="cx"> {
</span><del>- if (m_lastWasInset && m_lastRadius == radius && m_lastColor == color && m_lastColorSpace == colorSpace && m_lastInsetBounds == bounds && shadowRect == m_lastShadowRect && radii == m_lastRadii)
</del><ins>+ if (m_lastWasInset && m_lastRadius == radius && m_lastColor == color && m_lastInsetBounds == bounds && shadowRect == m_lastShadowRect && radii == m_lastRadii)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> m_lastWasInset = true;
</span><span class="cx"> m_lastInsetBounds = bounds;
</span><span class="cx"> m_lastRadius = radius;
</span><span class="cx"> m_lastColor = color;
</span><del>- m_lastColorSpace = colorSpace;
</del><span class="cx"> m_lastShadowRect = shadowRect;
</span><span class="cx"> m_lastRadii = radii;
</span><span class="cx">
</span><span class="lines">@@ -146,7 +144,6 @@
</span><span class="cx"> FloatRect m_lastShadowRect;
</span><span class="cx"> FloatRoundedRect::Radii m_lastRadii;
</span><span class="cx"> Color m_lastColor;
</span><del>- ColorSpace m_lastColorSpace;
</del><span class="cx"> FloatSize m_lastRadius;
</span><span class="cx"> bool m_lastWasInset;
</span><span class="cx"> FloatSize m_lastLayerSize;
</span><span class="lines">@@ -171,9 +168,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-ShadowBlur::ShadowBlur(const FloatSize& radius, const FloatSize& offset, const Color& color, ColorSpace colorSpace)
</del><ins>+ShadowBlur::ShadowBlur(const FloatSize& radius, const FloatSize& offset, const Color& color)
</ins><span class="cx"> : m_color(color)
</span><del>- , m_colorSpace(colorSpace)
</del><span class="cx"> , m_blurRadius(radius)
</span><span class="cx"> , m_offset(offset)
</span><span class="cx"> , m_layerImage(0)
</span><span class="lines">@@ -184,7 +180,6 @@
</span><span class="cx">
</span><span class="cx"> ShadowBlur::ShadowBlur(const GraphicsContextState& state)
</span><span class="cx"> : m_color(state.shadowColor)
</span><del>- , m_colorSpace(state.shadowColorSpace)
</del><span class="cx"> , m_blurRadius(state.shadowBlur, state.shadowBlur)
</span><span class="cx"> , m_offset(state.shadowOffset)
</span><span class="cx"> , m_layerImage(0)
</span><span class="lines">@@ -206,12 +201,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShadowBlur::setShadowValues(const FloatSize& radius, const FloatSize& offset, const Color& color, ColorSpace colorSpace, bool ignoreTransforms)
</del><ins>+void ShadowBlur::setShadowValues(const FloatSize& radius, const FloatSize& offset, const Color& color, bool ignoreTransforms)
</ins><span class="cx"> {
</span><span class="cx"> m_blurRadius = radius;
</span><span class="cx"> m_offset = offset;
</span><span class="cx"> m_color = color;
</span><del>- m_colorSpace = colorSpace;
</del><span class="cx"> m_shadowsIgnoreTransforms = ignoreTransforms;
</span><span class="cx">
</span><span class="cx"> updateShadowBlurValues();
</span><span class="lines">@@ -473,7 +467,7 @@
</span><span class="cx"> graphicsContext.clip(FloatRect(m_layerOrigin, m_layerSize));
</span><span class="cx"> }
</span><span class="cx"> graphicsContext.clipToImageBuffer(*m_layerImage, FloatRect(m_layerOrigin, bufferSize));
</span><del>- graphicsContext.setFillColor(m_color, m_colorSpace);
</del><ins>+ graphicsContext.setFillColor(m_color);
</ins><span class="cx">
</span><span class="cx"> graphicsContext.clearShadow();
</span><span class="cx"> graphicsContext.fillRect(FloatRect(m_layerOrigin, m_sourceRect.size()));
</span><span class="lines">@@ -572,7 +566,7 @@
</span><span class="cx"> bufferRelativeShadowedRect.move(m_layerContextTranslation);
</span><span class="cx">
</span><span class="cx"> // Only redraw in the scratch buffer if its cached contents don't match our needs
</span><del>- bool redrawNeeded = ScratchBuffer::singleton().setCachedShadowValues(m_blurRadius, Color::black, ColorSpaceDeviceRGB, bufferRelativeShadowedRect, shadowedRect.radii(), m_layerSize);
</del><ins>+ bool redrawNeeded = ScratchBuffer::singleton().setCachedShadowValues(m_blurRadius, Color::black, bufferRelativeShadowedRect, shadowedRect.radii(), m_layerSize);
</ins><span class="cx"> if (redrawNeeded) {
</span><span class="cx"> GraphicsContext& shadowContext = m_layerImage->context();
</span><span class="cx"> GraphicsContextStateSaver stateSaver(shadowContext);
</span><span class="lines">@@ -580,7 +574,7 @@
</span><span class="cx"> // Add a pixel to avoid later edge aliasing when rotated.
</span><span class="cx"> shadowContext.clearRect(FloatRect(0, 0, m_layerSize.width() + 1, m_layerSize.height() + 1));
</span><span class="cx"> shadowContext.translate(m_layerContextTranslation);
</span><del>- shadowContext.setFillColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ shadowContext.setFillColor(Color::black);
</ins><span class="cx"> if (shadowedRect.radii().isZero())
</span><span class="cx"> shadowContext.fillRect(shadowedRect.rect());
</span><span class="cx"> else {
</span><span class="lines">@@ -610,7 +604,7 @@
</span><span class="cx"> bufferRelativeHoleRect.move(m_layerContextTranslation);
</span><span class="cx">
</span><span class="cx"> // Only redraw in the scratch buffer if its cached contents don't match our needs
</span><del>- bool redrawNeeded = ScratchBuffer::singleton().setCachedInsetShadowValues(m_blurRadius, Color::black, ColorSpaceDeviceRGB, bufferRelativeRect, bufferRelativeHoleRect, holeRect.radii());
</del><ins>+ bool redrawNeeded = ScratchBuffer::singleton().setCachedInsetShadowValues(m_blurRadius, Color::black, bufferRelativeRect, bufferRelativeHoleRect, holeRect.radii());
</ins><span class="cx"> if (redrawNeeded) {
</span><span class="cx"> GraphicsContext& shadowContext = m_layerImage->context();
</span><span class="cx"> GraphicsContextStateSaver stateSaver(shadowContext);
</span><span class="lines">@@ -627,7 +621,7 @@
</span><span class="cx"> path.addRoundedRect(holeRect);
</span><span class="cx">
</span><span class="cx"> shadowContext.setFillRule(RULE_EVENODD);
</span><del>- shadowContext.setFillColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ shadowContext.setFillColor(Color::black);
</ins><span class="cx"> shadowContext.fillPath(path);
</span><span class="cx">
</span><span class="cx"> blurShadowBuffer(expandedIntSize(m_layerSize));
</span><span class="lines">@@ -681,14 +675,14 @@
</span><span class="cx"> FloatRect templateHole = FloatRect(edgeSize.width(), edgeSize.height(), templateSize.width() - 2 * edgeSize.width(), templateSize.height() - 2 * edgeSize.height());
</span><span class="cx">
</span><span class="cx"> // Only redraw in the scratch buffer if its cached contents don't match our needs
</span><del>- bool redrawNeeded = ScratchBuffer::singleton().setCachedInsetShadowValues(m_blurRadius, m_color, m_colorSpace, templateBounds, templateHole, holeRect.radii());
</del><ins>+ bool redrawNeeded = ScratchBuffer::singleton().setCachedInsetShadowValues(m_blurRadius, m_color, templateBounds, templateHole, holeRect.radii());
</ins><span class="cx"> if (redrawNeeded) {
</span><span class="cx"> // Draw shadow into a new ImageBuffer.
</span><span class="cx"> GraphicsContext& shadowContext = m_layerImage->context();
</span><span class="cx"> GraphicsContextStateSaver shadowStateSaver(shadowContext);
</span><span class="cx"> shadowContext.clearRect(templateBounds);
</span><span class="cx"> shadowContext.setFillRule(RULE_EVENODD);
</span><del>- shadowContext.setFillColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ shadowContext.setFillColor(Color::black);
</ins><span class="cx">
</span><span class="cx"> Path path;
</span><span class="cx"> path.addRect(templateBounds);
</span><span class="lines">@@ -724,7 +718,7 @@
</span><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver fillStateSaver(graphicsContext);
</span><span class="cx"> graphicsContext.setFillRule(RULE_EVENODD);
</span><del>- graphicsContext.setFillColor(m_color, m_colorSpace);
</del><ins>+ graphicsContext.setFillColor(m_color);
</ins><span class="cx"> graphicsContext.clearShadow();
</span><span class="cx"> graphicsContext.fillPath(exteriorPath);
</span><span class="cx"> }
</span><span class="lines">@@ -745,14 +739,14 @@
</span><span class="cx"> FloatRect templateShadow = FloatRect(edgeSize.width(), edgeSize.height(), templateSize.width() - 2 * edgeSize.width(), templateSize.height() - 2 * edgeSize.height());
</span><span class="cx">
</span><span class="cx"> // Only redraw in the scratch buffer if its cached contents don't match our needs
</span><del>- bool redrawNeeded = scratchBuffer.setCachedShadowValues(m_blurRadius, m_color, m_colorSpace, templateShadow, shadowedRect.radii(), m_layerSize);
</del><ins>+ bool redrawNeeded = scratchBuffer.setCachedShadowValues(m_blurRadius, m_color, templateShadow, shadowedRect.radii(), m_layerSize);
</ins><span class="cx"> if (redrawNeeded) {
</span><span class="cx"> // Draw shadow into the ImageBuffer.
</span><span class="cx"> GraphicsContext& shadowContext = m_layerImage->context();
</span><span class="cx"> GraphicsContextStateSaver shadowStateSaver(shadowContext);
</span><span class="cx">
</span><span class="cx"> shadowContext.clearRect(FloatRect(0, 0, templateSize.width(), templateSize.height()));
</span><del>- shadowContext.setFillColor(Color::black, ColorSpaceDeviceRGB);
</del><ins>+ shadowContext.setFillColor(Color::black);
</ins><span class="cx">
</span><span class="cx"> if (shadowedRect.radii().isZero())
</span><span class="cx"> shadowContext.fillRect(templateShadow);
</span><span class="lines">@@ -798,14 +792,14 @@
</span><span class="cx"> FloatRect shadowInterior(shadowBounds.x() + leftSlice, shadowBounds.y() + topSlice, centerWidth, centerHeight);
</span><span class="cx"> if (!shadowInterior.isEmpty()) {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(graphicsContext);
</span><del>- graphicsContext.setFillColor(m_color, m_colorSpace);
</del><ins>+ graphicsContext.setFillColor(m_color);
</ins><span class="cx"> graphicsContext.clearShadow();
</span><span class="cx"> graphicsContext.fillRect(shadowInterior);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(graphicsContext);
</span><del>- graphicsContext.setFillColor(m_color, m_colorSpace);
</del><ins>+ graphicsContext.setFillColor(m_color);
</ins><span class="cx"> graphicsContext.clearShadow();
</span><span class="cx">
</span><span class="cx"> // Note that drawing the ImageBuffer is faster than creating a Image and drawing that,
</span><span class="lines">@@ -816,46 +810,46 @@
</span><span class="cx"> // Top side.
</span><span class="cx"> FloatRect tileRect = FloatRect(leftSlice, 0, templateSideLength, topSlice);
</span><span class="cx"> FloatRect destRect = FloatRect(centerRect.x(), centerRect.y() - topSlice, centerRect.width(), topSlice);
</span><del>- graphicsContext.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, destRect, tileRect);
</del><ins>+ graphicsContext.drawImageBuffer(*m_layerImage, destRect, tileRect);
</ins><span class="cx">
</span><span class="cx"> // Draw the bottom side.
</span><span class="cx"> tileRect.setY(templateSize.height() - bottomSlice);
</span><span class="cx"> tileRect.setHeight(bottomSlice);
</span><span class="cx"> destRect.setY(centerRect.maxY());
</span><span class="cx"> destRect.setHeight(bottomSlice);
</span><del>- graphicsContext.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, destRect, tileRect);
</del><ins>+ graphicsContext.drawImageBuffer(*m_layerImage, destRect, tileRect);
</ins><span class="cx">
</span><span class="cx"> // Left side.
</span><span class="cx"> tileRect = FloatRect(0, topSlice, leftSlice, templateSideLength);
</span><span class="cx"> destRect = FloatRect(centerRect.x() - leftSlice, centerRect.y(), leftSlice, centerRect.height());
</span><del>- graphicsContext.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, destRect, tileRect);
</del><ins>+ graphicsContext.drawImageBuffer(*m_layerImage, destRect, tileRect);
</ins><span class="cx">
</span><span class="cx"> // Right side.
</span><span class="cx"> tileRect.setX(templateSize.width() - rightSlice);
</span><span class="cx"> tileRect.setWidth(rightSlice);
</span><span class="cx"> destRect.setX(centerRect.maxX());
</span><span class="cx"> destRect.setWidth(rightSlice);
</span><del>- graphicsContext.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, destRect, tileRect);
</del><ins>+ graphicsContext.drawImageBuffer(*m_layerImage, destRect, tileRect);
</ins><span class="cx">
</span><span class="cx"> // Top left corner.
</span><span class="cx"> tileRect = FloatRect(0, 0, leftSlice, topSlice);
</span><span class="cx"> destRect = FloatRect(centerRect.x() - leftSlice, centerRect.y() - topSlice, leftSlice, topSlice);
</span><del>- graphicsContext.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, destRect, tileRect);
</del><ins>+ graphicsContext.drawImageBuffer(*m_layerImage, destRect, tileRect);
</ins><span class="cx">
</span><span class="cx"> // Top right corner.
</span><span class="cx"> tileRect = FloatRect(templateSize.width() - rightSlice, 0, rightSlice, topSlice);
</span><span class="cx"> destRect = FloatRect(centerRect.maxX(), centerRect.y() - topSlice, rightSlice, topSlice);
</span><del>- graphicsContext.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, destRect, tileRect);
</del><ins>+ graphicsContext.drawImageBuffer(*m_layerImage, destRect, tileRect);
</ins><span class="cx">
</span><span class="cx"> // Bottom right corner.
</span><span class="cx"> tileRect = FloatRect(templateSize.width() - rightSlice, templateSize.height() - bottomSlice, rightSlice, bottomSlice);
</span><span class="cx"> destRect = FloatRect(centerRect.maxX(), centerRect.maxY(), rightSlice, bottomSlice);
</span><del>- graphicsContext.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, destRect, tileRect);
</del><ins>+ graphicsContext.drawImageBuffer(*m_layerImage, destRect, tileRect);
</ins><span class="cx">
</span><span class="cx"> // Bottom left corner.
</span><span class="cx"> tileRect = FloatRect(0, templateSize.height() - bottomSlice, leftSlice, bottomSlice);
</span><span class="cx"> destRect = FloatRect(centerRect.x() - leftSlice, centerRect.maxY(), leftSlice, bottomSlice);
</span><del>- graphicsContext.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, destRect, tileRect);
</del><ins>+ graphicsContext.drawImageBuffer(*m_layerImage, destRect, tileRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -878,7 +872,7 @@
</span><span class="cx"> GraphicsContext& shadowContext = m_layerImage->context();
</span><span class="cx"> GraphicsContextStateSaver stateSaver(shadowContext);
</span><span class="cx"> shadowContext.setCompositeOperation(CompositeSourceIn);
</span><del>- shadowContext.setFillColor(m_color, m_colorSpace);
</del><ins>+ shadowContext.setFillColor(m_color);
</ins><span class="cx"> shadowContext.fillRect(FloatRect(0, 0, templateSize.width(), templateSize.height()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -894,7 +888,7 @@
</span><span class="cx"> // We reset the scratch buffer values here, because the buffer will no longer contain
</span><span class="cx"> // data from any previous rectangle or inset shadows drawn via the tiling path.
</span><span class="cx"> auto& scratchBuffer = ScratchBuffer::singleton();
</span><del>- scratchBuffer.setCachedShadowValues(FloatSize(), Color::black, ColorSpaceDeviceRGB, IntRect(), FloatRoundedRect::Radii(), m_layerSize);
</del><ins>+ scratchBuffer.setCachedShadowValues(FloatSize(), Color::black, IntRect(), FloatRoundedRect::Radii(), m_layerSize);
</ins><span class="cx"> m_layerImage = scratchBuffer.getScratchBuffer(layerRect.size());
</span><span class="cx">
</span><span class="cx"> GraphicsContext& shadowContext = m_layerImage->context();
</span><span class="lines">@@ -915,7 +909,7 @@
</span><span class="cx"> GraphicsContextStateSaver stateSave(context);
</span><span class="cx">
</span><span class="cx"> context.clearShadow();
</span><del>- context.drawImageBuffer(*m_layerImage, ColorSpaceDeviceRGB, FloatRect(roundedIntPoint(m_layerOrigin), m_layerSize), FloatRect(FloatPoint(), m_layerSize), context.compositeOperation());
</del><ins>+ context.drawImageBuffer(*m_layerImage, FloatRect(roundedIntPoint(m_layerOrigin), m_layerSize), FloatRect(FloatPoint(), m_layerSize), context.compositeOperation());
</ins><span class="cx">
</span><span class="cx"> m_layerImage = nullptr;
</span><span class="cx"> ScratchBuffer::singleton().scheduleScratchBufferPurge();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -51,11 +51,11 @@
</span><span class="cx"> BlurShadow
</span><span class="cx"> };
</span><span class="cx">
</span><del>- ShadowBlur(const FloatSize& radius, const FloatSize& offset, const Color&, ColorSpace);
</del><ins>+ ShadowBlur(const FloatSize& radius, const FloatSize& offset, const Color&);
</ins><span class="cx"> ShadowBlur(const GraphicsContextState&);
</span><span class="cx"> ShadowBlur();
</span><span class="cx">
</span><del>- void setShadowValues(const FloatSize&, const FloatSize& , const Color&, ColorSpace, bool ignoreTransforms = false);
</del><ins>+ void setShadowValues(const FloatSize&, const FloatSize& , const Color&, bool ignoreTransforms = false);
</ins><span class="cx">
</span><span class="cx"> void setShadowsIgnoreTransforms(bool ignoreTransforms) { m_shadowsIgnoreTransforms = ignoreTransforms; }
</span><span class="cx"> bool shadowsIgnoreTransforms() const { return m_shadowsIgnoreTransforms; }
</span><span class="lines">@@ -104,7 +104,6 @@
</span><span class="cx"> ShadowType m_type;
</span><span class="cx">
</span><span class="cx"> Color m_color;
</span><del>- ColorSpace m_colorSpace;
</del><span class="cx"> FloatSize m_blurRadius;
</span><span class="cx"> FloatSize m_offset;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx">
</span><span class="cx"> m_videoLayer = adoptNS([allocAVPlayerLayerInstance() init]);
</span><span class="cx"> [m_videoLayer setPlayer:m_avPlayer.get()];
</span><del>- [m_videoLayer setBackgroundColor:cachedCGColor(Color::black, ColorSpaceDeviceRGB)];
</del><ins>+ [m_videoLayer setBackgroundColor:cachedCGColor(Color::black)];
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> [m_videoLayer setName:@"MediaPlayerPrivate AVPlayerLayer"];
</span><span class="cx"> #endif
</span><span class="lines">@@ -2347,7 +2347,7 @@
</span><span class="cx"> FloatRect transformedOutputRect = videoTransform.inverse().mapRect(outputRect);
</span><span class="cx">
</span><span class="cx"> context.concatCTM(videoTransform);
</span><del>- context.drawNativeImage(m_lastImage.get(), imageRect.size(), ColorSpaceDeviceRGB, transformedOutputRect, imageRect);
</del><ins>+ context.drawNativeImage(m_lastImage.get(), imageRect.size(), transformedOutputRect, imageRect);
</ins><span class="cx">
</span><span class="cx"> // If we have created an AVAssetImageGenerator in the past due to m_videoOutput not having an available
</span><span class="cx"> // video frame, destroy it now that it is no longer needed.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -986,8 +986,7 @@
</span><span class="cx"> if (!newImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Check to see if the image changed; we have to do this because the call to
- // CGImageCreateCopyWithColorSpace() below can create a new image every time.
</del><ins>+ // FIXME: probably don't need m_uncorrectedContentsImage at all now.
</ins><span class="cx"> if (m_uncorrectedContentsImage && m_uncorrectedContentsImage.get() == newImage)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx">
</span><span class="cx"> int repaintCount = platformCALayerIncrementRepaintCount(platformCALayer);
</span><span class="cx"> if (m_controller.rootLayer().owner()->platformCALayerShowRepaintCounter(0))
</span><del>- PlatformCALayer::drawRepaintIndicator(context.platformContext(), platformCALayer, repaintCount, cachedCGColor(m_controller.tileDebugBorderColor(), ColorSpaceDeviceRGB));
</del><ins>+ PlatformCALayer::drawRepaintIndicator(context.platformContext(), platformCALayer, repaintCount, cachedCGColor(m_controller.tileDebugBorderColor()));
</ins><span class="cx">
</span><span class="cx"> if (m_controller.scrollingPerformanceLoggingEnabled()) {
</span><span class="cx"> FloatRect visiblePart(platformCALayer->position().x(), platformCALayer->position().y(), platformCALayer->bounds().size().width(), platformCALayer->bounds().size().height());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> if (borderWidth > 0)
</span><span class="cx"> backgroundColor = CACFLayerGetBorderColor(caLayer);
</span><span class="cx"> else
</span><del>- backgroundColor = cachedCGColor(Color(255, 0, 0), ColorSpaceDeviceRGB);
</del><ins>+ backgroundColor = cachedCGColor(Color(255, 0, 0));
</ins><span class="cx">
</span><span class="cx"> PlatformCALayer::drawRepaintIndicator(context, owner(), drawCount, backgroundColor);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoBitmapImageCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> checkForSolidColor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BitmapImage::draw(GraphicsContext& context, const FloatRect& dst, const FloatRect& src, ColorSpace styleColorSpace, CompositeOperator op,
</del><ins>+void BitmapImage::draw(GraphicsContext& context, const FloatRect& dst, const FloatRect& src, CompositeOperator op,
</ins><span class="cx"> BlendMode blendMode, ImageOrientationDescription description)
</span><span class="cx"> {
</span><span class="cx"> if (!dst.width() || !dst.height() || !src.width() || !src.height())
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (mayFillWithSolidColor()) {
</span><del>- fillWithSolidColor(context, dst, solidColor(), styleColorSpace, op);
</del><ins>+ fillWithSolidColor(context, dst, solidColor(), op);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -224,7 +224,6 @@
</span><span class="cx"> platformContext()->shadowBlur().setShadowValues(FloatSize(m_state.shadowBlur, m_state.shadowBlur),
</span><span class="cx"> m_state.shadowOffset,
</span><span class="cx"> m_state.shadowColor,
</span><del>- m_state.shadowColorSpace,
</del><span class="cx"> m_state.shadowsIgnoreTransforms);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -451,7 +450,7 @@
</span><span class="cx"> shadowAndFillCurrentCairoPath(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace)
</del><ins>+void GraphicsContext::fillRect(const FloatRect& rect, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -724,13 +723,13 @@
</span><span class="cx"> m_data->translate(x, y);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setPlatformFillColor(const Color&, ColorSpace)
</del><ins>+void GraphicsContext::setPlatformFillColor(const Color&)
</ins><span class="cx"> {
</span><span class="cx"> // Cairo contexts can't hold separate fill and stroke colors
</span><span class="cx"> // so we set them just before we actually fill or stroke
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setPlatformStrokeColor(const Color&, ColorSpace)
</del><ins>+void GraphicsContext::setPlatformStrokeColor(const Color&)
</ins><span class="cx"> {
</span><span class="cx"> // Cairo contexts can't hold separate fill and stroke colors
</span><span class="cx"> // so we set them just before we actually fill or stroke
</span><span class="lines">@@ -798,7 +797,7 @@
</span><span class="cx"> m_data->setCTM(transform);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setPlatformShadow(FloatSize const& size, float, Color const&, ColorSpace)
</del><ins>+void GraphicsContext::setPlatformShadow(FloatSize const& size, float, Color const&)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -813,7 +812,6 @@
</span><span class="cx"> platformContext()->shadowBlur().setShadowValues(FloatSize(m_state.shadowBlur, m_state.shadowBlur),
</span><span class="cx"> m_state.shadowOffset,
</span><span class="cx"> m_state.shadowColor,
</span><del>- m_state.shadowColorSpace,
</del><span class="cx"> m_state.shadowsIgnoreTransforms);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1019,7 +1017,7 @@
</span><span class="cx"> cairo_set_fill_rule(cr, savedFillRule);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::platformFillRoundedRect(const FloatRoundedRect& rect, const Color& color, ColorSpace)
</del><ins>+void GraphicsContext::platformFillRoundedRect(const FloatRoundedRect& rect, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -1037,7 +1035,7 @@
</span><span class="cx"> cairo_restore(cr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRectWithRoundedHole(const FloatRect& rect, const FloatRoundedRect& roundedHoleRect, const Color& color, ColorSpace)
</del><ins>+void GraphicsContext::fillRectWithRoundedHole(const FloatRect& rect, const FloatRoundedRect& roundedHoleRect, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled() || !color.isValid())
</span><span class="cx"> return;
</span><span class="lines">@@ -1059,7 +1057,7 @@
</span><span class="cx"> cairo_restore(cr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawPattern(Image& image, const FloatRect& tileRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize&, ColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
</del><ins>+void GraphicsContext::drawPattern(Image& image, const FloatRect& tileRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize&, CompositeOperator op, const FloatRect& destRect, BlendMode)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<cairo_surface_t> surface = image.nativeImageForCurrentFrame();
</span><span class="cx"> if (!surface) // If it's too early we won't have an image yet.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -165,19 +165,19 @@
</span><span class="cx"> context.platformContext()->pushImageMask(m_data.m_surface.get(), maskRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageBuffer::draw(GraphicsContext& destinationContext, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect,
</del><ins>+void ImageBuffer::draw(GraphicsContext& destinationContext, const FloatRect& destRect, const FloatRect& srcRect,
</ins><span class="cx"> CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
</span><span class="cx"> {
</span><span class="cx"> BackingStoreCopy copyMode = &destinationContext == &context() ? CopyBackingStore : DontCopyBackingStore;
</span><span class="cx"> RefPtr<Image> image = copyImage(copyMode);
</span><del>- destinationContext.drawImage(*image, styleColorSpace, destRect, srcRect, ImagePaintingOptions(op, blendMode, ImageOrientationDescription(), useLowQualityScale));
</del><ins>+ destinationContext.drawImage(*image, destRect, srcRect, ImagePaintingOptions(op, blendMode, ImageOrientationDescription(), useLowQualityScale));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageBuffer::drawPattern(GraphicsContext& context, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator op, const FloatRect& destRect, BlendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (RefPtr<Image> image = copyImage(DontCopyBackingStore))
</span><del>- image->drawPattern(context, srcRect, patternTransform, phase, spacing, styleColorSpace, op, destRect);
</del><ins>+ image->drawPattern(context, srcRect, patternTransform, phase, spacing, op, destRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> void Image::drawPattern(GraphicsContext& context, const FloatRect& tileRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace colorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><del>- context.drawPattern(*this, tileRect, patternTransform, phase, spacing, colorSpace, op, destRect, blendMode);
</del><ins>+ context.drawPattern(*this, tileRect, patternTransform, phase, spacing, op, destRect, blendMode);
</ins><span class="cx">
</span><span class="cx"> if (imageObserver())
</span><span class="cx"> imageObserver()->didDraw(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgBitmapImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> return adoptCF(array);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BitmapImage::draw(GraphicsContext& ctxt, const FloatRect& destRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription description)
</del><ins>+void BitmapImage::draw(GraphicsContext& ctxt, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription description)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> startAnimation(DoNotCatchUp);
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (mayFillWithSolidColor()) {
</span><del>- fillWithSolidColor(ctxt, destRect, solidColor(), styleColorSpace, compositeOp);
</del><ins>+ fillWithSolidColor(ctxt, destRect, solidColor(), compositeOp);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> if (description.respectImageOrientation() == RespectImageOrientation)
</span><span class="cx"> orientation = frameOrientationAtIndex(m_currentFrame);
</span><span class="cx">
</span><del>- ctxt.drawNativeImage(image.get(), imageSize, styleColorSpace, destRect, scaledSrcRect, compositeOp, blendMode, orientation);
</del><ins>+ ctxt.drawNativeImage(image.get(), imageSize, destRect, scaledSrcRect, compositeOp, blendMode, orientation);
</ins><span class="cx">
</span><span class="cx"> if (imageObserver())
</span><span class="cx"> imageObserver()->didDraw(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgColorCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -100,26 +100,26 @@
</span><span class="cx"> m_valid = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static CGColorRef leakCGColor(const Color& color, ColorSpace colorSpace)
</del><ins>+static CGColorRef leakCGColor(const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> CGFloat components[4];
</span><span class="cx"> color.getRGBA(components[0], components[1], components[2], components[3]);
</span><del>- return CGColorCreate(cachedCGColorSpace(colorSpace), components);
</del><ins>+ return CGColorCreate(sRGBColorSpaceRef(), components);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<ColorSpace colorSpace> static CGColorRef cachedCGColor(const Color& color)
</del><ins>+CGColorRef cachedCGColor(const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> switch (color.rgb()) {
</span><span class="cx"> case Color::transparent: {
</span><del>- static CGColorRef transparentCGColor = leakCGColor(color, colorSpace);
</del><ins>+ static CGColorRef transparentCGColor = leakCGColor(color);
</ins><span class="cx"> return transparentCGColor;
</span><span class="cx"> }
</span><span class="cx"> case Color::black: {
</span><del>- static CGColorRef blackCGColor = leakCGColor(color, colorSpace);
</del><ins>+ static CGColorRef blackCGColor = leakCGColor(color);
</ins><span class="cx"> return blackCGColor;
</span><span class="cx"> }
</span><span class="cx"> case Color::white: {
</span><del>- static CGColorRef whiteCGColor = leakCGColor(color, colorSpace);
</del><ins>+ static CGColorRef whiteCGColor = leakCGColor(color);
</ins><span class="cx"> return whiteCGColor;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> return cachedCGColors[i].get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CGColorRef newCGColor = leakCGColor(color, colorSpace);
</del><ins>+ CGColorRef newCGColor = leakCGColor(color);
</ins><span class="cx">
</span><span class="cx"> static size_t cursor;
</span><span class="cx"> cachedRGBAValues[cursor] = color.rgb();
</span><span class="lines">@@ -146,20 +146,6 @@
</span><span class="cx"> return newCGColor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CGColorRef cachedCGColor(const Color& color, ColorSpace colorSpace)
-{
- switch (colorSpace) {
- case ColorSpaceDeviceRGB:
- return cachedCGColor<ColorSpaceDeviceRGB>(color);
- case ColorSpaceSRGB:
- return cachedCGColor<ColorSpaceSRGB>(color);
- case ColorSpaceLinearRGB:
- return cachedCGColor<ColorSpaceLinearRGB>(color);
- }
- ASSERT_NOT_REACHED();
- return cachedCGColor(color, ColorSpaceDeviceRGB);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> #endif // USE(CG)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContext3DCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> context.scale(FloatSize(1, -1));
</span><span class="cx"> context.translate(0, -imageHeight);
</span><span class="cx"> context.setImageInterpolationQuality(InterpolationNone);
</span><del>- context.drawNativeImage(cgImage.get(), imageSize, ColorSpaceDeviceRGB, canvasRect, FloatRect(FloatPoint(), imageSize), CompositeCopy);
</del><ins>+ context.drawNativeImage(cgImage.get(), imageSize, canvasRect, FloatRect(FloatPoint(), imageSize), CompositeCopy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -63,16 +63,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static void setCGFillColor(CGContextRef context, const Color& color, ColorSpace colorSpace)
</del><ins>+static void setCGFillColor(CGContextRef context, const Color& color)
</ins><span class="cx"> {
</span><del>- CGContextSetFillColorWithColor(context, cachedCGColor(color, colorSpace));
</del><ins>+ CGContextSetFillColorWithColor(context, cachedCGColor(color));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void setCGStrokeColor(CGContextRef context, const Color& color, ColorSpace colorSpace)
</del><ins>+static void setCGStrokeColor(CGContextRef context, const Color& color)
</ins><span class="cx"> {
</span><del>- CGContextSetStrokeColorWithColor(context, cachedCGColor(color, colorSpace));
</del><ins>+ CGContextSetStrokeColorWithColor(context, cachedCGColor(color));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: This should be removed soon.
</ins><span class="cx"> CGColorSpaceRef deviceRGBColorSpaceRef()
</span><span class="cx"> {
</span><span class="cx"> static CGColorSpaceRef deviceSpace = CGColorSpaceCreateDeviceRGB();
</span><span class="lines">@@ -123,8 +124,8 @@
</span><span class="cx"> setPaintingDisabled(!cgContext);
</span><span class="cx"> if (cgContext) {
</span><span class="cx"> // Make sure the context starts in sync with our state.
</span><del>- setPlatformFillColor(fillColor(), fillColorSpace());
- setPlatformStrokeColor(strokeColor(), strokeColorSpace());
</del><ins>+ setPlatformFillColor(fillColor());
+ setPlatformStrokeColor(strokeColor());
</ins><span class="cx"> setPlatformStrokeThickness(strokeThickness());
</span><span class="cx"> m_state.imageInterpolationQuality = convertInterpolationQuality(CGContextGetInterpolationQuality(platformContext()));
</span><span class="cx"> }
</span><span class="lines">@@ -159,7 +160,7 @@
</span><span class="cx"> m_data->m_userToDeviceTransformKnownToBeIdentity = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawNativeImage(PassNativeImagePtr imagePtr, const FloatSize& imageSize, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode blendMode, ImageOrientation orientation)
</del><ins>+void GraphicsContext::drawNativeImage(PassNativeImagePtr imagePtr, const FloatSize& imageSize, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode blendMode, ImageOrientation orientation)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CGImageRef> image(imagePtr);
</span><span class="cx">
</span><span class="lines">@@ -250,9 +251,6 @@
</span><span class="cx"> CGContextTranslateCTM(context, 0, adjustedDestRect.height());
</span><span class="cx"> CGContextScaleCTM(context, 1, -1);
</span><span class="cx">
</span><del>- // Adjust the color space.
- image = Image::imageWithColorSpace(image.get(), styleColorSpace);
-
</del><span class="cx"> // Draw the image.
</span><span class="cx"> CGContextDrawImage(context, adjustedDestRect, image.get());
</span><span class="cx"> }
</span><span class="lines">@@ -276,7 +274,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawPattern(Image& image, const FloatRect& tileRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+void GraphicsContext::drawPattern(Image& image, const FloatRect& tileRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (!patternTransform.isInvertible())
</span><span class="cx"> return;
</span><span class="lines">@@ -316,9 +314,6 @@
</span><span class="cx"> subImage = adoptCF(CGImageCreateWithImageInRect(tileImage, tileRect));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Adjust the color space.
- subImage = Image::imageWithColorSpace(subImage.get(), styleColorSpace);
-
</del><span class="cx"> // If we need to paint gaps between tiles because we have a partially loaded image or non-zero spacing,
</span><span class="cx"> // fall back to the less efficient CGPattern-based mechanism.
</span><span class="cx"> float scaledTileWidth = tileRect.width() * narrowPrecisionToFloat(patternTransform.a());
</span><span class="lines">@@ -346,7 +341,7 @@
</span><span class="cx"> if (!pattern)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RetainPtr<CGColorSpaceRef> patternSpace = adoptCF(CGColorSpaceCreatePattern(0));
</del><ins>+ RetainPtr<CGColorSpaceRef> patternSpace = adoptCF(CGColorSpaceCreatePattern(nullptr));
</ins><span class="cx">
</span><span class="cx"> CGFloat alpha = 1;
</span><span class="cx"> RetainPtr<CGColorRef> color = adoptCF(CGColorCreateWithPattern(patternSpace.get(), pattern.get(), &alpha));
</span><span class="lines">@@ -390,7 +385,7 @@
</span><span class="cx"> // We do a fill of four rects to simulate the stroke of a border.
</span><span class="cx"> Color oldFillColor = fillColor();
</span><span class="cx"> if (oldFillColor != strokeColor())
</span><del>- setCGFillColor(context, strokeColor(), strokeColorSpace());
</del><ins>+ setCGFillColor(context, strokeColor());
</ins><span class="cx"> CGRect rects[4] = {
</span><span class="cx"> FloatRect(rect.x(), rect.y(), rect.width(), borderThickness),
</span><span class="cx"> FloatRect(rect.x(), rect.maxY() - borderThickness, rect.width(), borderThickness),
</span><span class="lines">@@ -399,7 +394,7 @@
</span><span class="cx"> };
</span><span class="cx"> CGContextFillRects(context, rects, 4);
</span><span class="cx"> if (oldFillColor != strokeColor())
</span><del>- setCGFillColor(context, oldFillColor, fillColorSpace());
</del><ins>+ setCGFillColor(context, oldFillColor);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -428,7 +423,7 @@
</span><span class="cx"> if (drawsDashedLine) {
</span><span class="cx"> // Figure out end points to ensure we always paint corners.
</span><span class="cx"> cornerWidth = strokeStyle == DottedStroke ? thickness : std::min(2 * thickness, std::max(thickness, strokeWidth / 3));
</span><del>- setCGFillColor(context, strokeColor(), strokeColorSpace());
</del><ins>+ setCGFillColor(context, strokeColor());
</ins><span class="cx"> if (isVerticalLine) {
</span><span class="cx"> CGContextFillRect(context, FloatRect(point1.x(), point1.y(), thickness, cornerWidth));
</span><span class="cx"> CGContextFillRect(context, FloatRect(point1.x(), point2.y() - cornerWidth, thickness, cornerWidth));
</span><span class="lines">@@ -603,7 +598,7 @@
</span><span class="cx"> if (!platformPattern)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RetainPtr<CGColorSpaceRef> patternSpace = adoptCF(CGColorSpaceCreatePattern(0));
</del><ins>+ RetainPtr<CGColorSpaceRef> patternSpace = adoptCF(CGColorSpaceCreatePattern(nullptr));
</ins><span class="cx"> CGContextSetFillColorSpace(cgContext, patternSpace.get());
</span><span class="cx">
</span><span class="cx"> const CGFloat patternAlpha = 1;
</span><span class="lines">@@ -833,17 +828,16 @@
</span><span class="cx"> CGContextFillRect(context, rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::fillRect(const FloatRect& rect, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CGContextRef context = platformContext();
</span><span class="cx"> Color oldFillColor = fillColor();
</span><del>- ColorSpace oldColorSpace = fillColorSpace();
</del><span class="cx">
</span><del>- if (oldFillColor != color || oldColorSpace != colorSpace)
- setCGFillColor(context, color, colorSpace);
</del><ins>+ if (oldFillColor != color)
+ setCGFillColor(context, color);
</ins><span class="cx">
</span><span class="cx"> bool drawOwnShadow = !isAcceleratedContext() && hasBlurredShadow() && !m_state.shadowsIgnoreTransforms; // Don't use ShadowBlur for canvas yet.
</span><span class="cx"> CGContextStateSaver stateSaver(context, drawOwnShadow);
</span><span class="lines">@@ -860,21 +854,20 @@
</span><span class="cx"> if (drawOwnShadow)
</span><span class="cx"> stateSaver.restore();
</span><span class="cx">
</span><del>- if (oldFillColor != color || oldColorSpace != colorSpace)
- setCGFillColor(context, oldFillColor, oldColorSpace);
</del><ins>+ if (oldFillColor != color)
+ setCGFillColor(context, oldFillColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::platformFillRoundedRect(const FloatRoundedRect& rect, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::platformFillRoundedRect(const FloatRoundedRect& rect, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CGContextRef context = platformContext();
</span><span class="cx"> Color oldFillColor = fillColor();
</span><del>- ColorSpace oldColorSpace = fillColorSpace();
</del><span class="cx">
</span><del>- if (oldFillColor != color || oldColorSpace != colorSpace)
- setCGFillColor(context, color, colorSpace);
</del><ins>+ if (oldFillColor != color)
+ setCGFillColor(context, color);
</ins><span class="cx">
</span><span class="cx"> bool drawOwnShadow = !isAcceleratedContext() && hasBlurredShadow() && !m_state.shadowsIgnoreTransforms; // Don't use ShadowBlur for canvas yet.
</span><span class="cx"> CGContextStateSaver stateSaver(context, drawOwnShadow);
</span><span class="lines">@@ -902,11 +895,11 @@
</span><span class="cx"> if (drawOwnShadow)
</span><span class="cx"> stateSaver.restore();
</span><span class="cx">
</span><del>- if (oldFillColor != color || oldColorSpace != colorSpace)
- setCGFillColor(context, oldFillColor, oldColorSpace);
</del><ins>+ if (oldFillColor != color)
+ setCGFillColor(context, oldFillColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::fillRectWithRoundedHole(const FloatRect& rect, const FloatRoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::fillRectWithRoundedHole(const FloatRect& rect, const FloatRoundedRect& roundedHoleRect, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -923,10 +916,9 @@
</span><span class="cx">
</span><span class="cx"> WindRule oldFillRule = fillRule();
</span><span class="cx"> Color oldFillColor = fillColor();
</span><del>- ColorSpace oldFillColorSpace = fillColorSpace();
</del><span class="cx">
</span><span class="cx"> setFillRule(RULE_EVENODD);
</span><del>- setFillColor(color, colorSpace);
</del><ins>+ setFillColor(color);
</ins><span class="cx">
</span><span class="cx"> // fillRectWithRoundedHole() assumes that the edges of rect are clipped out, so we only care about shadows cast around inside the hole.
</span><span class="cx"> bool drawOwnShadow = !isAcceleratedContext() && hasBlurredShadow() && !m_state.shadowsIgnoreTransforms;
</span><span class="lines">@@ -945,7 +937,7 @@
</span><span class="cx"> stateSaver.restore();
</span><span class="cx">
</span><span class="cx"> setFillRule(oldFillRule);
</span><del>- setFillColor(oldFillColor, oldFillColorSpace);
</del><ins>+ setFillColor(oldFillColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::clip(const FloatRect& rect)
</span><span class="lines">@@ -1055,7 +1047,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setPlatformShadow(const FloatSize& offset, float blur, const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::setPlatformShadow(const FloatSize& offset, float blur, const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -1095,7 +1087,7 @@
</span><span class="cx"> if (!color.isValid())
</span><span class="cx"> CGContextSetShadow(context, CGSizeMake(xOffset, yOffset), blurRadius);
</span><span class="cx"> else
</span><del>- CGContextSetShadowWithColor(context, CGSizeMake(xOffset, yOffset), blurRadius, cachedCGColor(color, colorSpace));
</del><ins>+ CGContextSetShadowWithColor(context, CGSizeMake(xOffset, yOffset), blurRadius, cachedCGColor(color));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::clearPlatformShadow()
</span><span class="lines">@@ -1392,12 +1384,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (fillColorIsNotEqualToStrokeColor)
</span><del>- setCGFillColor(platformContext(), localStrokeColor, strokeColorSpace());
</del><ins>+ setCGFillColor(platformContext(), localStrokeColor);
</ins><span class="cx">
</span><span class="cx"> CGContextFillRects(platformContext(), dashBounds.data(), dashBounds.size());
</span><span class="cx">
</span><span class="cx"> if (fillColorIsNotEqualToStrokeColor)
</span><del>- setCGFillColor(platformContext(), fillColor(), fillColorSpace());
</del><ins>+ setCGFillColor(platformContext(), fillColor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setURLForRect(const URL& link, const IntRect& destRect)
</span><span class="lines">@@ -1497,11 +1489,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setPlatformStrokeColor(const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::setPlatformStrokeColor(const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><del>- setCGStrokeColor(platformContext(), color, colorSpace);
</del><ins>+ setCGStrokeColor(platformContext(), color);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setPlatformStrokeThickness(float thickness)
</span><span class="lines">@@ -1511,11 +1503,11 @@
</span><span class="cx"> CGContextSetLineWidth(platformContext(), std::max(thickness, 0.f));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setPlatformFillColor(const Color& color, ColorSpace colorSpace)
</del><ins>+void GraphicsContext::setPlatformFillColor(const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><del>- setCGFillColor(platformContext(), color, colorSpace);
</del><ins>+ setCGFillColor(platformContext(), color);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::setPlatformShouldAntialias(bool enable)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -228,11 +228,8 @@
</span><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageBuffer::draw(GraphicsContext& destContext, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
</del><ins>+void ImageBuffer::draw(GraphicsContext& destContext, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode blendMode, bool)
</ins><span class="cx"> {
</span><del>- UNUSED_PARAM(useLowQualityScale);
- ColorSpace colorSpace = (&destContext == &context()) ? ColorSpaceDeviceRGB : styleColorSpace;
-
</del><span class="cx"> RetainPtr<CGImageRef> image;
</span><span class="cx"> if (&destContext == &context() || destContext.isAcceleratedContext())
</span><span class="cx"> image = copyNativeImage(CopyBackingStore); // Drawing into our own buffer, need to deep copy.
</span><span class="lines">@@ -241,10 +238,10 @@
</span><span class="cx">
</span><span class="cx"> FloatRect adjustedSrcRect = srcRect;
</span><span class="cx"> adjustedSrcRect.scale(m_resolutionScale, m_resolutionScale);
</span><del>- destContext.drawNativeImage(image.get(), m_data.backingStoreSize, colorSpace, destRect, adjustedSrcRect, op, blendMode);
</del><ins>+ destContext.drawNativeImage(image.get(), m_data.backingStoreSize, destRect, adjustedSrcRect, op, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageBuffer::drawPattern(GraphicsContext& destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+void ImageBuffer::drawPattern(GraphicsContext& destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> FloatRect adjustedSrcRect = srcRect;
</span><span class="cx"> adjustedSrcRect.scale(m_resolutionScale, m_resolutionScale);
</span><span class="lines">@@ -252,14 +249,14 @@
</span><span class="cx"> if (!context().isAcceleratedContext()) {
</span><span class="cx"> if (&destContext == &context() || destContext.isAcceleratedContext()) {
</span><span class="cx"> if (RefPtr<Image> copy = copyImage(CopyBackingStore)) // Drawing into our own buffer, need to deep copy.
</span><del>- copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</del><ins>+ copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, op, destRect, blendMode);
</ins><span class="cx"> } else {
</span><span class="cx"> if (RefPtr<Image> imageForRendering = copyImage(DontCopyBackingStore))
</span><del>- imageForRendering->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</del><ins>+ imageForRendering->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, op, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (RefPtr<Image> copy = copyImage(CopyBackingStore))
</span><del>- copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</del><ins>+ copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, op, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -45,35 +45,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RetainPtr<CGImageRef> Image::imageWithColorSpace(CGImageRef originalImage, ColorSpace colorSpace)
-{
- CGColorSpaceRef originalColorSpace = CGImageGetColorSpace(originalImage);
-
- // If the image already has a (non-device) color space, we don't want to
- // override it, so return.
- if (!originalColorSpace || !CFEqual(originalColorSpace, deviceRGBColorSpaceRef()))
- return originalImage;
-
- switch (colorSpace) {
- case ColorSpaceDeviceRGB:
- return originalImage;
- case ColorSpaceSRGB:
- return adoptCF(CGImageCreateCopyWithColorSpace(originalImage, sRGBColorSpaceRef()));
- case ColorSpaceLinearRGB:
- return adoptCF(CGImageCreateCopyWithColorSpace(originalImage, linearRGBColorSpaceRef()));
- }
-
- ASSERT_NOT_REACHED();
- return originalImage;
-}
-
</del><span class="cx"> void Image::drawPattern(GraphicsContext& ctxt, const FloatRect& tileRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (!nativeImageForCurrentFrame())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ctxt.drawPattern(*this, tileRect, patternTransform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</del><ins>+ ctxt.drawPattern(*this, tileRect, patternTransform, phase, spacing, op, destRect, blendMode);
</ins><span class="cx">
</span><span class="cx"> if (imageObserver())
</span><span class="cx"> imageObserver()->didDraw(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPDFDocumentImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PDFDocumentImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator op, BlendMode, ImageOrientationDescription)
</del><ins>+void PDFDocumentImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator op, BlendMode, ImageOrientationDescription)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_document || !m_hasPage)
</span><span class="cx"> return;
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> context.setCompositeOperation(op);
</span><span class="cx">
</span><span class="cx"> if (m_cachedImageBuffer)
</span><del>- context.drawImageBuffer(*m_cachedImageBuffer, ColorSpaceDeviceRGB, dstRect);
</del><ins>+ context.drawImageBuffer(*m_cachedImageBuffer, dstRect);
</ins><span class="cx"> else {
</span><span class="cx"> transformContextForPainting(context, dstRect, srcRect);
</span><span class="cx"> drawPDFPage(context);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPDFDocumentImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override;
</span><span class="cx"> virtual FloatSize size() const override;
</span><span class="cx">
</span><del>- virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Implement this to be less conservative.
</span><span class="cx"> virtual bool currentFrameKnownToBeOpaque() override { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -333,9 +333,7 @@
</span><span class="cx"> FloatSize shadowOffset;
</span><span class="cx"> float shadowBlur;
</span><span class="cx"> Color shadowColor;
</span><del>- ColorSpace shadowColorSpace;
- ColorSpace fillColorSpace = context.fillColorSpace();
- context.getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace);
</del><ins>+ context.getShadow(shadowOffset, shadowBlur, shadowColor);
</ins><span class="cx">
</span><span class="cx"> AffineTransform contextCTM = context.getCTM();
</span><span class="cx"> float syntheticBoldOffset = font.syntheticBoldOffset();
</span><span class="lines">@@ -352,14 +350,14 @@
</span><span class="cx"> context.clearShadow();
</span><span class="cx"> Color fillColor = context.fillColor();
</span><span class="cx"> Color shadowFillColor(shadowColor.red(), shadowColor.green(), shadowColor.blue(), shadowColor.alpha() * fillColor.alpha() / 255);
</span><del>- context.setFillColor(shadowFillColor, shadowColorSpace);
</del><ins>+ context.setFillColor(shadowFillColor);
</ins><span class="cx"> float shadowTextX = point.x() + shadowOffset.width();
</span><span class="cx"> // If shadows are ignoring transforms, then we haven't applied the Y coordinate flip yet, so down is negative.
</span><span class="cx"> float shadowTextY = point.y() + shadowOffset.height() * (context.shadowsIgnoreTransforms() ? -1 : 1);
</span><span class="cx"> showGlyphsWithAdvances(FloatPoint(shadowTextX, shadowTextY), font, cgContext, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
</span><span class="cx"> if (syntheticBoldOffset)
</span><span class="cx"> showGlyphsWithAdvances(FloatPoint(shadowTextX + syntheticBoldOffset, shadowTextY), font, cgContext, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
</span><del>- context.setFillColor(fillColor, fillColorSpace);
</del><ins>+ context.setFillColor(fillColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (useLetterpressEffect)
</span><span class="lines">@@ -370,7 +368,7 @@
</span><span class="cx"> showGlyphsWithAdvances(FloatPoint(point.x() + syntheticBoldOffset, point.y()), font, cgContext, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
</span><span class="cx">
</span><span class="cx"> if (hasSimpleShadow)
</span><del>- context.setShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace);
</del><ins>+ context.setShadow(shadowOffset, shadowBlur, shadowColor);
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFEBlendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> if (!imageBuffer || !imageBuffer2)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- filterContext.drawImageBuffer(*imageBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect()));
- filterContext.drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()), IntRect(IntPoint(), imageBuffer->logicalSize()), ImagePaintingOptions(CompositeSourceOver, m_mode));
</del><ins>+ filterContext.drawImageBuffer(*imageBuffer2, drawingRegionOfInputImage(in2->absolutePaintRect()));
+ filterContext.drawImageBuffer(*imageBuffer, drawingRegionOfInputImage(in->absolutePaintRect()), IntRect(IntPoint(), imageBuffer->logicalSize()), ImagePaintingOptions(CompositeSourceOver, m_mode));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFEColorMatrixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx">
</span><span class="cx"> ImageBuffer* inBuffer = in->asImageBuffer();
</span><span class="cx"> if (inBuffer)
</span><del>- resultImage->context().drawImageBuffer(*inBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()));
</del><ins>+ resultImage->context().drawImageBuffer(*inBuffer, drawingRegionOfInputImage(in->absolutePaintRect()));
</ins><span class="cx">
</span><span class="cx"> IntRect imageRect(IntPoint(), resultImage->logicalSize());
</span><span class="cx"> RefPtr<Uint8ClampedArray> pixelArray = resultImage->getUnmultipliedImageData(imageRect);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFECompositecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -281,8 +281,8 @@
</span><span class="cx">
</span><span class="cx"> switch (m_type) {
</span><span class="cx"> case FECOMPOSITE_OPERATOR_OVER:
</span><del>- filterContext.drawImageBuffer(*imageBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect()));
- filterContext.drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()));
</del><ins>+ filterContext.drawImageBuffer(*imageBuffer2, drawingRegionOfInputImage(in2->absolutePaintRect()));
+ filterContext.drawImageBuffer(*imageBuffer, drawingRegionOfInputImage(in->absolutePaintRect()));
</ins><span class="cx"> break;
</span><span class="cx"> case FECOMPOSITE_OPERATOR_IN: {
</span><span class="cx"> // Applies only to the intersected region.
</span><span class="lines">@@ -294,21 +294,21 @@
</span><span class="cx"> IntRect adjustedDestinationRect = destinationRect - absolutePaintRect().location();
</span><span class="cx"> IntRect sourceRect = destinationRect - in->absolutePaintRect().location();
</span><span class="cx"> IntRect source2Rect = destinationRect - in2->absolutePaintRect().location();
</span><del>- filterContext.drawImageBuffer(*imageBuffer2, ColorSpaceDeviceRGB, adjustedDestinationRect, source2Rect);
- filterContext.drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, adjustedDestinationRect, sourceRect, CompositeSourceIn);
</del><ins>+ filterContext.drawImageBuffer(*imageBuffer2, adjustedDestinationRect, source2Rect);
+ filterContext.drawImageBuffer(*imageBuffer, adjustedDestinationRect, sourceRect, CompositeSourceIn);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FECOMPOSITE_OPERATOR_OUT:
</span><del>- filterContext.drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()));
- filterContext.drawImageBuffer(*imageBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect()), IntRect(IntPoint(), imageBuffer2->logicalSize()), CompositeDestinationOut);
</del><ins>+ filterContext.drawImageBuffer(*imageBuffer, drawingRegionOfInputImage(in->absolutePaintRect()));
+ filterContext.drawImageBuffer(*imageBuffer2, drawingRegionOfInputImage(in2->absolutePaintRect()), IntRect(IntPoint(), imageBuffer2->logicalSize()), CompositeDestinationOut);
</ins><span class="cx"> break;
</span><span class="cx"> case FECOMPOSITE_OPERATOR_ATOP:
</span><del>- filterContext.drawImageBuffer(*imageBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect()));
- filterContext.drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()), IntRect(IntPoint(), imageBuffer->logicalSize()), CompositeSourceAtop);
</del><ins>+ filterContext.drawImageBuffer(*imageBuffer2, drawingRegionOfInputImage(in2->absolutePaintRect()));
+ filterContext.drawImageBuffer(*imageBuffer, drawingRegionOfInputImage(in->absolutePaintRect()), IntRect(IntPoint(), imageBuffer->logicalSize()), CompositeSourceAtop);
</ins><span class="cx"> break;
</span><span class="cx"> case FECOMPOSITE_OPERATOR_XOR:
</span><del>- filterContext.drawImageBuffer(*imageBuffer2, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in2->absolutePaintRect()));
- filterContext.drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()), IntRect(IntPoint(), imageBuffer->logicalSize()), CompositeXOR);
</del><ins>+ filterContext.drawImageBuffer(*imageBuffer2, drawingRegionOfInputImage(in2->absolutePaintRect()));
+ filterContext.drawImageBuffer(*imageBuffer, drawingRegionOfInputImage(in->absolutePaintRect()), IntRect(IntPoint(), imageBuffer->logicalSize()), CompositeXOR);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFEDropShadowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "FEDropShadow.h"
</span><span class="cx">
</span><del>-#include "ColorSpace.h"
</del><span class="cx"> #include "FEGaussianBlur.h"
</span><span class="cx"> #include "Filter.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="lines">@@ -93,10 +92,10 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContext& resultContext = resultImage->context();
</span><span class="cx"> resultContext.setAlpha(m_shadowOpacity);
</span><del>- resultContext.drawImageBuffer(*sourceImage, ColorSpaceDeviceRGB, drawingRegionWithOffset);
</del><ins>+ resultContext.drawImageBuffer(*sourceImage, drawingRegionWithOffset);
</ins><span class="cx"> resultContext.setAlpha(1);
</span><span class="cx">
</span><del>- ShadowBlur contextShadow(blurRadius, offset, m_shadowColor, ColorSpaceDeviceRGB);
</del><ins>+ ShadowBlur contextShadow(blurRadius, offset, m_shadowColor);
</ins><span class="cx">
</span><span class="cx"> // TODO: Direct pixel access to ImageBuffer would avoid copying the ImageData.
</span><span class="cx"> IntRect shadowArea(IntPoint(), resultImage->internalSize());
</span><span class="lines">@@ -107,10 +106,10 @@
</span><span class="cx"> resultImage->putByteArray(Premultiplied, srcPixelArray.get(), shadowArea.size(), shadowArea, IntPoint(), ImageBuffer::BackingStoreCoordinateSystem);
</span><span class="cx">
</span><span class="cx"> resultContext.setCompositeOperation(CompositeSourceIn);
</span><del>- resultContext.fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()), m_shadowColor, ColorSpaceDeviceRGB);
</del><ins>+ resultContext.fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()), m_shadowColor);
</ins><span class="cx"> resultContext.setCompositeOperation(CompositeDestinationOver);
</span><span class="cx">
</span><del>- resultImage->context().drawImageBuffer(*sourceImage, ColorSpaceDeviceRGB, drawingRegion);
</del><ins>+ resultImage->context().drawImageBuffer(*sourceImage, drawingRegion);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FEDropShadow::dump()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFEFloodcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Color color = colorWithOverrideAlpha(floodColor().rgb(), floodOpacity());
</span><del>- resultImage->context().fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()), color, ColorSpaceDeviceRGB);
</del><ins>+ resultImage->context().fillRect(FloatRect(FloatPoint(), absolutePaintRect().size()), color);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FEFlood::dump()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFEMergecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> for (unsigned i = 0; i < size; ++i) {
</span><span class="cx"> FilterEffect* in = inputEffect(i);
</span><span class="cx"> if (ImageBuffer* inBuffer = in->asImageBuffer())
</span><del>- filterContext.drawImageBuffer(*inBuffer, ColorSpaceDeviceRGB, drawingRegionOfInputImage(in->absolutePaintRect()));
</del><ins>+ filterContext.drawImageBuffer(*inBuffer, drawingRegionOfInputImage(in->absolutePaintRect()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFEOffsetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> FloatRect drawingRegion = drawingRegionOfInputImage(in->absolutePaintRect());
</span><span class="cx"> Filter& filter = this->filter();
</span><span class="cx"> drawingRegion.move(filter.applyHorizontalScale(m_dx), filter.applyVerticalScale(m_dy));
</span><del>- resultImage->context().drawImageBuffer(*inBuffer, ColorSpaceDeviceRGB, drawingRegion);
</del><ins>+ resultImage->context().drawImageBuffer(*inBuffer, drawingRegion);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FEOffset::dump()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFETilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FETile.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FETile.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/FETile.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContext& tileImageContext = tileImage->context();
</span><span class="cx"> tileImageContext.translate(-inMaxEffectLocation.x(), -inMaxEffectLocation.y());
</span><del>- tileImageContext.drawImageBuffer(*inBuffer, ColorSpaceDeviceRGB, in->absolutePaintRect().location());
</del><ins>+ tileImageContext.drawImageBuffer(*inBuffer, in->absolutePaintRect().location());
</ins><span class="cx">
</span><span class="cx"> auto tileImageCopy = tileImage->copyImage(CopyBackingStore);
</span><span class="cx"> if (!tileImageCopy)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersSourceAlphacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FloatRect imageRect(FloatPoint(), absolutePaintRect().size());
</span><del>- filterContext.fillRect(imageRect, Color::black, ColorSpaceDeviceRGB);
- filterContext.drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, IntPoint(), CompositeDestinationIn);
</del><ins>+ filterContext.fillRect(imageRect, Color::black);
+ filterContext.drawImageBuffer(*imageBuffer, IntPoint(), CompositeDestinationIn);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SourceAlpha::dump()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersSourceGraphiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> if (!resultImage || !sourceImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- resultImage->context().drawImageBuffer(*sourceImage, ColorSpaceDeviceRGB, IntPoint());
</del><ins>+ resultImage->context().drawImageBuffer(*sourceImage, IntPoint());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SourceGraphic::dump()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (Image* image = reinterpret_cast<Image*>(gstImage->image().get()))
</span><del>- context.drawImage(*image, ColorSpaceSRGB, rect, gstImage->rect(), CompositeCopy);
</del><ins>+ context.drawImage(*image, rect, gstImage->rect(), CompositeCopy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosIconIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/ios/IconIOS.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> FloatRect srcRect(FloatPoint(), size);
</span><span class="cx">
</span><span class="cx"> context.setImageInterpolationQuality(InterpolationHigh);
</span><del>- context.drawNativeImage(m_cgImage.get(), size, ColorSpaceDeviceRGB, destRect, srcRect);
</del><ins>+ context.drawNativeImage(m_cgImage.get(), size, destRect, srcRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void paintToSurfaceContext(GraphicsContext& context) override
</span><span class="cx"> {
</span><del>- context.drawImage(m_image, ColorSpaceDeviceRGB, m_rect, m_rect);
</del><ins>+ context.drawImage(m_image, m_rect, m_rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedUpdateAtlascpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_supportsAlpha) {
</span><span class="cx"> context.setCompositeOperation(CompositeCopy);
</span><del>- context.fillRect(IntRect(IntPoint::zero(), m_size), Color::transparent, ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(IntRect(IntPoint::zero(), m_size), Color::transparent);
</ins><span class="cx"> context.setCompositeOperation(CompositeSourceOver);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -183,17 +183,15 @@
</span><span class="cx"> FloatSize shadowOffset;
</span><span class="cx"> float shadowBlur;
</span><span class="cx"> Color shadowColor;
</span><del>- ColorSpace shadowColorSpace;
- graphicsContext.getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace);
</del><ins>+ graphicsContext.getShadow(shadowOffset, shadowBlur, shadowColor);
</ins><span class="cx">
</span><span class="cx"> bool hasSimpleShadow = graphicsContext.textDrawingMode() == TextModeFill && shadowColor.isValid() && !shadowBlur && (!graphicsContext.shadowsIgnoreTransforms() || graphicsContext.getCTM().isIdentityOrTranslationOrFlipped());
</span><span class="cx"> if (hasSimpleShadow) {
</span><span class="cx"> // Paint simple shadows ourselves instead of relying on CG shadows, to avoid losing subpixel antialiasing.
</span><span class="cx"> graphicsContext.clearShadow();
</span><span class="cx"> Color fillColor = graphicsContext.fillColor();
</span><del>- ColorSpace fillColorSpace = graphicsContext.fillColorSpace();
</del><span class="cx"> Color shadowFillColor(shadowColor.red(), shadowColor.green(), shadowColor.blue(), shadowColor.alpha() * fillColor.alpha() / 255);
</span><del>- graphicsContext.setFillColor(shadowFillColor, shadowColorSpace);
</del><ins>+ graphicsContext.setFillColor(shadowFillColor);
</ins><span class="cx"> float shadowTextX = point.x() + translation.width() + shadowOffset.width();
</span><span class="cx"> // If shadows are ignoring transforms, then we haven't applied the Y coordinate flip yet, so down is negative.
</span><span class="cx"> float shadowTextY = point.y() + translation.height() + shadowOffset.height() * (graphicsContext.shadowsIgnoreTransforms() ? -1 : 1);
</span><span class="lines">@@ -203,7 +201,7 @@
</span><span class="cx"> CGContextSetTextPosition(cgContext, point.x() + translation.width() + shadowOffset.width() + font.syntheticBoldOffset(), point.y() + translation.height() + shadowOffset.height());
</span><span class="cx"> CGContextShowGlyphsWithAdvances(cgContext, glyphBuffer.glyphs(from), static_cast<const CGSize*>(glyphBuffer.advances(from)), numGlyphs);
</span><span class="cx"> }
</span><del>- graphicsContext.setFillColor(fillColor, fillColorSpace);
</del><ins>+ graphicsContext.setFillColor(fillColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CGContextSetTextPosition(cgContext, point.x() + translation.width(), point.y() + translation.height());
</span><span class="lines">@@ -214,7 +212,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (hasSimpleShadow)
</span><del>- graphicsContext.setShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace);
</del><ins>+ graphicsContext.setShadow(shadowOffset, shadowBlur, shadowColor);
</ins><span class="cx">
</span><span class="cx"> wkRestoreFontSmoothingStyle(cgContext, oldFontSmoothingStyle);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGraphicsContextCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx"> setPaintingDisabled(!m_data->m_cgContext);
</span><span class="cx"> if (m_data->m_cgContext) {
</span><span class="cx"> // Make sure the context starts in sync with our state.
</span><del>- setPlatformFillColor(fillColor(), fillColorSpace());
- setPlatformStrokeColor(strokeColor(), strokeColorSpace());
</del><ins>+ setPlatformFillColor(fillColor());
+ setPlatformStrokeColor(strokeColor());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> float radius = (width - 1) / 2.0f;
</span><span class="cx"> offset += radius;
</span><del>- CGColorRef colorRef = color.isValid() ? cachedCGColor(color, ColorSpaceDeviceRGB) : 0;
</del><ins>+ CGColorRef colorRef = color.isValid() ? cachedCGColor(color) : nullptr;
</ins><span class="cx">
</span><span class="cx"> CGMutablePathRef focusRingPath = CGPathCreateMutable();
</span><span class="cx"> unsigned rectCount = rects.size();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGraphicsContextCairoWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx"> m_data->m_hdc = dc;
</span><span class="cx"> if (platformContext()->cr()) {
</span><span class="cx"> // Make sure the context starts in sync with our state.
</span><del>- setPlatformFillColor(fillColor(), fillColorSpace());
- setPlatformStrokeColor(strokeColor(), strokeColorSpace());
</del><ins>+ setPlatformFillColor(fillColor());
+ setPlatformStrokeColor(strokeColor());
</ins><span class="cx"> }
</span><span class="cx"> if (cr)
</span><span class="cx"> cairo_destroy(cr);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinImageCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageCGWin.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageCGWin.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/win/ImageCGWin.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -76,9 +76,9 @@
</span><span class="cx">
</span><span class="cx"> FloatSize imageSize = BitmapImage::size();
</span><span class="cx"> if (size)
</span><del>- drawFrameMatchingSourceSize(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, ColorSpaceDeviceRGB, CompositeCopy);
</del><ins>+ drawFrameMatchingSourceSize(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, CompositeCopy);
</ins><span class="cx"> else
</span><del>- draw(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal, ImageOrientationDescription());
</del><ins>+ draw(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), CompositeCopy, BlendModeNormal, ImageOrientationDescription());
</ins><span class="cx">
</span><span class="cx"> // Do cleanup
</span><span class="cx"> CGContextRelease(cgContext);
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext& ctxt, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator compositeOp)
</del><ins>+void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext& ctxt, const FloatRect& dstRect, const IntSize& srcSize, CompositeOperator compositeOp)
</ins><span class="cx"> {
</span><span class="cx"> size_t frames = frameCount();
</span><span class="cx"> for (size_t i = 0; i < frames; ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinImageCairoWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx">
</span><span class="cx"> FloatSize imageSize = BitmapImage::size();
</span><span class="cx"> if (size)
</span><del>- drawFrameMatchingSourceSize(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, ColorSpaceDeviceRGB, CompositeCopy);
</del><ins>+ drawFrameMatchingSourceSize(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, CompositeCopy);
</ins><span class="cx"> else
</span><del>- draw(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal, ImageOrientationDescription());
</del><ins>+ draw(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), CompositeCopy, BlendModeNormal, ImageOrientationDescription());
</ins><span class="cx">
</span><span class="cx"> // Do cleanup
</span><span class="cx"> cairo_destroy(targetRef);
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext& ctxt, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator compositeOp)
</del><ins>+void BitmapImage::drawFrameMatchingSourceSize(GraphicsContext& ctxt, const FloatRect& dstRect, const IntSize& srcSize, CompositeOperator compositeOp)
</ins><span class="cx"> {
</span><span class="cx"> size_t frames = frameCount();
</span><span class="cx"> for (size_t i = 0; i < frames; ++i) {
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if (cairo_image_surface_get_height(surface.get()) == static_cast<size_t>(srcSize.height()) && cairo_image_surface_get_width(surface.get()) == static_cast<size_t>(srcSize.width())) {
</span><span class="cx"> size_t currentFrame = m_currentFrame;
</span><span class="cx"> m_currentFrame = i;
</span><del>- draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal, ImageOrientationDescription());
</del><ins>+ draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), compositeOp, BlendModeNormal, ImageOrientationDescription());
</ins><span class="cx"> m_currentFrame = currentFrame;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> // No image of the correct size was found, fallback to drawing the current frame
</span><span class="cx"> FloatSize imageSize = BitmapImage::size();
</span><del>- draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal, ImageOrientationDescription());
</del><ins>+ draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), compositeOp, BlendModeNormal, ImageOrientationDescription());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx"> CGContextSaveGState(context);
</span><span class="cx">
</span><span class="cx"> CGContextTranslateCTM(context, frame.origin.x, frame.origin.y);
</span><del>- CGContextSetFillColorWithColor(context, cachedCGColor(colorForGridTileBorder([layer tileGrid]), ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(context, cachedCGColor(colorForGridTileBorder([layer tileGrid])));
</ins><span class="cx">
</span><span class="cx"> CGRect labelBounds = [layer bounds];
</span><span class="cx"> labelBounds.size.width = 10 + 12 * strlen(text);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileGridTilemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> {
</span><span class="cx"> LegacyTileLayer* layer = m_tileLayer.get();
</span><span class="cx"> if (flag) {
</span><del>- [layer setBorderColor:cachedCGColor(m_tileGrid->tileCache().colorForGridTileBorder(m_tileGrid), ColorSpaceDeviceRGB)];
</del><ins>+ [layer setBorderColor:cachedCGColor(m_tileGrid->tileCache().colorForGridTileBorder(m_tileGrid))];
</ins><span class="cx"> [layer setBorderWidth:0.5f];
</span><span class="cx"> } else {
</span><span class="cx"> [layer setBorderColor:nil];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
</span><span class="cx"> RetainPtr<CALayer> videoFullscreenLayer = [m_videoFullscreenView layer];
</span><span class="cx"> WebThreadRun([strongThis, this, videoFullscreenLayer] {
</span><del>- [videoFullscreenLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent, WebCore::ColorSpaceDeviceRGB)];
</del><ins>+ [videoFullscreenLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent)];
</ins><span class="cx"> m_model->setVideoFullscreenLayer(videoFullscreenLayer.get());
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), [strongThis, this] {
</span><span class="cx"> m_interface->enterFullscreen();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> CGFloat blue;
</span><span class="cx"> CGFloat alpha;
</span><span class="cx"> [[textColor colorUsingColorSpaceName:NSDeviceRGBColorSpace] getRed:&red green:&green blue:&blue alpha:&alpha];
</span><del>- graphicsContext.setFillColor(makeRGBA(red * 255, green * 255, blue * 255, alpha * 255), ColorSpaceDeviceRGB);
</del><ins>+ graphicsContext.setFillColor(makeRGBA(red * 255, green * 255, blue * 255, alpha * 255));
</ins><span class="cx">
</span><span class="cx"> webCoreFont.drawText(graphicsContext, run, FloatPoint(point.x, (flipped ? point.y : (-1 * point.y))));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollbarThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> static CGColorRef cachedLinenBackgroundColor = linenBackgroundColor().leakRef();
</span><span class="cx"> // We operate on the CALayer directly here, since GraphicsLayer doesn't have the concept
</span><span class="cx"> // of pattern images, and we know that WebCore won't touch this layer.
</span><del>- layer.backgroundColor = customBackgroundColor.isValid() ? cachedCGColor(customBackgroundColor, ColorSpaceDeviceRGB) : cachedLinenBackgroundColor;
</del><ins>+ layer.backgroundColor = customBackgroundColor.isValid() ? cachedCGColor(customBackgroundColor) : cachedLinenBackgroundColor;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeMac::removeOverhangAreaBackground(CALayer *layer)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -692,7 +692,7 @@
</span><span class="cx"> LocalCurrentGraphicsContext localContext(imageBuffer->context());
</span><span class="cx"> needsRepaint = drawCellOrFocusRingIntoRectWithView(cell, imageBufferDrawRect, view, drawButtonCell, drawFocusRing);
</span><span class="cx"> }
</span><del>- context.drawImageBuffer(*imageBuffer, ColorSpaceSRGB, rect.location() - FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth));
</del><ins>+ context.drawImageBuffer(*imageBuffer, rect.location() - FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth));
</ins><span class="cx"> return needsRepaint;
</span><span class="cx"> }
</span><span class="cx"> if (drawButtonCell)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> context.translate(rect.x(), rect.y() + rect.height());
</span><span class="cx"> context.scale(FloatSize(1, -1));
</span><span class="cx"> IntRect paintRect(IntPoint(0, 0), IntSize(rect.width(), rect.height()));
</span><del>- context.fillRect(paintRect, Color::black, ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(paintRect, Color::black);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockScrollbarThemeMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/ScrollbarThemeMock.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/ScrollbarThemeMock.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/mock/ScrollbarThemeMock.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeMock::paintTrackBackground(GraphicsContext& context, Scrollbar& scrollbar, const IntRect& trackRect)
</span><span class="cx"> {
</span><del>- context.fillRect(trackRect, scrollbar.enabled() ? Color::lightGray : Color(0xFFE0E0E0), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(trackRect, scrollbar.enabled() ? Color::lightGray : Color(0xFFE0E0E0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollbarThemeMock::paintThumb(GraphicsContext& context, Scrollbar& scrollbar, const IntRect& thumbRect)
</span><span class="cx"> {
</span><span class="cx"> if (scrollbar.enabled())
</span><del>- context.fillRect(thumbRect, Color::darkGray, ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(thumbRect, Color::darkGray);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinDragImageWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/DragImageWin.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/DragImageWin.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/win/DragImageWin.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> static const Color backgroundColor(140, 140, 140);
</span><span class="cx"> static const IntSize radii(DragLabelRadius, DragLabelRadius);
</span><span class="cx"> IntRect rect(0, 0, imageSize.width(), imageSize.height());
</span><del>- context.fillRoundedRect(FloatRoundedRect(rect, radii, radii, radii, radii), backgroundColor, ColorSpaceDeviceRGB);
</del><ins>+ context.fillRoundedRect(FloatRoundedRect(rect, radii, radii, radii, radii), backgroundColor);
</ins><span class="cx">
</span><span class="cx"> // Draw the text
</span><span class="cx"> static const Color topColor(0, 0, 0, 255); // original alpha = 0.75
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -632,18 +632,18 @@
</span><span class="cx">
</span><span class="cx"> // Draw the background for this menu item
</span><span class="cx"> if (itemStyle.isVisible())
</span><del>- context.fillRect(itemRect, optionBackgroundColor, ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(itemRect, optionBackgroundColor);
</ins><span class="cx">
</span><span class="cx"> if (client()->itemIsSeparator(index)) {
</span><span class="cx"> IntRect separatorRect(itemRect.x() + separatorPadding, itemRect.y() + (itemRect.height() - separatorHeight) / 2, itemRect.width() - 2 * separatorPadding, separatorHeight);
</span><del>- context.fillRect(separatorRect, optionTextColor, ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(separatorRect, optionTextColor);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String itemText = client()->itemText(index);
</span><span class="cx">
</span><span class="cx"> TextRun textRun(itemText, 0, 0, AllowTrailingExpansion, itemStyle.textDirection(), itemStyle.hasTextDirectionOverride());
</span><del>- context.setFillColor(optionTextColor, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(optionTextColor);
</ins><span class="cx">
</span><span class="cx"> FontCascade itemFont = client()->menuStyle().font();
</span><span class="cx"> if (client()->itemIsLabel(index)) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinWebCoreTextRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/platform/win/WebCoreTextRenderer.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> TextRun run(text);
</span><span class="cx">
</span><del>- context.setFillColor(color, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(color);
</ins><span class="cx"> if (isOneLeftToRightRun(run))
</span><span class="cx"> font.drawText(context, run, point);
</span><span class="cx"> else
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> IntPoint underlinePoint(point);
</span><span class="cx"> underlinePoint.move(beforeWidth, 1);
</span><span class="cx">
</span><del>- context.setStrokeColor(color, ColorSpaceDeviceRGB);
</del><ins>+ context.setStrokeColor(color);
</ins><span class="cx"> context.drawLineForText(underlinePoint, underlinedWidth, false);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingEllipsisBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/EllipsisBox.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/EllipsisBox.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/EllipsisBox.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx"> const RenderStyle& lineStyle = this->lineStyle();
</span><span class="cx"> Color textColor = lineStyle.visitedDependentColor(CSSPropertyWebkitTextFillColor);
</span><span class="cx"> if (textColor != context.fillColor())
</span><del>- context.setFillColor(textColor, lineStyle.colorSpace());
</del><ins>+ context.setFillColor(textColor);
</ins><span class="cx"> bool setShadow = false;
</span><span class="cx"> if (lineStyle.textShadow()) {
</span><span class="cx"> context.setShadow(LayoutSize(lineStyle.textShadow()->x(), lineStyle.textShadow()->y()),
</span><del>- lineStyle.textShadow()->radius(), lineStyle.textShadow()->color(), lineStyle.colorSpace());
</del><ins>+ lineStyle.textShadow()->radius(), lineStyle.textShadow()->color());
</ins><span class="cx"> setShadow = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> // Select the correct color for painting the text.
</span><span class="cx"> Color foreground = paintInfo.forceTextColor() ? paintInfo.forcedTextColor() : blockFlow().selectionForegroundColor();
</span><span class="cx"> if (foreground.isValid() && foreground != textColor)
</span><del>- context.setFillColor(foreground, lineStyle.colorSpace());
</del><ins>+ context.setFillColor(foreground);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Why is this always LTR? Fix by passing correct text run flags below.
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> // Restore the regular fill color.
</span><span class="cx"> if (textColor != context.fillColor())
</span><del>- context.setFillColor(textColor, lineStyle.colorSpace());
</del><ins>+ context.setFillColor(textColor);
</ins><span class="cx">
</span><span class="cx"> if (setShadow)
</span><span class="cx"> context.clearShadow();
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> LayoutRect selectionRect = LayoutRect(x() + paintOffset.x(), y() + paintOffset.y() + rootBox.selectionTop(), 0, rootBox.selectionHeight());
</span><span class="cx"> TextRun run = RenderBlock::constructTextRun(&blockFlow(), font, m_str, style, AllowTrailingExpansion);
</span><span class="cx"> font.adjustSelectionRectForText(run, selectionRect, 0, -1);
</span><del>- context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), run.ltr()), c, style.colorSpace());
</del><ins>+ context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), run.ltr()), c);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool EllipsisBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction hitTestAction)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFilterEffectRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -429,10 +429,8 @@
</span><span class="cx"> LayoutRect destRect = filter->outputRect();
</span><span class="cx"> destRect.move(m_paintOffset.x(), m_paintOffset.y());
</span><span class="cx">
</span><del>- if (ImageBuffer* outputBuffer = filter->output()) {
- destinationContext.drawImageBuffer(*outputBuffer, m_renderLayer->renderer().style().colorSpace(),
- snapRectToDevicePixels(destRect, m_renderLayer->renderer().document().deviceScaleFactor()));
- }
</del><ins>+ if (ImageBuffer* outputBuffer = filter->output())
+ destinationContext.drawImageBuffer(*outputBuffer, snapRectToDevicePixels(destRect, m_renderLayer->renderer().document().deviceScaleFactor()));
</ins><span class="cx">
</span><span class="cx"> filter->clearIntermediateResults();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> c = Color(0xff - c.red(), 0xff - c.green(), 0xff - c.blue());
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><del>- updateGraphicsContext(context, TextPaintStyle(c, style.colorSpace())); // Don't draw text at all!
</del><ins>+ updateGraphicsContext(context, TextPaintStyle(c)); // Don't draw text at all!
</ins><span class="cx">
</span><span class="cx"> // If the text is truncated, let the thing being painted in the truncation
</span><span class="cx"> // draw its own highlight.
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect selectionRect = LayoutRect(boxOrigin.x(), boxOrigin.y() - deltaY, m_logicalWidth, selectionHeight);
</span><span class="cx"> font.adjustSelectionRectForText(textRun, selectionRect, sPos, ePos);
</span><del>- context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), c, style.colorSpace());
</del><ins>+ context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), c);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> UNUSED_PARAM(boxOrigin);
</span><span class="lines">@@ -745,13 +745,13 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="cx"> Color compositionColor = Color::compositionFill;
</span><del>- updateGraphicsContext(context, TextPaintStyle(compositionColor, style.colorSpace())); // Don't draw text at all!
</del><ins>+ updateGraphicsContext(context, TextPaintStyle(compositionColor)); // Don't draw text at all!
</ins><span class="cx">
</span><span class="cx"> LayoutUnit deltaY = renderer().style().isFlippedLinesWritingMode() ? selectionBottom() - logicalBottom() : logicalTop() - selectionTop();
</span><span class="cx"> LayoutRect selectionRect = LayoutRect(boxOrigin.x(), boxOrigin.y() - deltaY, 0, selectionHeight());
</span><span class="cx"> TextRun textRun = constructTextRun(style, font);
</span><span class="cx"> font.adjustSelectionRectForText(textRun, selectionRect, sPos, ePos);
</span><del>- context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), compositionColor, style.colorSpace());
</del><ins>+ context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), compositionColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static StrokeStyle textDecorationStyleToStrokeStyle(TextDecorationStyle decorationStyle)
</span><span class="lines">@@ -949,7 +949,6 @@
</span><span class="cx"> setClip = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ColorSpace colorSpace = renderer().style().colorSpace();
</del><span class="cx"> bool setShadow = false;
</span><span class="cx">
</span><span class="cx"> do {
</span><span class="lines">@@ -961,7 +960,7 @@
</span><span class="cx"> }
</span><span class="cx"> int shadowX = isHorizontal() ? shadow->x() : shadow->y();
</span><span class="cx"> int shadowY = isHorizontal() ? shadow->y() : -shadow->x();
</span><del>- context.setShadow(FloatSize(shadowX, shadowY - extraOffset), shadow->radius(), shadow->color(), colorSpace);
</del><ins>+ context.setShadow(FloatSize(shadowX, shadowY - extraOffset), shadow->radius(), shadow->color());
</ins><span class="cx"> setShadow = true;
</span><span class="cx"> shadow = shadow->next();
</span><span class="cx"> }
</span><span class="lines">@@ -970,7 +969,7 @@
</span><span class="cx">
</span><span class="cx"> // These decorations should match the visual overflows computed in visualOverflowForDecorations()
</span><span class="cx"> if (decoration & TextDecorationUnderline) {
</span><del>- context.setStrokeColor(underlineColor, colorSpace);
</del><ins>+ context.setStrokeColor(underlineColor);
</ins><span class="cx"> context.setStrokeStyle(textDecorationStyleToStrokeStyle(underlineStyle));
</span><span class="cx"> const int underlineOffset = computeUnderlineOffset(lineStyle.textUnderlinePosition(), lineStyle.fontMetrics(), this, textDecorationThickness);
</span><span class="cx">
</span><span class="lines">@@ -994,7 +993,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (decoration & TextDecorationOverline) {
</span><del>- context.setStrokeColor(overlineColor, colorSpace);
</del><ins>+ context.setStrokeColor(overlineColor);
</ins><span class="cx"> context.setStrokeStyle(textDecorationStyleToStrokeStyle(overlineStyle));
</span><span class="cx"> switch (overlineStyle) {
</span><span class="cx"> case TextDecorationStyleWavy: {
</span><span class="lines">@@ -1015,7 +1014,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (decoration & TextDecorationLineThrough) {
</span><del>- context.setStrokeColor(linethroughColor, colorSpace);
</del><ins>+ context.setStrokeColor(linethroughColor);
</ins><span class="cx"> context.setStrokeStyle(textDecorationStyleToStrokeStyle(linethroughStyle));
</span><span class="cx"> switch (linethroughStyle) {
</span><span class="cx"> case TextDecorationStyleWavy: {
</span><span class="lines">@@ -1127,7 +1126,7 @@
</span><span class="cx">
</span><span class="cx"> Color color = marker.activeMatch() ? renderer().theme().platformActiveTextSearchHighlightColor() : renderer().theme().platformInactiveTextSearchHighlightColor();
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><del>- updateGraphicsContext(context, TextPaintStyle(color, style.colorSpace())); // Don't draw text at all!
</del><ins>+ updateGraphicsContext(context, TextPaintStyle(color)); // Don't draw text at all!
</ins><span class="cx">
</span><span class="cx"> // Use same y positioning and height as for selection, so that when the selection and this highlight are on
</span><span class="cx"> // the same word there are no pieces sticking out.
</span><span class="lines">@@ -1142,7 +1141,7 @@
</span><span class="cx"> if (selectionRect.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), run.ltr()), color, style.colorSpace());
</del><ins>+ context.fillRect(snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), run.ltr()), color);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InlineTextBox::paintDocumentMarkers(GraphicsContext& context, const FloatPoint& boxOrigin, const RenderStyle& style, const FontCascade& font, bool background)
</span><span class="lines">@@ -1261,7 +1260,7 @@
</span><span class="cx"> start += 1;
</span><span class="cx"> width -= 2;
</span><span class="cx">
</span><del>- context.setStrokeColor(underline.color, renderer().style().colorSpace());
</del><ins>+ context.setStrokeColor(underline.color);
</ins><span class="cx"> context.setStrokeThickness(lineThickness);
</span><span class="cx"> context.drawLineForText(FloatPoint(boxOrigin.x() + start, boxOrigin.y() + logicalHeight() - lineThickness), width, renderer().document().printing());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1973,7 +1973,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect gapRect = rootBlock.logicalRectToPhysicalRect(rootBlockPhysicalPosition, LayoutRect(logicalLeft, logicalTop, logicalWidth, logicalHeight));
</span><span class="cx"> if (paintInfo)
</span><del>- paintInfo->context().fillRect(snapRectToDevicePixels(gapRect, document().deviceScaleFactor()), selectionBackgroundColor(), style().colorSpace());
</del><ins>+ paintInfo->context().fillRect(snapRectToDevicePixels(gapRect, document().deviceScaleFactor()), selectionBackgroundColor());
</ins><span class="cx"> return gapRect;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1990,7 +1990,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect gapRect = rootBlock.logicalRectToPhysicalRect(rootBlockPhysicalPosition, LayoutRect(rootBlockLogicalLeft, rootBlockLogicalTop, rootBlockLogicalWidth, logicalHeight));
</span><span class="cx"> if (paintInfo)
</span><del>- paintInfo->context().fillRect(snapRectToDevicePixels(gapRect, document().deviceScaleFactor()), selObj->selectionBackgroundColor(), selObj->style().colorSpace());
</del><ins>+ paintInfo->context().fillRect(snapRectToDevicePixels(gapRect, document().deviceScaleFactor()), selObj->selectionBackgroundColor());
</ins><span class="cx"> return gapRect;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2007,7 +2007,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect gapRect = rootBlock.logicalRectToPhysicalRect(rootBlockPhysicalPosition, LayoutRect(rootBlockLogicalLeft, rootBlockLogicalTop, rootBlockLogicalWidth, logicalHeight));
</span><span class="cx"> if (paintInfo)
</span><del>- paintInfo->context().fillRect(snapRectToDevicePixels(gapRect, document().deviceScaleFactor()), selObj->selectionBackgroundColor(), selObj->style().colorSpace());
</del><ins>+ paintInfo->context().fillRect(snapRectToDevicePixels(gapRect, document().deviceScaleFactor()), selObj->selectionBackgroundColor());
</ins><span class="cx"> return gapRect;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1545,7 +1545,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LayoutRect paintRect = LayoutRect(paintOffset, size());
</span><del>- paintInfo.context().fillRect(snappedIntRect(paintRect), Color::black, style().colorSpace());
</del><ins>+ paintInfo.context().fillRect(snappedIntRect(paintRect), Color::black);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBox::paintMaskImages(const PaintInfo& paintInfo, const LayoutRect& paintRect)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -589,9 +589,9 @@
</span><span class="cx">
</span><span class="cx"> FloatSize shadowOffset(boxShadow->x(), boxShadow->y());
</span><span class="cx"> if (!boxShadow->isWebkitBoxShadow())
</span><del>- context.setShadow(shadowOffset, boxShadow->radius(), boxShadow->color(), style->colorSpace());
</del><ins>+ context.setShadow(shadowOffset, boxShadow->radius(), boxShadow->color());
</ins><span class="cx"> else
</span><del>- context.setLegacyShadow(shadowOffset, boxShadow->radius(), boxShadow->color(), style->colorSpace());
</del><ins>+ context.setLegacyShadow(shadowOffset, boxShadow->radius(), boxShadow->color());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBoxModelObject::paintMaskForTextFillBox(ImageBuffer* maskImage, const IntRect& maskRect, InlineFlowBox* box, const LayoutRect& scrolledPaintRect)
</span><span class="lines">@@ -680,15 +680,15 @@
</span><span class="cx"> FloatRoundedRect pixelSnappedBorder = backgroundRoundedRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance, box, boxSize,
</span><span class="cx"> includeLeftEdge, includeRightEdge).pixelSnappedRoundedRectForPainting(deviceScaleFactor);
</span><span class="cx"> if (pixelSnappedBorder.isRenderable())
</span><del>- context.fillRoundedRect(pixelSnappedBorder, bgColor, style().colorSpace());
</del><ins>+ context.fillRoundedRect(pixelSnappedBorder, bgColor);
</ins><span class="cx"> else {
</span><span class="cx"> context.save();
</span><span class="cx"> clipRoundedInnerRect(context, pixelSnappedRect, pixelSnappedBorder);
</span><del>- context.fillRect(pixelSnappedBorder.rect(), bgColor, style().colorSpace());
</del><ins>+ context.fillRect(pixelSnappedBorder.rect(), bgColor);
</ins><span class="cx"> context.restore();
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- context.fillRect(pixelSnappedRect, bgColor, style().colorSpace());
</del><ins>+ context.fillRect(pixelSnappedRect, bgColor);
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -817,10 +817,10 @@
</span><span class="cx"> if (!baseBgColorOnly && bgColor.alpha())
</span><span class="cx"> baseColor = baseColor.blend(bgColor);
</span><span class="cx">
</span><del>- context.fillRect(backgroundRectForPainting, baseColor, style().colorSpace(), CompositeCopy);
</del><ins>+ context.fillRect(backgroundRectForPainting, baseColor, CompositeCopy);
</ins><span class="cx"> } else if (!baseBgColorOnly && bgColor.alpha()) {
</span><span class="cx"> CompositeOperator operation = shouldClearBackground ? CompositeCopy : context.compositeOperation();
</span><del>- context.fillRect(backgroundRectForPainting, bgColor, style().colorSpace(), operation);
</del><ins>+ context.fillRect(backgroundRectForPainting, bgColor, operation);
</ins><span class="cx"> } else if (shouldClearBackground)
</span><span class="cx"> context.clearRect(backgroundRectForPainting);
</span><span class="cx"> }
</span><span class="lines">@@ -835,12 +835,12 @@
</span><span class="cx"> CompositeOperator compositeOp = op == CompositeSourceOver ? bgLayer->composite() : op;
</span><span class="cx"> context.setDrawLuminanceMask(bgLayer->maskSourceType() == MaskLuminance);
</span><span class="cx"> bool useLowQualityScaling = shouldPaintAtLowQuality(context, *image, bgLayer, geometry.tileSize());
</span><del>- context.drawTiledImage(*image, style().colorSpace(), geometry.destRect(), toLayoutPoint(geometry.relativePhase()), geometry.tileSize(), geometry.spaceSize(), ImagePaintingOptions(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
</del><ins>+ context.drawTiledImage(*image, geometry.destRect(), toLayoutPoint(geometry.relativePhase()), geometry.tileSize(), geometry.spaceSize(), ImagePaintingOptions(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (maskImage && bgLayer->clip() == TextFillBox) {
</span><del>- context.drawImageBuffer(*maskImage, ColorSpaceDeviceRGB, maskRect, CompositeDestinationIn);
</del><ins>+ context.drawImageBuffer(*maskImage, maskRect, CompositeDestinationIn);
</ins><span class="cx"> context.endTransparencyLayer();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1691,7 +1691,7 @@
</span><span class="cx"> path.addRect(pixelSnappedInnerBorder.rect());
</span><span class="cx">
</span><span class="cx"> graphicsContext.setFillRule(RULE_EVENODD);
</span><del>- graphicsContext.setFillColor(edges[firstVisibleEdge].color(), style.colorSpace());
</del><ins>+ graphicsContext.setFillColor(edges[firstVisibleEdge].color());
</ins><span class="cx"> graphicsContext.fillPath(path);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1708,7 +1708,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> graphicsContext.setFillRule(RULE_NONZERO);
</span><del>- graphicsContext.setFillColor(edges[firstVisibleEdge].color(), style.colorSpace());
</del><ins>+ graphicsContext.setFillColor(edges[firstVisibleEdge].color());
</ins><span class="cx"> graphicsContext.fillPath(path);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1752,7 +1752,7 @@
</span><span class="cx"> return;
</span><span class="cx"> case DOTTED:
</span><span class="cx"> case DASHED: {
</span><del>- graphicsContext.setStrokeColor(color, style.colorSpace());
</del><ins>+ graphicsContext.setStrokeColor(color);
</ins><span class="cx">
</span><span class="cx"> // The stroke is doubled here because the provided path is the
</span><span class="cx"> // outside edge of the border so half the stroke is clipped off.
</span><span class="lines">@@ -1880,7 +1880,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> graphicsContext.setStrokeStyle(NoStroke);
</span><del>- graphicsContext.setFillColor(color, style.colorSpace());
</del><ins>+ graphicsContext.setFillColor(color);
</ins><span class="cx"> graphicsContext.drawRect(snapRectToDevicePixels(borderRect, document().deviceScaleFactor()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2265,9 +2265,9 @@
</span><span class="cx"> fillRect.move(extraOffset);
</span><span class="cx">
</span><span class="cx"> if (shadow->isWebkitBoxShadow())
</span><del>- context.setLegacyShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</del><ins>+ context.setLegacyShadow(shadowOffset, shadowRadius, shadowColor);
</ins><span class="cx"> else
</span><del>- context.setShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</del><ins>+ context.setShadow(shadowOffset, shadowRadius, shadowColor);
</ins><span class="cx">
</span><span class="cx"> FloatRoundedRect rectToClipOut = border.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
</span><span class="cx"> FloatRoundedRect pixelSnappedFillRect = fillRect.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
</span><span class="lines">@@ -2285,12 +2285,12 @@
</span><span class="cx"> influenceRect.expandRadii(2 * shadowPaintingExtent + shadowSpread);
</span><span class="cx">
</span><span class="cx"> if (allCornersClippedOut(influenceRect, info.rect))
</span><del>- context.fillRect(pixelSnappedFillRect.rect(), Color::black, style.colorSpace());
</del><ins>+ context.fillRect(pixelSnappedFillRect.rect(), Color::black);
</ins><span class="cx"> else {
</span><span class="cx"> pixelSnappedFillRect.expandRadii(shadowSpread);
</span><span class="cx"> if (!pixelSnappedFillRect.isRenderable())
</span><span class="cx"> pixelSnappedFillRect.adjustRadii();
</span><del>- context.fillRoundedRect(pixelSnappedFillRect, Color::black, style.colorSpace());
</del><ins>+ context.fillRoundedRect(pixelSnappedFillRect, Color::black);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time
</span><span class="lines">@@ -2307,7 +2307,7 @@
</span><span class="cx">
</span><span class="cx"> if (!rectToClipOut.isEmpty())
</span><span class="cx"> context.clipOut(rectToClipOut.rect());
</span><del>- context.fillRect(pixelSnappedFillRect.rect(), Color::black, style.colorSpace());
</del><ins>+ context.fillRect(pixelSnappedFillRect.rect(), Color::black);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Inset shadow.
</span><span class="lines">@@ -2317,9 +2317,9 @@
</span><span class="cx">
</span><span class="cx"> if (pixelSnappedHoleRect.isEmpty()) {
</span><span class="cx"> if (hasBorderRadius)
</span><del>- context.fillRoundedRect(pixelSnappedBorderRect, shadowColor, style.colorSpace());
</del><ins>+ context.fillRoundedRect(pixelSnappedBorderRect, shadowColor);
</ins><span class="cx"> else
</span><del>- context.fillRect(pixelSnappedBorderRect.rect(), shadowColor, style.colorSpace());
</del><ins>+ context.fillRect(pixelSnappedBorderRect.rect(), shadowColor);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2356,11 +2356,11 @@
</span><span class="cx"> shadowOffset -= extraOffset;
</span><span class="cx">
</span><span class="cx"> if (shadow->isWebkitBoxShadow())
</span><del>- context.setLegacyShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</del><ins>+ context.setLegacyShadow(shadowOffset, shadowRadius, shadowColor);
</ins><span class="cx"> else
</span><del>- context.setShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</del><ins>+ context.setShadow(shadowOffset, shadowRadius, shadowColor);
</ins><span class="cx">
</span><del>- context.fillRectWithRoundedHole(pixelSnappedOuterRect, pixelSnappedRoundedHole, fillColor, style.colorSpace());
</del><ins>+ context.fillRectWithRoundedHole(pixelSnappedOuterRect, pixelSnappedRoundedHole, fillColor);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDetailsMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -130,10 +130,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const Color color(style().visitedDependentColor(CSSPropertyColor));
</span><del>- paintInfo.context().setStrokeColor(color, style().colorSpace());
</del><ins>+ paintInfo.context().setStrokeColor(color);
</ins><span class="cx"> paintInfo.context().setStrokeStyle(SolidStroke);
</span><span class="cx"> paintInfo.context().setStrokeThickness(1.0f);
</span><del>- paintInfo.context().setFillColor(color, style().colorSpace());
</del><ins>+ paintInfo.context().setFillColor(color);
</ins><span class="cx">
</span><span class="cx"> boxOrigin.move(borderLeft() + paddingLeft(), borderTop() + paddingTop());
</span><span class="cx"> paintInfo.context().fillPath(getPath(boxOrigin));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1820,7 +1820,6 @@
</span><span class="cx"> if (borderStyle == DOUBLE && (thickness * deviceScaleFactor) < 3)
</span><span class="cx"> borderStyle = SOLID;
</span><span class="cx">
</span><del>- const RenderStyle& style = this->style();
</del><span class="cx"> switch (borderStyle) {
</span><span class="cx"> case BNONE:
</span><span class="cx"> case BHIDDEN:
</span><span class="lines">@@ -1830,7 +1829,7 @@
</span><span class="cx"> bool wasAntialiased = graphicsContext.shouldAntialias();
</span><span class="cx"> StrokeStyle oldStrokeStyle = graphicsContext.strokeStyle();
</span><span class="cx"> graphicsContext.setShouldAntialias(antialias);
</span><del>- graphicsContext.setStrokeColor(color, style.colorSpace());
</del><ins>+ graphicsContext.setStrokeColor(color);
</ins><span class="cx"> graphicsContext.setStrokeThickness(thickness);
</span><span class="cx"> graphicsContext.setStrokeStyle(borderStyle == DASHED ? DashedStroke : DottedStroke);
</span><span class="cx"> graphicsContext.drawLine(roundPointToDevicePixels(LayoutPoint(x1, y1), deviceScaleFactor), roundPointToDevicePixels(LayoutPoint(x2, y2), deviceScaleFactor));
</span><span class="lines">@@ -1845,7 +1844,7 @@
</span><span class="cx"> if (!adjacentWidth1 && !adjacentWidth2) {
</span><span class="cx"> StrokeStyle oldStrokeStyle = graphicsContext.strokeStyle();
</span><span class="cx"> graphicsContext.setStrokeStyle(NoStroke);
</span><del>- graphicsContext.setFillColor(color, style.colorSpace());
</del><ins>+ graphicsContext.setFillColor(color);
</ins><span class="cx">
</span><span class="cx"> bool wasAntialiased = graphicsContext.shouldAntialias();
</span><span class="cx"> graphicsContext.setShouldAntialias(antialias);
</span><span class="lines">@@ -1996,7 +1995,7 @@
</span><span class="cx"> // Turn off antialiasing to match the behavior of drawConvexPolygon();
</span><span class="cx"> // this matters for rects in transformed contexts.
</span><span class="cx"> graphicsContext.setStrokeStyle(NoStroke);
</span><del>- graphicsContext.setFillColor(color, style.colorSpace());
</del><ins>+ graphicsContext.setFillColor(color);
</ins><span class="cx"> bool wasAntialiased = graphicsContext.shouldAntialias();
</span><span class="cx"> graphicsContext.setShouldAntialias(antialias);
</span><span class="cx"> graphicsContext.drawRect(snapRectToDevicePixels(x1, y1, x2 - x1, y2 - y1, deviceScaleFactor));
</span><span class="lines">@@ -2040,7 +2039,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> graphicsContext.setStrokeStyle(NoStroke);
</span><del>- graphicsContext.setFillColor(color, style.colorSpace());
</del><ins>+ graphicsContext.setFillColor(color);
</ins><span class="cx"> graphicsContext.drawConvexPolygon(4, quad, antialias);
</span><span class="cx"> graphicsContext.setStrokeStyle(oldStrokeStyle);
</span><span class="cx"> break;
</span><span class="lines">@@ -2108,7 +2107,7 @@
</span><span class="cx"> path.addRect(outer);
</span><span class="cx"> path.addRect(inner);
</span><span class="cx"> graphicsContext.setFillRule(RULE_EVENODD);
</span><del>- graphicsContext.setFillColor(outlineColor, styleToUse.colorSpace());
</del><ins>+ graphicsContext.setFillColor(outlineColor);
</ins><span class="cx"> graphicsContext.fillPath(path);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context.drawImage(image, style().colorSpace(), alignedRect, ImagePaintingOptions(orientationDescription, useLowQualityScaling));
</del><ins>+ context.drawImage(image, alignedRect, ImagePaintingOptions(orientationDescription, useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderEmbeddedObject::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="cx"> context.clip(contentRect);
</span><del>- context.setFillColor(m_unavailablePluginIndicatorIsPressed ? replacementTextRoundedRectPressedColor() : replacementTextRoundedRectColor(), style().colorSpace());
</del><ins>+ context.setFillColor(m_unavailablePluginIndicatorIsPressed ? replacementTextRoundedRectPressedColor() : replacementTextRoundedRectColor());
</ins><span class="cx"> context.fillPath(background);
</span><span class="cx">
</span><span class="cx"> Path strokePath;
</span><span class="lines">@@ -320,21 +320,21 @@
</span><span class="cx"> strokeRect.inflate(1);
</span><span class="cx"> strokePath.addRoundedRect(strokeRect, FloatSize(replacementTextRoundedRectRadius + 1, replacementTextRoundedRectRadius + 1));
</span><span class="cx">
</span><del>- context.setStrokeColor(unavailablePluginBorderColor(), style().colorSpace());
</del><ins>+ context.setStrokeColor(unavailablePluginBorderColor());
</ins><span class="cx"> context.setStrokeThickness(2);
</span><span class="cx"> context.strokePath(strokePath);
</span><span class="cx">
</span><span class="cx"> const FontMetrics& fontMetrics = font.fontMetrics();
</span><span class="cx"> float labelX = roundf(replacementTextRect.location().x() + replacementTextRoundedRectLeftTextMargin);
</span><span class="cx"> float labelY = roundf(replacementTextRect.location().y() + (replacementTextRect.size().height() - fontMetrics.height()) / 2 + fontMetrics.ascent() + replacementTextRoundedRectTopTextMargin);
</span><del>- context.setFillColor(replacementTextColor(), style().colorSpace());
</del><ins>+ context.setFillColor(replacementTextColor());
</ins><span class="cx"> context.drawBidiText(font, run, FloatPoint(labelX, labelY));
</span><span class="cx">
</span><span class="cx"> if (shouldUnavailablePluginMessageBeButton(document(), m_pluginUnavailabilityReason)) {
</span><span class="cx"> arrowRect.inflate(-replacementArrowCirclePadding);
</span><span class="cx">
</span><span class="cx"> context.beginTransparencyLayer(1.0);
</span><del>- context.setFillColor(replacementTextColor(), style().colorSpace());
</del><ins>+ context.setFillColor(replacementTextColor());
</ins><span class="cx"> context.fillEllipse(arrowRect);
</span><span class="cx">
</span><span class="cx"> context.setCompositeOperation(CompositeClear);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFileUploadControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> else
</span><span class="cx"> textY = baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
</span><span class="cx">
</span><del>- paintInfo.context().setFillColor(style().visitedDependentColor(CSSPropertyColor), style().colorSpace());
</del><ins>+ paintInfo.context().setFillColor(style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx">
</span><span class="cx"> // Draw the filename
</span><span class="cx"> paintInfo.context().drawBidiText(font, textRun, IntPoint(roundToInt(textX), roundToInt(textY)));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFrameSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFrameSet.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -91,14 +91,13 @@
</span><span class="cx">
</span><span class="cx"> // Fill first.
</span><span class="cx"> GraphicsContext& context = paintInfo.context();
</span><del>- ColorSpace colorSpace = style().colorSpace();
- context.fillRect(borderRect, frameSetElement().hasBorderColor() ? style().visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
</del><ins>+ context.fillRect(borderRect, frameSetElement().hasBorderColor() ? style().visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor());
</ins><span class="cx">
</span><span class="cx"> // Now stroke the edges but only if we have enough room to paint both edges with a little
</span><span class="cx"> // bit of the fill color showing through.
</span><span class="cx"> if (borderRect.width() >= 3) {
</span><del>- context.fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor(), colorSpace);
- context.fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y()), IntSize(1, height())), borderEndEdgeColor(), colorSpace);
</del><ins>+ context.fillRect(IntRect(borderRect.location(), IntSize(1, height())), borderStartEdgeColor());
+ context.fillRect(IntRect(IntPoint(borderRect.maxX() - 1, borderRect.y()), IntSize(1, height())), borderEndEdgeColor());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,14 +110,13 @@
</span><span class="cx">
</span><span class="cx"> // Fill first.
</span><span class="cx"> GraphicsContext& context = paintInfo.context();
</span><del>- ColorSpace colorSpace = style().colorSpace();
- context.fillRect(borderRect, frameSetElement().hasBorderColor() ? style().visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor(), colorSpace);
</del><ins>+ context.fillRect(borderRect, frameSetElement().hasBorderColor() ? style().visitedDependentColor(CSSPropertyBorderLeftColor) : borderFillColor());
</ins><span class="cx">
</span><span class="cx"> // Now stroke the edges but only if we have enough room to paint both edges with a little
</span><span class="cx"> // bit of the fill color showing through.
</span><span class="cx"> if (borderRect.height() >= 3) {
</span><del>- context.fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), borderStartEdgeColor(), colorSpace);
- context.fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1), IntSize(width(), 1)), borderEndEdgeColor(), colorSpace);
</del><ins>+ context.fillRect(IntRect(borderRect.location(), IntSize(width(), 1)), borderStartEdgeColor());
+ context.fillRect(IntRect(IntPoint(borderRect.x(), borderRect.maxY() - 1), IntSize(width(), 1)), borderEndEdgeColor());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -392,8 +392,8 @@
</span><span class="cx">
</span><span class="cx"> // Draw an outline rect where the image should be.
</span><span class="cx"> context.setStrokeStyle(SolidStroke);
</span><del>- context.setStrokeColor(Color::lightGray, style().colorSpace());
- context.setFillColor(Color::transparent, style().colorSpace());
</del><ins>+ context.setStrokeColor(Color::lightGray);
+ context.setFillColor(Color::transparent);
</ins><span class="cx"> context.drawRect(snapRectToDevicePixels(LayoutRect(paintOffset.x() + leftBorder + leftPad, paintOffset.y() + topBorder + topPad, cWidth, cHeight), deviceScaleFactor), borderWidth);
</span><span class="cx">
</span><span class="cx"> bool errorPictureDrawn = false;
</span><span class="lines">@@ -424,13 +424,13 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context.drawImage(*image, style().colorSpace(), snapRectToDevicePixels(LayoutRect(paintOffset + imageOffset, imageSize), deviceScaleFactor), orientationDescription);
</del><ins>+ context.drawImage(*image, snapRectToDevicePixels(LayoutRect(paintOffset + imageOffset, imageSize), deviceScaleFactor), orientationDescription);
</ins><span class="cx"> errorPictureDrawn = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_altText.isEmpty()) {
</span><span class="cx"> String text = document().displayStringModifiedByEncoding(m_altText);
</span><del>- context.setFillColor(style().visitedDependentColor(CSSPropertyColor), style().colorSpace());
</del><ins>+ context.setFillColor(style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> const FontCascade& font = style().fontCascade();
</span><span class="cx"> const FontMetrics& fontMetrics = font.fontMetrics();
</span><span class="cx"> LayoutUnit ascent = fontMetrics.ascent();
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context.drawImage(*img, style().colorSpace(), rect,
</del><ins>+ context.drawImage(*img, rect,
</ins><span class="cx"> ImagePaintingOptions(compositeOperator, BlendModeNormal, orientationDescription, useLowQualityScaling));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1821,7 +1821,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifdef REVEAL_TRANSPARENCY_LAYERS
</span><del>- context->setFillColor(Color(0.0f, 0.0f, 0.5f, 0.2f), ColorSpaceDeviceRGB);
</del><ins>+ context->setFillColor(Color(0.0f, 0.0f, 0.5f, 0.2f));
</ins><span class="cx"> context->fillRect(pixelSnappedClipRect);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -3608,9 +3608,6 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::paintScrollCorner(GraphicsContext& context, const IntPoint& paintOffset, const IntRect& damageRect)
</span><span class="cx"> {
</span><del>- RenderBox* box = renderBox();
- ASSERT(box);
-
</del><span class="cx"> IntRect absRect = scrollCornerRect();
</span><span class="cx"> absRect.moveBy(paintOffset);
</span><span class="cx"> if (!absRect.intersects(damageRect))
</span><span class="lines">@@ -3629,7 +3626,7 @@
</span><span class="cx"> // We don't want to paint white if we have overlay scrollbars, since we need
</span><span class="cx"> // to see what is behind it.
</span><span class="cx"> if (!hasOverlayScrollbars())
</span><del>- context.fillRect(absRect, Color::white, box->style().colorSpace());
</del><ins>+ context.fillRect(absRect, Color::white);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayer::drawPlatformResizerImage(GraphicsContext& context, const LayoutRect& resizerCornerRect)
</span><span class="lines">@@ -3652,7 +3649,7 @@
</span><span class="cx"> context.translate(resizerCornerRect.x() + cornerResizerSize.width(), resizerCornerRect.y() + resizerCornerRect.height() - cornerResizerSize.height());
</span><span class="cx"> context.scale(FloatSize(-1.0, 1.0));
</span><span class="cx"> if (resizeCornerImage)
</span><del>- context.drawImage(*resizeCornerImage, renderer().style().colorSpace(), FloatRect(FloatPoint(), cornerResizerSize));
</del><ins>+ context.drawImage(*resizeCornerImage, FloatRect(FloatPoint(), cornerResizerSize));
</ins><span class="cx"> context.restore();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -3660,7 +3657,7 @@
</span><span class="cx"> if (!resizeCornerImage)
</span><span class="cx"> return;
</span><span class="cx"> FloatRect imageRect = snapRectToDevicePixels(LayoutRect(resizerCornerRect.maxXMaxYCorner() - cornerResizerSize, cornerResizerSize), renderer().document().deviceScaleFactor());
</span><del>- context.drawImage(*resizeCornerImage, renderer().style().colorSpace(), imageRect);
</del><ins>+ context.drawImage(*resizeCornerImage, imageRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayer::paintResizer(GraphicsContext& context, const LayoutPoint& paintOffset, const LayoutRect& damageRect)
</span><span class="lines">@@ -3695,9 +3692,9 @@
</span><span class="cx"> context.clip(absRect);
</span><span class="cx"> LayoutRect largerCorner = absRect;
</span><span class="cx"> largerCorner.setSize(LayoutSize(largerCorner.width() + LayoutUnit::fromPixel(1), largerCorner.height() + LayoutUnit::fromPixel(1)));
</span><del>- context.setStrokeColor(Color(makeRGB(217, 217, 217)), ColorSpaceDeviceRGB);
</del><ins>+ context.setStrokeColor(Color(makeRGB(217, 217, 217)));
</ins><span class="cx"> context.setStrokeThickness(1.0f);
</span><del>- context.setFillColor(Color::transparent, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(Color::transparent);
</ins><span class="cx"> context.drawRect(snappedIntRect(largerCorner));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -396,8 +396,7 @@
</span><span class="cx"> textColor = theme().inactiveListBoxSelectionForegroundColor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ColorSpace colorSpace = itemStyle.colorSpace();
- paintInfo.context().setFillColor(textColor, colorSpace);
</del><ins>+ paintInfo.context().setFillColor(textColor);
</ins><span class="cx">
</span><span class="cx"> TextRun textRun(itemText, 0, 0, AllowTrailingExpansion, itemStyle.direction(), isOverride(itemStyle.unicodeBidi()), true, TextRun::NoRounding);
</span><span class="cx"> FontCascade itemFont = style().fontCascade();
</span><span class="lines">@@ -432,10 +431,9 @@
</span><span class="cx">
</span><span class="cx"> // Draw the background for this list box item
</span><span class="cx"> if (itemStyle.visibility() != HIDDEN) {
</span><del>- ColorSpace colorSpace = itemStyle.colorSpace();
</del><span class="cx"> LayoutRect itemRect = itemBoundingBoxRect(paintOffset, listIndex);
</span><span class="cx"> itemRect.intersect(controlClipRect(paintOffset));
</span><del>- paintInfo.context().fillRect(snappedIntRect(itemRect), backColor, colorSpace);
</del><ins>+ paintInfo.context().fillRect(snappedIntRect(itemRect), backColor);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1198,11 +1198,11 @@
</span><span class="cx">
</span><span class="cx"> if (isImage()) {
</span><span class="cx"> if (RefPtr<Image> markerImage = m_image->image(this, marker.size()))
</span><del>- context.drawImage(*markerImage, style().colorSpace(), marker);
</del><ins>+ context.drawImage(*markerImage, marker);
</ins><span class="cx"> if (selectionState() != SelectionNone) {
</span><span class="cx"> LayoutRect selRect = localSelectionRect();
</span><span class="cx"> selRect.moveBy(boxOrigin);
</span><del>- context.fillRect(snappedIntRect(selRect), m_listItem.selectionBackgroundColor(), style().colorSpace());
</del><ins>+ context.fillRect(snappedIntRect(selRect), m_listItem.selectionBackgroundColor());
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1210,14 +1210,14 @@
</span><span class="cx"> if (selectionState() != SelectionNone) {
</span><span class="cx"> LayoutRect selRect = localSelectionRect();
</span><span class="cx"> selRect.moveBy(boxOrigin);
</span><del>- context.fillRect(snappedIntRect(selRect), m_listItem.selectionBackgroundColor(), style().colorSpace());
</del><ins>+ context.fillRect(snappedIntRect(selRect), m_listItem.selectionBackgroundColor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Color color(style().visitedDependentColor(CSSPropertyColor));
</span><del>- context.setStrokeColor(color, style().colorSpace());
</del><ins>+ context.setStrokeColor(color);
</ins><span class="cx"> context.setStrokeStyle(SolidStroke);
</span><span class="cx"> context.setStrokeThickness(1.0f);
</span><del>- context.setFillColor(color, style().colorSpace());
</del><ins>+ context.setFillColor(color);
</ins><span class="cx">
</span><span class="cx"> EListStyleType type = style().listStyleType();
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -1225,7 +1225,7 @@
</span><span class="cx"> context.drawEllipse(marker);
</span><span class="cx"> return;
</span><span class="cx"> case Circle:
</span><del>- context.setFillColor(Color::transparent, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(Color::transparent);
</ins><span class="cx"> context.drawEllipse(marker);
</span><span class="cx"> return;
</span><span class="cx"> case Square:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> if (drawSelectionTint) {
</span><span class="cx"> LayoutRect selectionPaintingRect = localSelectionRect();
</span><span class="cx"> selectionPaintingRect.moveBy(adjustedPaintOffset);
</span><del>- paintInfo.context().fillRect(snappedIntRect(selectionPaintingRect), selectionBackgroundColor(), style().colorSpace());
</del><ins>+ paintInfo.context().fillRect(snappedIntRect(selectionPaintingRect), selectionBackgroundColor());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> void RenderScrollbarTheme::paintScrollCorner(ScrollView*, GraphicsContext& context, const IntRect& cornerRect)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Implement.
</span><del>- context.fillRect(cornerRect, Color::white, ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(cornerRect, Color::white);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderScrollbarTheme::paintScrollbarBackground(GraphicsContext& context, Scrollbar& scrollbar)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context.drawImage(*image, style().colorSpace(), alignedRect, ImagePaintingOptions(orientationDescription, useLowQualityScaling));
</del><ins>+ context.drawImage(*image, alignedRect, ImagePaintingOptions(orientationDescription, useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CursorDirective RenderSnapshottedPlugIn::getCursor(const LayoutPoint& point, Cursor& overrideCursor) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1036,7 +1036,7 @@
</span><span class="cx"> }
</span><span class="cx"> Ref<HTMLCollection> options = dataList->options();
</span><span class="cx"> GraphicsContextStateSaver stateSaver(paintInfo.context());
</span><del>- paintInfo.context().setFillColor(o.style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setFillColor(o.style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> for (unsigned i = 0; Node* node = options->item(i); i++) {
</span><span class="cx"> ASSERT(is<HTMLOptionElement>(*node));
</span><span class="cx"> HTMLOptionElement& optionElement = downcast<HTMLOptionElement>(*node);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1533,7 +1533,7 @@
</span><span class="cx"> rangeRect.setWidth(lengthRatio * totalTrackWidth);
</span><span class="cx"> if (index)
</span><span class="cx"> rangeRect.move(startRatio * totalTrackWidth, 0);
</span><del>- context.fillRoundedRect(FloatRoundedRect(rangeRect, borderRadiiFromStyle(style)), style.visitedDependentColor(CSSPropertyColor), style.colorSpace());
</del><ins>+ context.fillRoundedRect(FloatRoundedRect(rangeRect, borderRadiiFromStyle(style)), style.visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> context.restore();
</span><span class="lines">@@ -1543,7 +1543,7 @@
</span><span class="cx"> bool RenderThemeGtk::paintMediaSliderThumb(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</span><span class="cx"> {
</span><span class="cx"> RenderStyle& style = o.style();
</span><del>- paintInfo.context().fillRoundedRect(FloatRoundedRect(r, borderRadiiFromStyle(style)), style.visitedDependentColor(CSSPropertyColor), style.colorSpace());
</del><ins>+ paintInfo.context().fillRoundedRect(FloatRoundedRect(r, borderRadiiFromStyle(style)), style.visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1573,8 +1573,7 @@
</span><span class="cx"> volumeRect.move(0, rectHeight - trackHeight);
</span><span class="cx"> volumeRect.setHeight(ceil(trackHeight));
</span><span class="cx">
</span><del>- context.fillRoundedRect(FloatRoundedRect(volumeRect, borderRadiiFromStyle(style)),
- style.visitedDependentColor(CSSPropertyColor), style.colorSpace());
</del><ins>+ context.fillRoundedRect(FloatRoundedRect(volumeRect, borderRadiiFromStyle(style)), style.visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> context.restore();
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -160,13 +160,13 @@
</span><span class="cx">
</span><span class="cx"> static void drawAxialGradient(CGContextRef context, IOSGradientRef gradient, const FloatPoint& startPoint, const FloatPoint& stopPoint, Interpolation interpolation)
</span><span class="cx"> {
</span><del>- RetainPtr<CGShadingRef> shading = adoptCF(CGShadingCreateAxial(deviceRGBColorSpaceRef(), startPoint, stopPoint, getSharedFunctionRef(gradient, interpolation), false, false));
</del><ins>+ RetainPtr<CGShadingRef> shading = adoptCF(CGShadingCreateAxial(sRGBColorSpaceRef(), startPoint, stopPoint, getSharedFunctionRef(gradient, interpolation), false, false));
</ins><span class="cx"> CGContextDrawShading(context, shading.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void drawRadialGradient(CGContextRef context, IOSGradientRef gradient, const FloatPoint& startPoint, float startRadius, const FloatPoint& stopPoint, float stopRadius, Interpolation interpolation)
</span><span class="cx"> {
</span><del>- RetainPtr<CGShadingRef> shading = adoptCF(CGShadingCreateRadial(deviceRGBColorSpaceRef(), startPoint, startRadius, stopPoint, stopRadius, getSharedFunctionRef(gradient, interpolation), false, false));
</del><ins>+ RetainPtr<CGShadingRef> shading = adoptCF(CGShadingCreateRadial(deviceRGBColorSpaceRef() /* FIXME */, startPoint, startRadius, stopPoint, stopRadius, getSharedFunctionRef(gradient, interpolation), false, false));
</ins><span class="cx"> CGContextDrawShading(context, shading.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -392,12 +392,12 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> paintInfo.context().setStrokeThickness(lineWidth);
</span><del>- paintInfo.context().setStrokeColor(Color(0.0f, 0.0f, 0.0f, 0.7f), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setStrokeColor(Color(0.0f, 0.0f, 0.0f, 0.7f));
</ins><span class="cx">
</span><span class="cx"> paintInfo.context().drawJoinedLines(shadow, 3, true, kCGLineCapSquare);
</span><span class="cx">
</span><span class="cx"> paintInfo.context().setStrokeThickness(std::min(clip.width(), clip.height()) * thicknessRatio);
</span><del>- paintInfo.context().setStrokeColor(Color(1.0f, 1.0f, 1.0f, 240 / 255.0f), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setStrokeColor(Color(1.0f, 1.0f, 1.0f, 240 / 255.0f));
</ins><span class="cx">
</span><span class="cx"> paintInfo.context().drawJoinedLines(line, 3, true);
</span><span class="cx"> } else {
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> clip.inflateX(-clip.width() * InnerInverseRatio);
</span><span class="cx"> clip.inflateY(-clip.height() * InnerInverseRatio);
</span><span class="cx">
</span><del>- paintInfo.context().drawRaisedEllipse(clip, Color::white, ColorSpaceDeviceRGB, shadowColor(), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().drawRaisedEllipse(clip, Color::white, shadowColor());
</ins><span class="cx">
</span><span class="cx"> FloatSize radius(clip.width() / 2.0f, clip.height() / 2.0f);
</span><span class="cx"> paintInfo.context().clipRoundedRect(FloatRoundedRect(clip, radius, radius, radius, radius));
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx"> FloatSize(0, 0), FloatSize(valueForLength(style.borderTopRightRadius().width(), rect.width()) - style.borderRightWidth(), valueForLength(style.borderTopRightRadius().height(), rect.height()) - style.borderTopWidth()),
</span><span class="cx"> FloatSize(0, 0), FloatSize(valueForLength(style.borderBottomRightRadius().width(), rect.width()) - style.borderRightWidth(), valueForLength(style.borderBottomRightRadius().height(), rect.height()) - style.borderBottomWidth())));
</span><span class="cx">
</span><del>- paintInfo.context().fillRect(buttonClip, style.visitedDependentColor(CSSPropertyBorderTopColor), style.colorSpace());
</del><ins>+ paintInfo.context().fillRect(buttonClip, style.visitedDependentColor(CSSPropertyBorderTopColor));
</ins><span class="cx">
</span><span class="cx"> drawAxialGradient(cgContext, gradientWithName(isFocused(box) && !isReadOnlyControl(box) ? ConcaveGradient : ConvexGradient), buttonClip.location(), FloatPoint(buttonClip.x(), buttonClip.maxY()), LinearInterpolation);
</span><span class="cx"> }
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> FloatRect ellipse(buttonClip.x() + (buttonClip.width() - count * (size + padding) + padding) / 2.0, buttonClip.maxY() - 10.0, size, size);
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < count; ++i) {
</span><del>- paintInfo.context().drawRaisedEllipse(ellipse, Color::white, ColorSpaceDeviceRGB, Color(0.0f, 0.0f, 0.0f, 0.5f), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().drawRaisedEllipse(ellipse, Color::white, Color(0.0f, 0.0f, 0.0f, 0.5f));
</ins><span class="cx"> ellipse.move(size + padding, 0);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -682,12 +682,12 @@
</span><span class="cx"> shadow[2] = FloatPoint(arrow[2].x(), arrow[2].y() + 1.0f);
</span><span class="cx">
</span><span class="cx"> float opacity = isReadOnlyControl(box) ? 0.2 : 0.5;
</span><del>- paintInfo.context().setStrokeColor(Color(0.0f, 0.0f, 0.0f, opacity), ColorSpaceDeviceRGB);
- paintInfo.context().setFillColor(Color(0.0f, 0.0f, 0.0f, opacity), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setStrokeColor(Color(0.0f, 0.0f, 0.0f, opacity));
+ paintInfo.context().setFillColor(Color(0.0f, 0.0f, 0.0f, opacity));
</ins><span class="cx"> paintInfo.context().drawConvexPolygon(3, shadow, true);
</span><span class="cx">
</span><del>- paintInfo.context().setStrokeColor(Color::white, ColorSpaceDeviceRGB);
- paintInfo.context().setFillColor(Color::white, ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setStrokeColor(Color::white);
+ paintInfo.context().setFillColor(Color::white);
</ins><span class="cx"> paintInfo.context().drawConvexPolygon(3, arrow, true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -772,9 +772,9 @@
</span><span class="cx">
</span><span class="cx"> CGContextRef cgContext = paintInfo.context().platformContext();
</span><span class="cx"> if (readonly)
</span><del>- paintInfo.context().setStrokeColor(Color(178, 178, 178), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setStrokeColor(Color(178, 178, 178));
</ins><span class="cx"> else
</span><del>- paintInfo.context().setStrokeColor(Color(76, 76, 76), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setStrokeColor(Color(76, 76, 76));
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CGMutablePathRef> roundedRectPath = adoptCF(CGPathCreateMutable());
</span><span class="cx"> CGPathAddRoundedRect(roundedRectPath.get(), 0, trackClip, cornerWidth, cornerHeight);
</span><span class="lines">@@ -859,8 +859,7 @@
</span><span class="cx"> strokeGradient->addColorStop(1.0, Color(0x8d, 0x8d, 0x8d));
</span><span class="cx"> context.setStrokeGradient(strokeGradient.releaseNonNull());
</span><span class="cx">
</span><del>- ColorSpace colorSpace = renderer.style().colorSpace();
- context.setFillColor(Color(255, 255, 255), colorSpace);
</del><ins>+ context.setFillColor(Color(255, 255, 255));
</ins><span class="cx">
</span><span class="cx"> Path trackPath;
</span><span class="cx"> FloatRect trackRect(rect.x() + 0.25, verticalRenderingPosition + 0.25, rect.width() - 0.5, progressBarHeight - 0.5);
</span><span class="lines">@@ -1024,8 +1023,8 @@
</span><span class="cx">
</span><span class="cx"> // Background picture frame and simple background icon with a gradient matching the button.
</span><span class="cx"> Color backgroundImageColor = Color(buttonRenderer.style().visitedDependentColor(CSSPropertyBackgroundColor).rgb());
</span><del>- paintInfo.context().fillRoundedRect(FloatRoundedRect(thumbnailPictureFrameRect, cornerSize, cornerSize, cornerSize, cornerSize), pictureFrameColor, ColorSpaceDeviceRGB);
- paintInfo.context().fillRect(thumbnailRect, backgroundImageColor, ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().fillRoundedRect(FloatRoundedRect(thumbnailPictureFrameRect, cornerSize, cornerSize, cornerSize, cornerSize), pictureFrameColor);
+ paintInfo.context().fillRect(thumbnailRect, backgroundImageColor);
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver2(paintInfo.context());
</span><span class="cx"> CGContextRef cgContext = paintInfo.context().platformContext();
</span><span class="lines">@@ -1045,7 +1044,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Foreground picture frame and icon.
</span><del>- paintInfo.context().fillRoundedRect(FloatRoundedRect(thumbnailPictureFrameRect, cornerSize, cornerSize, cornerSize, cornerSize), pictureFrameColor, ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().fillRoundedRect(FloatRoundedRect(thumbnailPictureFrameRect, cornerSize, cornerSize, cornerSize, cornerSize), pictureFrameColor);
</ins><span class="cx"> icon->paint(paintInfo.context(), thumbnailRect);
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1156,7 +1156,7 @@
</span><span class="cx"> paintInfo.context().scale(FloatSize(-1, 1));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- paintInfo.context().drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, inflatedRect.location());
</del><ins>+ paintInfo.context().drawImageBuffer(*imageBuffer, inflatedRect.location());
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1301,7 +1301,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(paintInfo.context());
</span><span class="cx">
</span><del>- paintInfo.context().setFillColor(renderer.style().visitedDependentColor(CSSPropertyColor), renderer.style().colorSpace());
</del><ins>+ paintInfo.context().setFillColor(renderer.style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> paintInfo.context().setStrokeStyle(NoStroke);
</span><span class="cx">
</span><span class="cx"> FloatPoint arrow1[3];
</span><span class="lines">@@ -1330,11 +1330,11 @@
</span><span class="cx"> // Draw the separator to the left of the arrows
</span><span class="cx"> paintInfo.context().setStrokeThickness(1); // Deliberately ignores zoom since it looks nicer if it stays thin.
</span><span class="cx"> paintInfo.context().setStrokeStyle(SolidStroke);
</span><del>- paintInfo.context().setStrokeColor(leftSeparatorColor, ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setStrokeColor(leftSeparatorColor);
</ins><span class="cx"> paintInfo.context().drawLine(IntPoint(leftEdgeOfSeparator, bounds.y()),
</span><span class="cx"> IntPoint(leftEdgeOfSeparator, bounds.maxY()));
</span><span class="cx">
</span><del>- paintInfo.context().setStrokeColor(rightSeparatorColor, ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().setStrokeColor(rightSeparatorColor);
</ins><span class="cx"> paintInfo.context().drawLine(IntPoint(leftEdgeOfSeparator + separatorSpace, bounds.y()),
</span><span class="cx"> IntPoint(leftEdgeOfSeparator + separatorSpace, bounds.maxY()));
</span><span class="cx"> return false;
</span><span class="lines">@@ -1914,7 +1914,7 @@
</span><span class="cx"> if (alignedPluginRect.width() <= 0 || alignedPluginRect.height() <= 0)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- context.drawImage(*snapshot, plugInRenderer.style().colorSpace(), alignedPluginRect, CompositeSourceOver);
</del><ins>+ context.drawImage(*snapshot, alignedPluginRect, CompositeSourceOver);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2184,7 +2184,7 @@
</span><span class="cx"> if (attachment.selectionState() != RenderObject::SelectionNone) {
</span><span class="cx"> if (attachment.frame().selection().isFocusedAndActive())
</span><span class="cx"> return [NSColor alternateSelectedControlTextColor];
</span><del>- return (NSColor *)cachedCGColor(attachmentTitleInactiveTextColor(), ColorSpaceDeviceRGB);
</del><ins>+ return (NSColor *)cachedCGColor(attachmentTitleInactiveTextColor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return [NSColor blackColor];
</span><span class="lines">@@ -2294,7 +2294,7 @@
</span><span class="cx"> RetainPtr<CTFontRef> font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, attachmentSubtitleFontSize, language));
</span><span class="cx"> NSDictionary *textAttributes = @{
</span><span class="cx"> (id)kCTFontAttributeName: (id)font.get(),
</span><del>- (id)kCTForegroundColorAttributeName: (NSColor *)cachedCGColor(attachmentSubtitleTextColor(), ColorSpaceDeviceRGB)
</del><ins>+ (id)kCTForegroundColorAttributeName: (NSColor *)cachedCGColor(attachmentSubtitleTextColor())
</ins><span class="cx"> };
</span><span class="cx"> RetainPtr<NSAttributedString> attributedSubtitleText = adoptNS([[NSAttributedString alloc] initWithString:subtitleText attributes:textAttributes]);
</span><span class="cx"> subtitleLine = adoptCF(CTLineCreateWithAttributedString((CFAttributedStringRef)attributedSubtitleText.get()));
</span><span class="lines">@@ -2355,7 +2355,7 @@
</span><span class="cx"> if (paintBorder)
</span><span class="cx"> backgroundRect.inflate(-attachmentIconSelectionBorderThickness);
</span><span class="cx">
</span><del>- context.fillRoundedRect(FloatRoundedRect(backgroundRect, FloatRoundedRect::Radii(attachmentIconBackgroundRadius)), attachmentIconBackgroundColor(), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRoundedRect(FloatRoundedRect(backgroundRect, FloatRoundedRect::Radii(attachmentIconBackgroundRadius)), attachmentIconBackgroundColor());
</ins><span class="cx">
</span><span class="cx"> if (paintBorder) {
</span><span class="cx"> FloatRect borderRect = layout.iconBackgroundRect;
</span><span class="lines">@@ -2364,7 +2364,7 @@
</span><span class="cx"> FloatSize iconBackgroundRadiusSize(attachmentIconBackgroundRadius, attachmentIconBackgroundRadius);
</span><span class="cx"> Path borderPath;
</span><span class="cx"> borderPath.addRoundedRect(borderRect, iconBackgroundRadiusSize);
</span><del>- context.setStrokeColor(attachmentIconBorderColor(), ColorSpaceDeviceRGB);
</del><ins>+ context.setStrokeColor(attachmentIconBorderColor());
</ins><span class="cx"> context.setStrokeThickness(attachmentIconSelectionBorderThickness);
</span><span class="cx"> context.strokePath(borderPath);
</span><span class="cx"> }
</span><span class="lines">@@ -2397,7 +2397,7 @@
</span><span class="cx"> else
</span><span class="cx"> backgroundColor = attachmentTitleInactiveBackgroundColor();
</span><span class="cx">
</span><del>- context.setFillColor(backgroundColor, ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(backgroundColor);
</ins><span class="cx">
</span><span class="cx"> Path backgroundPath = PathUtilities::pathWithShrinkWrappedRects(backgroundRects, attachmentTitleBackgroundRadius);
</span><span class="cx"> context.fillPath(backgroundPath);
</span><span class="lines">@@ -2447,7 +2447,7 @@
</span><span class="cx"> backgroundRect.inflate(-attachmentProgressBarBorderWidth / 2);
</span><span class="cx">
</span><span class="cx"> FloatRoundedRect backgroundRoundedRect(backgroundRect, FloatRoundedRect::Radii(backgroundRect.height() / 2));
</span><del>- context.fillRoundedRect(backgroundRoundedRect, attachmentProgressBarBackgroundColor(), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRoundedRect(backgroundRoundedRect, attachmentProgressBarBackgroundColor());
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver clipSaver(context);
</span><span class="lines">@@ -2457,13 +2457,13 @@
</span><span class="cx"> progressRect.setWidth(progressRect.width() * progress);
</span><span class="cx"> progressRect = encloseRectToDevicePixels(progressRect, attachment.document().deviceScaleFactor());
</span><span class="cx">
</span><del>- context.fillRect(progressRect, attachmentProgressBarFillColor(), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(progressRect, attachmentProgressBarFillColor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Path borderPath;
</span><span class="cx"> float borderRadius = borderRect.height() / 2;
</span><span class="cx"> borderPath.addRoundedRect(borderRect, FloatSize(borderRadius, borderRadius));
</span><del>- context.setStrokeColor(attachmentProgressBarBorderColor(), ColorSpaceDeviceRGB);
</del><ins>+ context.setStrokeColor(attachmentProgressBarBorderColor());
</ins><span class="cx"> context.setStrokeThickness(attachmentProgressBarBorderWidth);
</span><span class="cx"> context.strokePath(borderPath);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx">
</span><span class="cx"> // This avoids painting garbage between columns if there is a column gap.
</span><span class="cx"> if (frameView().pagination().mode != Pagination::Unpaginated && paintInfo.shouldPaintWithinRoot(*this))
</span><del>- paintInfo.context().fillRect(paintInfo.rect, frameView().baseBackgroundColor(), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context().fillRect(paintInfo.rect, frameView().baseBackgroundColor());
</ins><span class="cx">
</span><span class="cx"> paintObject(paintInfo, paintOffset);
</span><span class="cx"> }
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx"> if (backgroundColor.alpha()) {
</span><span class="cx"> CompositeOperator previousOperator = paintInfo.context().compositeOperation();
</span><span class="cx"> paintInfo.context().setCompositeOperation(CompositeCopy);
</span><del>- paintInfo.context().fillRect(paintInfo.rect, backgroundColor, style().colorSpace());
</del><ins>+ paintInfo.context().fillRect(paintInfo.rect, backgroundColor);
</ins><span class="cx"> paintInfo.context().setCompositeOperation(previousOperator);
</span><span class="cx"> } else
</span><span class="cx"> paintInfo.context().clearRect(paintInfo.rect);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderWidgetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderWidget.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderWidget.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RenderWidget.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> // Paint a partially transparent wash over selected widgets.
</span><span class="cx"> if (isSelected() && !document().printing()) {
</span><span class="cx"> // FIXME: selectionRect() is in absolute, not painting coordinates.
</span><del>- paintInfo.context().fillRect(snappedIntRect(selectionRect()), selectionBackgroundColor(), style().colorSpace());
</del><ins>+ paintInfo.context().fillRect(snappedIntRect(selectionRect()), selectionBackgroundColor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (hasLayer() && layer()->canResize())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx"> LayoutRect gapRect = rootBlock.logicalRectToPhysicalRect(rootBlockPhysicalPosition, logicalRect);
</span><span class="cx"> if (isPreviousBoxSelected && gapRect.width() > 0 && gapRect.height() > 0) {
</span><span class="cx"> if (paintInfo && box->parent()->renderer().style().visibility() == VISIBLE)
</span><del>- paintInfo->context().fillRect(gapRect, box->parent()->renderer().selectionBackgroundColor(), box->parent()->renderer().style().colorSpace());
</del><ins>+ paintInfo->context().fillRect(gapRect, box->parent()->renderer().selectionBackgroundColor());
</ins><span class="cx"> // VisibleSelection may be non-contiguous, see comment above.
</span><span class="cx"> result.uniteCenter(gapRect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> if (snappedRect.isEmpty())
</span><span class="cx"> return;
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><del>- context.setStrokeColor(Color(0, 255, 0), ColorSpaceDeviceRGB);
- context.setFillColor(Color::transparent, ColorSpaceDeviceRGB);
</del><ins>+ context.setStrokeColor(Color(0, 255, 0));
+ context.setFillColor(Color::transparent);
</ins><span class="cx"> context.drawRect(snappedRect);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -39,27 +39,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-TextPaintStyle::TextPaintStyle(ColorSpace colorSpace)
- : colorSpace(colorSpace)
- , strokeWidth(0)
-#if ENABLE(LETTERPRESS)
- , useLetterpressEffect(false)
-#endif
-{
-}
-
-TextPaintStyle::TextPaintStyle(Color color, ColorSpace colorSpace)
- : colorSpace(colorSpace)
- , fillColor(color)
</del><ins>+TextPaintStyle::TextPaintStyle(const Color& color)
+ : fillColor(color)
</ins><span class="cx"> , strokeColor(color)
</span><del>- , strokeWidth(0)
-#if ENABLE(LETTERPRESS)
- , useLetterpressEffect(false)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Color adjustColorForVisibilityOnBackground(Color textColor, Color backgroundColor)
</del><ins>+static Color adjustColorForVisibilityOnBackground(const Color& textColor, const Color& backgroundColor)
</ins><span class="cx"> {
</span><span class="cx"> int d = differenceSquared(textColor, backgroundColor);
</span><span class="cx"> // Semi-arbitrarily chose 65025 (255^2) value here after a few tests.
</span><span class="lines">@@ -76,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> TextPaintStyle computeTextPaintStyle(const Frame& frame, const RenderStyle& lineStyle, const PaintInfo& paintInfo)
</span><span class="cx"> {
</span><del>- TextPaintStyle paintStyle(lineStyle.colorSpace());
</del><ins>+ TextPaintStyle paintStyle;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(LETTERPRESS)
</span><span class="cx"> paintStyle.useLetterpressEffect = lineStyle.textDecorationsInEffect() & TextDecorationLetterpress;
</span><span class="lines">@@ -198,12 +184,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color fillColor = fillColorType == UseEmphasisMarkColor ? paintStyle.emphasisMarkColor : paintStyle.fillColor;
</span><del>- if (mode & TextModeFill && (fillColor != context.fillColor() || paintStyle.colorSpace != context.fillColorSpace()))
- context.setFillColor(fillColor, paintStyle.colorSpace);
</del><ins>+ if (mode & TextModeFill && (fillColor != context.fillColor()))
+ context.setFillColor(fillColor);
</ins><span class="cx">
</span><span class="cx"> if (mode & TextModeStroke) {
</span><span class="cx"> if (paintStyle.strokeColor != context.strokeColor())
</span><del>- context.setStrokeColor(paintStyle.strokeColor, paintStyle.colorSpace);
</del><ins>+ context.setStrokeColor(paintStyle.strokeColor);
</ins><span class="cx"> if (paintStyle.strokeWidth != context.strokeThickness())
</span><span class="cx"> context.setStrokeThickness(paintStyle.strokeWidth);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -39,16 +39,15 @@
</span><span class="cx"> struct PaintInfo;
</span><span class="cx">
</span><span class="cx"> struct TextPaintStyle {
</span><del>- TextPaintStyle(ColorSpace);
- TextPaintStyle(Color, ColorSpace);
</del><ins>+ TextPaintStyle() { }
+ TextPaintStyle(const Color&);
</ins><span class="cx">
</span><del>- ColorSpace colorSpace;
</del><span class="cx"> Color fillColor;
</span><span class="cx"> Color strokeColor;
</span><span class="cx"> Color emphasisMarkColor;
</span><del>- float strokeWidth;
</del><ins>+ float strokeWidth { 0 };
</ins><span class="cx"> #if ENABLE(LETTERPRESS)
</span><del>- bool useLetterpressEffect;
</del><ins>+ bool useLetterpressEffect { false };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_avoidDrawingShadow)
</span><del>- context.setShadow(shadowOffset, shadowRadius, shadowColor, context.fillColorSpace());
</del><ins>+ context.setShadow(shadowOffset, shadowRadius, shadowColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ShadowApplier::~ShadowApplier()
</span><span class="lines">@@ -118,11 +118,10 @@
</span><span class="cx"> const ShadowData* shadow, bool stroked, bool horizontal)
</span><span class="cx"> {
</span><span class="cx"> Color fillColor = context.fillColor();
</span><del>- ColorSpace fillColorSpace = context.fillColorSpace();
</del><span class="cx"> bool opaque = !fillColor.hasAlpha();
</span><span class="cx"> bool lastShadowIterationShouldDrawText = !stroked && opaque;
</span><span class="cx"> if (!opaque)
</span><del>- context.setFillColor(Color::black, fillColorSpace);
</del><ins>+ context.setFillColor(Color::black);
</ins><span class="cx">
</span><span class="cx"> do {
</span><span class="cx"> ShadowApplier shadowApplier(context, shadow, boxRect, lastShadowIterationShouldDrawText, opaque, horizontal ? Horizontal : Vertical);
</span><span class="lines">@@ -133,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> IntSize extraOffset = roundedIntSize(shadowApplier.extraOffset());
</span><span class="cx"> if (!shadow && !opaque)
</span><del>- context.setFillColor(fillColor, fillColorSpace);
</del><ins>+ context.setFillColor(fillColor);
</ins><span class="cx">
</span><span class="cx"> if (startOffset <= endOffset)
</span><span class="cx"> drawTextOrEmphasisMarks(context, font, textRun, emphasisMark, emphasisMarkOffset, textOrigin + extraOffset, startOffset, endOffset);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> info.context().setStrokeThickness(1.0f);
</span><span class="cx"> info.context().setStrokeStyle(SolidStroke);
</span><del>- info.context().setStrokeColor(Color(0, 0, 255), ColorSpaceSRGB);
</del><ins>+ info.context().setStrokeColor(Color(0, 0, 255));
</ins><span class="cx">
</span><span class="cx"> info.context().drawLine(adjustedPaintOffset, IntPoint(adjustedPaintOffset.x() + pixelSnappedOffsetWidth(), adjustedPaintOffset.y()));
</span><span class="cx"> info.context().drawLine(IntPoint(adjustedPaintOffset.x() + pixelSnappedOffsetWidth(), adjustedPaintOffset.y()), IntPoint(adjustedPaintOffset.x() + pixelSnappedOffsetWidth(), adjustedPaintOffset.y() + pixelSnappedOffsetHeight()));
</span><span class="lines">@@ -113,13 +113,13 @@
</span><span class="cx">
</span><span class="cx"> int topStart = paddingTop();
</span><span class="cx">
</span><del>- info.context().setStrokeColor(Color(0, 255, 0), ColorSpaceSRGB);
</del><ins>+ info.context().setStrokeColor(Color(0, 255, 0));
</ins><span class="cx">
</span><span class="cx"> info.context().drawLine(IntPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + topStart), IntPoint(adjustedPaintOffset.x() + pixelSnappedOffsetWidth(), adjustedPaintOffset.y() + topStart));
</span><span class="cx">
</span><span class="cx"> int baseline = roundToInt(baselinePosition(AlphabeticBaseline, true, HorizontalLine));
</span><span class="cx">
</span><del>- info.context().setStrokeColor(Color(255, 0, 0), ColorSpaceSRGB);
</del><ins>+ info.context().setStrokeColor(Color(255, 0, 0));
</ins><span class="cx">
</span><span class="cx"> info.context().drawLine(IntPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + baseline), IntPoint(adjustedPaintOffset.x() + pixelSnappedOffsetWidth(), adjustedPaintOffset.y() + baseline));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFractioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> info.context().setStrokeThickness(m_lineThickness);
</span><span class="cx"> info.context().setStrokeStyle(SolidStroke);
</span><del>- info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor), ColorSpaceSRGB);
</del><ins>+ info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> info.context().drawLine(adjustedPaintOffset, roundedIntPoint(LayoutPoint(adjustedPaintOffset.x() + denominatorWrapper->offsetWidth(), adjustedPaintOffset.y())));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLMenclosecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> GraphicsContextStateSaver stateSaver(info.context());
</span><span class="cx"> info.context().setStrokeThickness(1);
</span><span class="cx"> info.context().setStrokeStyle(SolidStroke);
</span><del>- info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</del><ins>+ info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> // TODO add support for notation value updiagonalarrow https://bugs.webkit.org/show_bug.cgi?id=127466
</span><span class="cx"> for (size_t i = 0; i < notationalValueSize; i++) {
</span><span class="cx"> if (notationValues[i] == "updiagonalstrike")
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> else if (notationValues[i] == "horizontalstrike")
</span><span class="cx"> info.context().drawLine(IntPoint(left, top + halfboxHeight), IntPoint(left + boxWidth, top + halfboxHeight));
</span><span class="cx"> else if (notationValues[i] == "circle") {
</span><del>- info.context().setFillColor(Color::transparent, ColorSpaceDeviceRGB);
</del><ins>+ info.context().setFillColor(Color::transparent);
</ins><span class="cx"> info.context().drawEllipse(rect);
</span><span class="cx"> } else if (notationValues[i] == "longdiv")
</span><span class="cx"> isDefaultLongDiv = true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1889,7 +1889,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(info.context());
</span><del>- info.context().setFillColor(style().visitedDependentColor(CSSPropertyColor), style().colorSpace());
</del><ins>+ info.context().setFillColor(style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx">
</span><span class="cx"> if (m_stretchyData.mode() == DrawSizeVariant) {
</span><span class="cx"> ASSERT(m_stretchyData.variant().glyph);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRadicalOperatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRadicalOperator.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRadicalOperator.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRadicalOperator.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> info.context().setStrokeThickness(gRadicalLineThicknessEms * style().fontSize());
</span><span class="cx"> info.context().setStrokeStyle(SolidStroke);
</span><del>- info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</del><ins>+ info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx"> info.context().setLineJoin(MiterJoin);
</span><span class="cx"> info.context().setMiterLimit(style().fontSize());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx">
</span><span class="cx"> info.context().setStrokeThickness(m_ruleThickness);
</span><span class="cx"> info.context().setStrokeStyle(SolidStroke);
</span><del>- info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</del><ins>+ info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor));
</ins><span class="cx">
</span><span class="cx"> // The preferred width of the radical is sometimes incorrect, so we draw a slightly longer line to ensure it touches the radical symbol (https://bugs.webkit.org/show_bug.cgi?id=130326).
</span><span class="cx"> LayoutUnit sizeError = radical->trailingSpaceError();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> if (imageBuffer) {
</span><span class="cx"> GraphicsContext& graphicsContext = imageBuffer->context();
</span><span class="cx"> if (image)
</span><del>- graphicsContext.drawImage(*image, ColorSpaceDeviceRGB, IntRect(IntPoint(), imageRect.size()));
</del><ins>+ graphicsContext.drawImage(*image, IntRect(IntPoint(), imageRect.size()));
</ins><span class="cx">
</span><span class="cx"> RefPtr<Uint8ClampedArray> pixelArray = imageBuffer->getUnmultipliedImageData(IntRect(IntPoint(), imageRect.size()));
</span><span class="cx"> unsigned pixelArrayLength = pixelArray->length();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleNinePieceImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/NinePieceImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/NinePieceImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/style/NinePieceImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -209,20 +209,18 @@
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ColorSpace colorSpace = style.colorSpace();
-
</del><span class="cx"> for (ImagePiece piece = MinPiece; piece < MaxPiece; ++piece) {
</span><span class="cx"> if ((piece == MiddlePiece && !fill()) || isEmptyPieceRect(piece, destinationRects, sourceRects))
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (isCornerPiece(piece)) {
</span><del>- graphicsContext.drawImage(*image, colorSpace, destinationRects[piece], sourceRects[piece], op);
</del><ins>+ graphicsContext.drawImage(*image, destinationRects[piece], sourceRects[piece], op);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Image::TileRule hRule = isHorizontalPiece(piece) ? static_cast<Image::TileRule>(horizontalRule()) : Image::StretchTile;
</span><span class="cx"> Image::TileRule vRule = isVerticalPiece(piece) ? static_cast<Image::TileRule>(verticalRule()) : Image::StretchTile;
</span><del>- graphicsContext.drawTiledImage(*image, colorSpace, destinationRects[piece], sourceRects[piece], tileScales[piece], hRule, vRule, op);
</del><ins>+ graphicsContext.drawTiledImage(*image, destinationRects[piece], sourceRects[piece], tileScales[piece], hRule, vRule, op);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -902,7 +902,6 @@
</span><span class="cx"> void getTextShadowBlockDirectionExtent(LayoutUnit& logicalTop, LayoutUnit& logicalBottom) const { getShadowBlockDirectionExtent(textShadow(), logicalTop, logicalBottom); }
</span><span class="cx">
</span><span class="cx"> float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; }
</span><del>- static ColorSpace colorSpace() { return ColorSpaceSRGB; } // FIXME: Remove after adding color space handling into the Color class.
</del><span class="cx"> float opacity() const { return rareNonInheritedData->opacity; }
</span><span class="cx"> ControlPart appearance() const { return static_cast<ControlPart>(rareNonInheritedData->m_appearance); }
</span><span class="cx"> AspectRatioType aspectRatioType() const { return static_cast<AspectRatioType>(rareNonInheritedData->m_aspectRatioType); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> imageElement().preserveAspectRatio().transformRect(destRect, srcRect);
</span><span class="cx">
</span><del>- paintInfo.context().drawImage(*image, ColorSpaceDeviceRGB, destRect, srcRect);
</del><ins>+ paintInfo.context().drawImage(*image, destRect, srcRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSVGImage::invalidateBufferedForeground()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> else if (Pattern* pattern = context.strokePattern())
</span><span class="cx"> context.setFillPattern(*pattern);
</span><span class="cx"> else
</span><del>- context.setFillColor(context.strokeColor(), context.strokeColorSpace());
</del><ins>+ context.setFillColor(context.strokeColor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSVGPath::strokeShape(GraphicsContext& context) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> context->concatCTM(filterData->shearFreeAbsoluteTransform.inverse());
</span><span class="cx">
</span><span class="cx"> context->scale(FloatSize(1 / filterData->filter->filterResolution().width(), 1 / filterData->filter->filterResolution().height()));
</span><del>- context->drawImageBuffer(*resultImage, renderer.style().colorSpace(), lastEffect->absolutePaintRect());
</del><ins>+ context->drawImageBuffer(*resultImage, lastEffect->absolutePaintRect());
</ins><span class="cx"> context->scale(filterData->filter->filterResolution());
</span><span class="cx">
</span><span class="cx"> context->concatCTM(filterData->shearFreeAbsoluteTransform);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceSolidColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> ASSERT(resourceMode != ApplyToDefaultMode);
</span><span class="cx">
</span><span class="cx"> const SVGRenderStyle& svgStyle = style.svgStyle();
</span><del>- ColorSpace colorSpace = style.colorSpace();
</del><span class="cx">
</span><span class="cx"> bool isRenderingMask = renderer.view().frameView().paintBehavior() & PaintBehaviorRenderingSVGMask;
</span><span class="cx">
</span><span class="lines">@@ -51,7 +50,7 @@
</span><span class="cx"> context->setAlpha(svgStyle.fillOpacity());
</span><span class="cx"> else
</span><span class="cx"> context->setAlpha(1);
</span><del>- context->setFillColor(m_color, colorSpace);
</del><ins>+ context->setFillColor(m_color);
</ins><span class="cx"> if (!isRenderingMask)
</span><span class="cx"> context->setFillRule(svgStyle.fillRule());
</span><span class="cx">
</span><span class="lines">@@ -61,7 +60,7 @@
</span><span class="cx"> // When rendering the mask for a RenderSVGResourceClipper, the stroke code path is never hit.
</span><span class="cx"> ASSERT(!isRenderingMask);
</span><span class="cx"> context->setAlpha(svgStyle.strokeOpacity());
</span><del>- context->setStrokeColor(m_color, colorSpace);
</del><ins>+ context->setStrokeColor(m_color);
</ins><span class="cx">
</span><span class="cx"> SVGRenderSupport::applyStrokeStyleToContext(context, style, renderer);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -225,8 +225,8 @@
</span><span class="cx"> if (!fragmentTransform.isIdentity())
</span><span class="cx"> paintInfo.context().concatCTM(fragmentTransform);
</span><span class="cx">
</span><del>- paintInfo.context().setFillColor(backgroundColor, style.colorSpace());
- paintInfo.context().fillRect(selectionRectForTextFragment(fragment, fragmentStartPosition, fragmentEndPosition, &style), backgroundColor, style.colorSpace());
</del><ins>+ paintInfo.context().setFillColor(backgroundColor);
+ paintInfo.context().fillRect(selectionRectForTextFragment(fragment, fragmentStartPosition, fragmentEndPosition, &style), backgroundColor);
</ins><span class="cx">
</span><span class="cx"> m_paintingResourceMode = ApplyToDefaultMode;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shadow) {
</span><del>- m_paintInfo->context().setShadow(IntSize(roundToInt(shadow->x()), roundToInt(shadow->y())), shadow->radius(), shadow->color(), style.colorSpace());
</del><ins>+ m_paintInfo->context().setShadow(IntSize(roundToInt(shadow->x()), roundToInt(shadow->y())), shadow->radius(), shadow->color());
</ins><span class="cx"> m_paintInfo->context().beginTransparencyLayer(1);
</span><span class="cx"> m_renderingFlags |= EndShadowLayer;
</span><span class="cx"> }
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_paintInfo->context().drawImageBuffer(*imageBuffer, ColorSpaceDeviceRGB, boundingBox);
</del><ins>+ m_paintInfo->context().drawImageBuffer(*imageBuffer, boundingBox);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimatedColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimatedColor.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimatedColor.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/svg/SVGAnimatedColor.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> float alpha = animatedColor.alpha();
</span><span class="cx"> m_animationElement->animateAdditiveNumber(percentage, repeatCount, fromColor.alpha(), toColor.alpha(), toAtEndOfDurationColor.alpha(), alpha);
</span><span class="cx">
</span><del>- animatedColor = { { roundAndClampColorChannel(red), roundAndClampColorChannel(green), roundAndClampColorChannel(blue), roundAndClampColorChannel(alpha) }, ColorSpaceSRGB };
</del><ins>+ animatedColor = { roundAndClampColorChannel(red), roundAndClampColorChannel(green), roundAndClampColorChannel(blue), roundAndClampColorChannel(alpha) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float SVGAnimatedColorAnimator::calculateDistance(const String& fromString, const String& toString)
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGImage::drawForContainer(GraphicsContext& context, const FloatSize containerSize, float zoom, const FloatRect& dstRect,
</span><del>- const FloatRect& srcRect, ColorSpace colorSpace, CompositeOperator compositeOp, BlendMode blendMode)
</del><ins>+ const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> adjustedSrcSize.scale(roundedContainerSize.width() / containerSize.width(), roundedContainerSize.height() / containerSize.height());
</span><span class="cx"> scaledSrc.setSize(adjustedSrcSize);
</span><span class="cx">
</span><del>- draw(context, dstRect, scaledSrc, colorSpace, compositeOp, blendMode, ImageOrientationDescription());
</del><ins>+ draw(context, dstRect, scaledSrc, compositeOp, blendMode, ImageOrientationDescription());
</ins><span class="cx">
</span><span class="cx"> setImageObserver(observer);
</span><span class="cx"> }
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> if (!buffer) // failed to allocate image
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- draw(buffer->context(), rect(), rect(), ColorSpaceDeviceRGB, CompositeSourceOver, BlendModeNormal, ImageOrientationDescription());
</del><ins>+ draw(buffer->context(), rect(), rect(), CompositeSourceOver, BlendModeNormal, ImageOrientationDescription());
</ins><span class="cx">
</span><span class="cx"> // FIXME: WK(Bug 113657): We should use DontCopyBackingStore here.
</span><span class="cx"> return buffer->copyImage(CopyBackingStore)->nativeImageForCurrentFrame();
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void SVGImage::drawPatternForContainer(GraphicsContext& context, const FloatSize& containerSize, float zoom, const FloatRect& srcRect,
</span><del>- const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</del><ins>+ const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> FloatRect zoomedContainerRect = FloatRect(FloatPoint(), containerSize);
</span><span class="cx"> zoomedContainerRect.scale(zoom);
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> std::unique_ptr<ImageBuffer> buffer = ImageBuffer::createCompatibleBuffer(expandedIntSize(imageBufferSize.size()), 1, ColorSpaceSRGB, context, true);
</span><span class="cx"> if (!buffer) // Failed to allocate buffer.
</span><span class="cx"> return;
</span><del>- drawForContainer(buffer->context(), containerSize, zoom, imageBufferSize, zoomedContainerRect, ColorSpaceDeviceRGB, CompositeSourceOver, BlendModeNormal);
</del><ins>+ drawForContainer(buffer->context(), containerSize, zoom, imageBufferSize, zoomedContainerRect, CompositeSourceOver, BlendModeNormal);
</ins><span class="cx"> if (context.drawLuminanceMask())
</span><span class="cx"> buffer->convertToLuminanceMask();
</span><span class="cx">
</span><span class="lines">@@ -219,10 +219,10 @@
</span><span class="cx"> unscaledPatternTransform.scale(1 / imageBufferScale.width(), 1 / imageBufferScale.height());
</span><span class="cx">
</span><span class="cx"> context.setDrawLuminanceMask(false);
</span><del>- image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, spacing, colorSpace, compositeOp, dstRect, blendMode);
</del><ins>+ image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, spacing, compositeOp, dstRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</del><ins>+void SVGImage::draw(GraphicsContext& context, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -93,9 +93,9 @@
</span><span class="cx"> virtual void dump(TextStream&) const override;
</span><span class="cx">
</span><span class="cx"> SVGImage(ImageObserver&, const URL&);
</span><del>- virtual void draw(GraphicsContext&, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
- void drawForContainer(GraphicsContext&, const FloatSize, float, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode);
- void drawPatternForContainer(GraphicsContext&, const FloatSize& containerSize, float zoom, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, ColorSpace,
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect& fromRect, const FloatRect& toRect, CompositeOperator, BlendMode, ImageOrientationDescription) override;
+ void drawForContainer(GraphicsContext&, const FloatSize, float, const FloatRect&, const FloatRect&, CompositeOperator, BlendMode);
+ void drawPatternForContainer(GraphicsContext&, const FloatSize& containerSize, float zoom, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing,
</ins><span class="cx"> CompositeOperator, const FloatRect&, BlendMode);
</span><span class="cx">
</span><span class="cx"> SVGSVGElement* rootElement() const;
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageForContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -35,15 +35,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGImageForContainer::draw(GraphicsContext& context, const FloatRect& dstRect,
</span><del>- const FloatRect& srcRect, ColorSpace colorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</del><ins>+ const FloatRect& srcRect, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</ins><span class="cx"> {
</span><del>- m_image->drawForContainer(context, m_containerSize, m_zoom, dstRect, srcRect, colorSpace, compositeOp, blendMode);
</del><ins>+ m_image->drawForContainer(context, m_containerSize, m_zoom, dstRect, srcRect, compositeOp, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGImageForContainer::drawPattern(GraphicsContext& context, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, const FloatSize& spacing, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><del>- m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, patternTransform, phase, spacing, colorSpace, compositeOp, dstRect, blendMode);
</del><ins>+ m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, patternTransform, phase, spacing, compositeOp, dstRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassNativeImagePtr SVGImageForContainer::nativeImageForCurrentFrame()
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImageForContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void draw(GraphicsContext&, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</del><ins>+ virtual void draw(GraphicsContext&, const FloatRect&, const FloatRect&, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</ins><span class="cx">
</span><del>- virtual void drawPattern(GraphicsContext&, const FloatRect&, const AffineTransform&, const FloatPoint&, const FloatSize&, ColorSpace, CompositeOperator, const FloatRect&, BlendMode) override;
</del><ins>+ virtual void drawPattern(GraphicsContext&, const FloatRect&, const AffineTransform&, const FloatPoint&, const FloatSize&, CompositeOperator, const FloatRect&, BlendMode) override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Implement this to be less conservative.
</span><span class="cx"> virtual bool currentFrameKnownToBeOpaque() override { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsfiltersSVGFEImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- resultImage->context().drawImage(*m_image, ColorSpaceDeviceRGB, destRect, srcRect);
</del><ins>+ resultImage->context().drawImage(*m_image, destRect, srcRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FEImage::dump()
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockPageOverlayClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockPageOverlayClient.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockPageOverlayClient.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebCore/testing/MockPageOverlayClient.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -87,10 +87,10 @@
</span><span class="cx"> FloatRect insetRect = overlay.bounds();
</span><span class="cx">
</span><span class="cx"> if (overlay.overlayType() == PageOverlay::OverlayType::Document) {
</span><del>- context.setStrokeColor(Color(0, 255, 0), ColorSpaceDeviceRGB);
</del><ins>+ context.setStrokeColor(Color(0, 255, 0));
</ins><span class="cx"> insetRect.inflate(-50);
</span><span class="cx"> } else {
</span><del>- context.setStrokeColor(Color(0, 0, 255), ColorSpaceDeviceRGB);
</del><ins>+ context.setStrokeColor(Color(0, 0, 255));
</ins><span class="cx"> insetRect.inflate(-20);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/ios/ChangeLog 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-11-07 Simon Fraser <simon.fraser@apple.com>
+
+ Remove ColorSpace argument to all the drawing calls
+ https://bugs.webkit.org/show_bug.cgi?id=150967
+
+ Reviewed by Darin Adler.
+
+ Since the -webkit-color-correction CSS property was removed in r188202, and ColorSpaceDeviceRGB
+ and ColorSpaceSRGB are functionally equivalent, we can remove all the ColorSpace arguments passed
+ to drawing functions, and remove RenderStyle::colorSpace(), which was hardcoded to return ColorSpaceSRGB.
+
+ * WebView/WebPDFViewIOS.mm:
+ (-[WebPDFView drawPage:]):
+ * WebView/WebPlainWhiteView.mm:
+
</ins><span class="cx"> 2015-11-02 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the iOS build after r191904.
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebViewWebPDFViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> CGContextSaveGState(context);
</span><span class="cx"> CGFloat height = WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_FLIPPED_SHADOWS) ? 2.0f : -2.0f;
</span><span class="cx"> CGContextSetShadowWithColor(context, CGSizeMake(0.0f, height), 3.0f, [[self class] shadowColor]);
</span><del>- CGContextSetFillColorWithColor(context, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(context, cachedCGColor(Color::white));
</ins><span class="cx"> CGContextFillRect(context, pageRect);
</span><span class="cx"> CGContextRestoreGState(context);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebViewWebPlainWhiteViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> - (void)drawRect:(NSRect)rect
</span><span class="cx"> {
</span><span class="cx"> CGContextRef context = WKGetCurrentGraphicsContext();
</span><del>- CGContextSetFillColorWithColor(context, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(context, cachedCGColor(Color::white));
</ins><span class="cx"> WKRectFill(context, [self bounds]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-11-07 Simon Fraser <simon.fraser@apple.com>
+
+ Remove ColorSpace argument to all the drawing calls
+ https://bugs.webkit.org/show_bug.cgi?id=150967
+
+ Reviewed by Darin Adler.
+
+ Since the -webkit-color-correction CSS property was removed in r188202, and ColorSpaceDeviceRGB
+ and ColorSpaceSRGB are functionally equivalent, we can remove all the ColorSpace arguments passed
+ to drawing functions, and remove RenderStyle::colorSpace(), which was hardcoded to return ColorSpaceSRGB.
+
+ * Misc/WebKitNSStringExtras.mm:
+ (-[NSString _web_drawAtPoint:font:textColor:allowingFontSmoothing:]):
+ * WebInspector/WebNodeHighlightView.mm:
+ (-[WebNodeHighlightView _layoutForNodeHighlight:parent:]):
+ (-[WebNodeHighlightView _layoutForRectsHighlight:parent:]):
+ * WebView/WebFrame.mm:
+ (-[WebFrame _bodyBackgroundColor]):
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView drawRect:]):
+ * WebView/WebIndicateLayer.mm:
+
</ins><span class="cx"> 2015-11-05 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
</span><span class="cx">
</span><span class="cx"> Add runtime and compile time flags for enabling Web Animations API and model.
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitNSStringExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> CGFloat blue;
</span><span class="cx"> CGFloat alpha;
</span><span class="cx"> [[textColor colorUsingColorSpaceName:NSDeviceRGBColorSpace] getRed:&red green:&green blue:&blue alpha:&alpha];
</span><del>- graphicsContext.setFillColor(makeRGBA(red * 255, green * 255, blue * 255, alpha * 255), ColorSpaceDeviceRGB);
</del><ins>+ graphicsContext.setFillColor(makeRGBA(red * 255, green * 255, blue * 255, alpha * 255));
</ins><span class="cx">
</span><span class="cx"> webCoreFont.drawText(graphicsContext, run, FloatPoint(point.x, (flipped ? point.y : (-1 * point.y))));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebInspectorWebNodeHighlightViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -280,10 +280,10 @@
</span><span class="cx"> FloatQuad paddingQuad = highlight->quads[2];
</span><span class="cx"> FloatQuad contentQuad = highlight->quads[3];
</span><span class="cx">
</span><del>- marginLayer.fillColor = cachedCGColor(highlight->marginColor, ColorSpaceDeviceRGB);
- borderLayer.fillColor = cachedCGColor(highlight->borderColor, ColorSpaceDeviceRGB);
- paddingLayer.fillColor = cachedCGColor(highlight->paddingColor, ColorSpaceDeviceRGB);
- contentLayer.fillColor = cachedCGColor(highlight->contentColor, ColorSpaceDeviceRGB);
</del><ins>+ marginLayer.fillColor = cachedCGColor(highlight->marginColor);
+ borderLayer.fillColor = cachedCGColor(highlight->borderColor);
+ paddingLayer.fillColor = cachedCGColor(highlight->paddingColor);
+ contentLayer.fillColor = cachedCGColor(highlight->contentColor);
</ins><span class="cx">
</span><span class="cx"> layerPathWithHole(marginLayer, marginQuad, borderQuad);
</span><span class="cx"> layerPathWithHole(borderLayer, borderQuad, paddingQuad);
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx">
</span><span class="cx"> [self _attach:parentLayer numLayers:numLayers];
</span><span class="cx">
</span><del>- CGColorRef contentColor = cachedCGColor(highlight->contentColor, ColorSpaceDeviceRGB);
</del><ins>+ CGColorRef contentColor = cachedCGColor(highlight->contentColor);
</ins><span class="cx"> for (NSUInteger i = 0; i < numLayers; ++i) {
</span><span class="cx"> CAShapeLayer *layer = [_layers objectAtIndex:i];
</span><span class="cx"> layer.fillColor = contentColor;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> return nsColor(color);
</span><span class="cx"> #else
</span><del>- return cachedCGColor(color, ColorSpaceDeviceRGB);
</del><ins>+ return cachedCGColor(color);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> NSRectFill(rect);
</span><span class="cx"> #else
</span><span class="cx"> CGContextRef cgContext = WKGetCurrentGraphicsContext();
</span><del>- CGContextSetFillColorWithColor(cgContext, cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(cgContext, cachedCGColor(Color::white));
</ins><span class="cx"> WKRectFill(cgContext, rect);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx"> NSRectFill(rect);
</span><span class="cx"> #else
</span><span class="cx"> CGContextRef cgContext = WKGetCurrentGraphicsContext();
</span><del>- CGContextSetFillColorWithColor(cgContext, cachedCGColor(Color::cyan, ColorSpaceDeviceRGB));
</del><ins>+ CGContextSetFillColorWithColor(cgContext, cachedCGColor(Color::cyan));
</ins><span class="cx"> WKRectFill(cgContext, rect);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebIndicateLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebIndicateLayer.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebIndicateLayer.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/mac/WebView/WebIndicateLayer.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> // Blue highlight color.
</span><span class="cx"> static Color highlightColor(111.0f / 255.0f, 168.0f / 255.0f, 220.0f / 255.0f, 0.66f);
</span><del>- self.backgroundColor = cachedCGColor(highlightColor, ColorSpaceDeviceRGB);
</del><ins>+ self.backgroundColor = cachedCGColor(highlightColor);
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> _private->backgroundColor = [[NSColor colorWithDeviceWhite:1 alpha:1] retain];
</span><span class="cx"> #else
</span><del>- _private->backgroundColor = CGColorRetain(cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</del><ins>+ _private->backgroundColor = CGColorRetain(cachedCGColor(Color::white));
</ins><span class="cx"> #endif
</span><span class="cx"> _private->includesFlattenedCompositingLayersWhenDrawingToBitmap = YES;
</span><span class="cx">
</span><span class="lines">@@ -1187,7 +1187,7 @@
</span><span class="cx"> _private->preferences = [preferences retain];
</span><span class="cx"> _private->mainFrameDocumentReady = NO;
</span><span class="cx"> _private->drawsBackground = YES;
</span><del>- _private->backgroundColor = CGColorRetain(cachedCGColor(Color::white, ColorSpaceDeviceRGB));
</del><ins>+ _private->backgroundColor = CGColorRetain(cachedCGColor(Color::white));
</ins><span class="cx">
</span><span class="cx"> WebFrameView *frameView = nil;
</span><span class="cx"> frameView = [[WebFrameView alloc] initWithFrame: CGRectMake(0,0,frame.size.width,frame.size.height)];
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2015-11-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Remove ColorSpace argument to all the drawing calls
+ https://bugs.webkit.org/show_bug.cgi?id=150967
+
+ Reviewed by Darin Adler.
+
+ * Shared/API/c/cg/WKImageCG.cpp:
+ (WKImageCreateFromCGImage):
+ * Shared/ContextMenuContextData.cpp:
+ (WebKit::ContextMenuContextData::ContextMenuContextData):
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::encodeImage):
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::drawInContext):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _updateScrollViewBackground]):
+ * UIProcess/WKInspectorHighlightView.mm:
+ (-[WKInspectorHighlightView _layoutForNodeHighlight:offset:]):
+ (-[WKInspectorHighlightView _layoutForRectsHighlight:]):
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _updateTapHighlight]):
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::drawRect):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::createSelectionSnapshot):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::snapshotAtSize):
+ * WebProcess/WebPage/ios/FindControllerIOS.mm:
+ (WebKit::FindIndicatorOverlayClientIOS::drawRect):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+ * WebProcess/ios/WebVideoFullscreenManager.mm:
+ (WebKit::WebVideoFullscreenManager::didSetupFullscreen):
+
+2015-11-07 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Use ColorSpaceSRGB for image buffers everywhere
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150990
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccgWKImageCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -57,6 +57,6 @@
</span><span class="cx"> auto graphicsContext = webImage->bitmap()->createGraphicsContext();
</span><span class="cx"> FloatRect rect(FloatPoint(0, 0), imageSize);
</span><span class="cx"> graphicsContext->clearRect(rect);
</span><del>- graphicsContext->drawNativeImage(imageRef, imageSize, WebCore::ColorSpaceDeviceRGB, rect, rect);
</del><ins>+ graphicsContext->drawNativeImage(imageRef, imageSize, rect, rect);
</ins><span class="cx"> return toAPI(webImage.release().leakRef());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: figure out the rounding startegy for ShareableBitmap.
</span><span class="cx"> m_controlledImage = ShareableBitmap::createShareable(IntSize(image->size()), ShareableBitmap::SupportsAlpha);
</span><del>- m_controlledImage->createGraphicsContext()->drawImage(*image, ColorSpaceDeviceRGB, IntPoint());
</del><ins>+ m_controlledImage->createGraphicsContext()->drawImage(*image, IntPoint());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> static void encodeImage(ArgumentEncoder& encoder, Image& image)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(IntSize(image.size()), ShareableBitmap::SupportsAlpha);
</span><del>- bitmap->createGraphicsContext()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
</del><ins>+ bitmap->createGraphicsContext()->drawImage(image, IntPoint());
</ins><span class="cx">
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> bitmap->createHandle(handle);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> if (m_isOpaque)
</span><del>- context.fillRect(scaledLayerBounds, Color(255, 0, 0), ColorSpaceDeviceRGB);
</del><ins>+ context.fillRect(scaledLayerBounds, Color(255, 0, 0));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CGContextRef cgContext = context.platformContext();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx">
</span><span class="cx"> _scrollViewBackgroundColor = color;
</span><span class="cx">
</span><del>- auto uiBackgroundColor = adoptNS([[UIColor alloc] initWithCGColor:cachedCGColor(color, WebCore::ColorSpaceDeviceRGB)]);
</del><ins>+ auto uiBackgroundColor = adoptNS([[UIColor alloc] initWithCGColor:cachedCGColor(color)]);
</ins><span class="cx"> [_scrollView setBackgroundColor:uiBackgroundColor.get()];
</span><span class="cx">
</span><span class="cx"> // Update the indicator style based on the lightness/darkness of the background color.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWKInspectorHighlightViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/UIProcess/WKInspectorHighlightView.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -229,10 +229,10 @@
</span><span class="cx"> FloatQuad paddingQuad = highlight.quads[offset + 2];
</span><span class="cx"> FloatQuad contentQuad = highlight.quads[offset + 3];
</span><span class="cx">
</span><del>- marginLayer.fillColor = cachedCGColor(highlight.marginColor, ColorSpaceDeviceRGB);
- borderLayer.fillColor = cachedCGColor(highlight.borderColor, ColorSpaceDeviceRGB);
- paddingLayer.fillColor = cachedCGColor(highlight.paddingColor, ColorSpaceDeviceRGB);
- contentLayer.fillColor = cachedCGColor(highlight.contentColor, ColorSpaceDeviceRGB);
</del><ins>+ marginLayer.fillColor = cachedCGColor(highlight.marginColor);
+ borderLayer.fillColor = cachedCGColor(highlight.borderColor);
+ paddingLayer.fillColor = cachedCGColor(highlight.paddingColor);
+ contentLayer.fillColor = cachedCGColor(highlight.contentColor);
</ins><span class="cx">
</span><span class="cx"> layerPathWithHole(marginLayer, marginQuad, borderQuad);
</span><span class="cx"> layerPathWithHole(borderLayer, borderQuad, paddingQuad);
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx">
</span><span class="cx"> [self _createLayers:numLayers];
</span><span class="cx">
</span><del>- CGColorRef contentColor = cachedCGColor(highlight.contentColor, ColorSpaceDeviceRGB);
</del><ins>+ CGColorRef contentColor = cachedCGColor(highlight.contentColor);
</ins><span class="cx"> for (NSUInteger i = 0; i < numLayers; ++i) {
</span><span class="cx"> CAShapeLayer *layer = [_layers objectAtIndex:i];
</span><span class="cx"> layer.fillColor = contentColor;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscairoBackingStoreCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> if (color.hasAlpha())
</span><span class="cx"> graphicsContext.clearRect(srcRect);
</span><span class="cx"> if (color.alpha() > 0)
</span><del>- graphicsContext.fillRect(srcRect, color, ColorSpaceDeviceRGB);
</del><ins>+ graphicsContext.fillRect(srcRect, color);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> bitmap->paint(graphicsContext, deviceScaleFactor(), updateRect.location(), srcRect);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> [m_snapshotView layer].contents = snapshot->asLayerContents();
</span><span class="cx"> Color coreColor = snapshot->backgroundColor();
</span><span class="cx"> if (coreColor.isValid())
</span><del>- backgroundColor = adoptNS([[UIColor alloc] initWithCGColor:cachedCGColor(coreColor, ColorSpaceDeviceRGB)]);
</del><ins>+ backgroundColor = adoptNS([[UIColor alloc] initWithCGColor:cachedCGColor(coreColor)]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [m_snapshotView setBackgroundColor:backgroundColor.get()];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -789,7 +789,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> {
</span><del>- RetainPtr<UIColor> highlightUIKitColor = adoptNS([[UIColor alloc] initWithCGColor:cachedCGColor(_tapHighlightInformation.color, WebCore::ColorSpaceDeviceRGB)]);
</del><ins>+ RetainPtr<UIColor> highlightUIKitColor = adoptNS([[UIColor alloc] initWithCGColor:cachedCGColor(_tapHighlightInformation.color)]);
</ins><span class="cx"> [_highlightView setColor:highlightUIKitColor.get()];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -579,7 +579,7 @@
</span><span class="cx">
</span><span class="cx"> Color coreColor = snapshot->backgroundColor();
</span><span class="cx"> if (coreColor.isValid())
</span><del>- backgroundColor = cachedCGColor(coreColor, ColorSpaceDeviceRGB);
</del><ins>+ backgroundColor = cachedCGColor(coreColor);
</ins><span class="cx"> m_currentSwipeSnapshot = snapshot;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -469,13 +469,13 @@
</span><span class="cx"> Vector<IntRect> rects = rectsForTextMatchesInRect(borderInflatedDirtyRect);
</span><span class="cx">
</span><span class="cx"> // Draw the background.
</span><del>- graphicsContext.fillRect(dirtyRect, overlayBackgroundColor, ColorSpaceSRGB);
</del><ins>+ graphicsContext.fillRect(dirtyRect, overlayBackgroundColor);
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(graphicsContext);
</span><span class="cx">
</span><del>- graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, Color(0.0f, 0.0f, 0.0f, shadowColorAlpha), ColorSpaceSRGB);
- graphicsContext.setFillColor(Color::white, ColorSpaceSRGB);
</del><ins>+ graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, Color(0.0f, 0.0f, 0.0f, shadowColorAlpha));
+ graphicsContext.setFillColor(Color::white);
</ins><span class="cx">
</span><span class="cx"> // Draw white frames around the holes.
</span><span class="cx"> for (auto& rect : rects) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -848,7 +848,7 @@
</span><span class="cx"> auto graphicsContext = sharedSnapshot->createGraphicsContext();
</span><span class="cx"> float deviceScaleFactor = coreFrame()->page()->deviceScaleFactor();
</span><span class="cx"> graphicsContext->scale(FloatSize(deviceScaleFactor, deviceScaleFactor));
</span><del>- graphicsContext->drawImageBuffer(*snapshot, ColorSpaceDeviceRGB, FloatPoint());
</del><ins>+ graphicsContext->drawImageBuffer(*snapshot, FloatPoint());
</ins><span class="cx">
</span><span class="cx"> return sharedSnapshot.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -1780,7 +1780,7 @@
</span><span class="cx">
</span><span class="cx"> Color documentBackgroundColor = frameView->documentBackgroundColor();
</span><span class="cx"> Color backgroundColor = (coreFrame->settings().backgroundShouldExtendBeyondPage() && documentBackgroundColor.isValid()) ? documentBackgroundColor : frameView->baseBackgroundColor();
</span><del>- graphicsContext->fillRect(IntRect(IntPoint(), bitmapSize), backgroundColor, ColorSpaceDeviceRGB);
</del><ins>+ graphicsContext->fillRect(IntRect(IntPoint(), bitmapSize), backgroundColor);
</ins><span class="cx">
</span><span class="cx"> if (!(options & SnapshotOptionsExcludeDeviceScaleFactor)) {
</span><span class="cx"> double deviceScaleFactor = corePage()->deviceScaleFactor();
</span><span class="lines">@@ -1803,7 +1803,7 @@
</span><span class="cx">
</span><span class="cx"> if (options & SnapshotOptionsPaintSelectionRectangle) {
</span><span class="cx"> FloatRect selectionRectangle = m_mainFrame->coreFrame()->selection().selectionBounds();
</span><del>- graphicsContext->setStrokeColor(Color(0xFF, 0, 0), ColorSpaceDeviceRGB);
</del><ins>+ graphicsContext->setStrokeColor(Color(0xFF, 0, 0));
</ins><span class="cx"> graphicsContext->strokeRect(selectionRectangle, 1);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosFindControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/FindControllerIOS.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/FindControllerIOS.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/FindControllerIOS.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -79,11 +79,11 @@
</span><span class="cx"> Vector<FloatRect> textRectsInBoundingRectCoordinates = m_textIndicator->textRectsInBoundingRectCoordinates();
</span><span class="cx"> Vector<Path> paths = PathUtilities::pathsWithShrinkWrappedRects(textRectsInBoundingRectCoordinates, cornerRadius);
</span><span class="cx">
</span><del>- context.setFillColor(highlightColor(), ColorSpaceDeviceRGB);
</del><ins>+ context.setFillColor(highlightColor());
</ins><span class="cx"> for (const auto& path : paths)
</span><span class="cx"> context.fillPath(path);
</span><span class="cx">
</span><del>- context.drawImage(*indicatorImage, ColorSpaceDeviceRGB, overlay.bounds());
</del><ins>+ context.drawImage(*indicatorImage, overlay.bounds());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FindController::updateFindIndicator(Frame& selectedFrame, bool isShowingOverlay, bool shouldAnimate)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -2219,7 +2219,7 @@
</span><span class="cx"> FloatSize bitmapSize = scaledSize.width() < image->size().width() ? scaledSize : image->size();
</span><span class="cx"> if (RefPtr<ShareableBitmap> sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), ShareableBitmap::SupportsAlpha)) {
</span><span class="cx"> auto graphicsContext = sharedBitmap->createGraphicsContext();
</span><del>- graphicsContext->drawImage(*image, ColorSpaceDeviceRGB, FloatRect(0, 0, bitmapSize.width(), bitmapSize.height()));
</del><ins>+ graphicsContext->drawImage(*image, FloatRect(0, 0, bitmapSize.width(), bitmapSize.height()));
</ins><span class="cx"> info.image = sharedBitmap;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessiosWebVideoFullscreenManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (192139 => 192140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-11-08 06:57:00 UTC (rev 192139)
+++ trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-11-08 07:17:53 UTC (rev 192140)
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx"> [CATransaction setDisableActions:YES];
</span><span class="cx">
</span><span class="cx"> [videoLayer setPosition:CGPointMake(0, 0)];
</span><del>- [videoLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent, WebCore::ColorSpaceDeviceRGB)];
</del><ins>+ [videoLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent)];
</ins><span class="cx">
</span><span class="cx"> // Set a scale factor here to make convertRect:toLayer:nil take scale factor into account. <rdar://problem/18316542>.
</span><span class="cx"> // This scale factor is inverted in the hosting process.
</span></span></pre>
</div>
</div>
</body>
</html>