Unfork GraphicsContext::drawNativeImage for iOS
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 20:59:14 +0000 (20:59 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 20:59:14 +0000 (20:59 +0000)
commite9d03674fe091536e54fb17c713b23930b10e6e7
tree48fa181e4646eecd9e6001b7b0c8558304e5d402
parent2036f944f626dc7b940923f0c5b5eb295627ff9e
Unfork GraphicsContext::drawNativeImage for iOS
https://bugs.webkit.org/show_bug.cgi?id=126824

Reviewed by Dean Jackson.

GraphicsContext::drawNativeImage had a different signature for iOS,
which required #ifdefs at all the call sites. Unfork by passing the "scale"
parameter everywhere (it's only used on iOS).

Source/WebCore:

* WebCore.exp.in:
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawImage):
* platform/graphics/GraphicsContext.h:
* platform/graphics/cg/BitmapImageCG.cpp:
(WebCore::BitmapImage::draw):
* platform/graphics/cg/GraphicsContext3DCG.cpp:
(WebCore::GraphicsContext3D::paintToCanvas):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::draw):
* platform/graphics/ios/IconIOS.mm:
(WebCore::Icon::paint):

Source/WebKit2:

* Shared/API/c/cg/WKImageCG.cpp:
(WKImageCreateFromCGImage):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161779 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/WebCore.exp.in
Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
Source/WebCore/platform/graphics/GraphicsContext.h
Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
Source/WebCore/platform/graphics/ios/IconIOS.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/API/c/cg/WKImageCG.cpp