aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkImageInfo.h
Commit message (Collapse)AuthorAge
* remove SK_SUPPORT_LEGACY_COLORPROFILETYPE dead-codeGravatar reed2016-06-28
| | | | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2101983003 TBR= Review-Url: https://codereview.chromium.org/2101983003
* update callers to not use SkColorProfileTypeGravatar reed2016-06-21
| | | | | | | | | Requires https://codereview.chromium.org/2087833002/ to land first. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2086583002 Review-Url: https://codereview.chromium.org/2086583002
* remove colorprofiletype from imageinfoGravatar reed2016-06-17
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2075853002 Review-Url: https://codereview.chromium.org/2075853002
* Lots of progress on switching to SkColorSpace rather than SkColorProfileTypeGravatar brianosman2016-06-16
| | | | | | | | | | Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170 Review-Url: https://codereview.chromium.org/2069173002
* Revert of Lots of progress switching to SkColorSpace rather than ↵Gravatar brianosman2016-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | SkColorProfileType (patchset #10 id:180001 of https://codereview.chromium.org/2069173002/ ) Reason for revert: Mac crashes in GrUploadPixmapToTexture Original issue's description: > Lots of progress on switching to SkColorSpace rather than SkColorProfileType > > Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 > > Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170 TBR=reed@google.com,herb@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2072813002
* Lots of progress on switching to SkColorSpace rather than SkColorProfileTypeGravatar brianosman2016-06-16
| | | | | | | | | Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 Review-Url: https://codereview.chromium.org/2069173002
* Keep SkColorSpace and SkColorProfileType in syncGravatar msarett2016-06-16
| | | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2068743003 Committed: https://skia.googlesource.com/skia/+/04d35bd80dde7cace866781037cbbdcab14ab683 Review-Url: https://codereview.chromium.org/2068743003
* Revert of Keep SkColorSpace and SkColorProfileType in sync (patchset #2 ↵Gravatar egdaniel2016-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | id:20001 of https://codereview.chromium.org/2068743003/ ) Reason for revert: breaking roll. ../../third_party/skia/include/core/SkImageInfo.h:202: error: undefined reference to 'SkColorSpace::NewNamed(SkColorSpace::Named)' Original issue's description: > Keep SkColorSpace and SkColorProfileType in sync > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2068743003 > > Committed: https://skia.googlesource.com/skia/+/04d35bd80dde7cace866781037cbbdcab14ab683 TBR=reed@google.com,brianosman@google.com,herb@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2073593002
* Keep SkColorSpace and SkColorProfileType in syncGravatar msarett2016-06-15
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2068743003 Review-Url: https://codereview.chromium.org/2068743003
* SkPixmap::setColorSpaceGravatar msarett2016-06-09
| | | | | | | | | | | | Landed for reed@ with bug fix: Use default copy constructor for SkDraw BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2057563002 patch from issue 2057563002 at patchset 1 (http://crrev.com/2057563002#ps1) Review-Url: https://codereview.chromium.org/2052943002
* Add new SkSourceGammaTreatment enum, used in situations like mipmap ↵Gravatar brianosman2016-06-06
| | | | | | | | | construction, where we need to know if we should respect (vs. ignore) the gamma encoding of sRGB tagged images. Plumb that extensively. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2037413002 Review-Url: https://codereview.chromium.org/2037413002
* add MakeS32 helper to SkImageInfo, fix named-gamma constructor bugGravatar reed2016-06-02
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035813003 Review-Url: https://codereview.chromium.org/2035813003
* Add SkColorSpace to SkImageInfoGravatar msarett2016-05-27
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=2000713003 Review-Url: https://codereview.chromium.org/2000713003
* Revert of move static arrays into impl, to avoid multiple copies (patchset ↵Gravatar reed2016-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | #3 id:40001 of https://codereview.chromium.org/1889793007/ ) Reason for revert: FAILED: if [ ! -e lib/libgfx.so -o ! -e lib/libgfx.so.TOC ]; then /b/build/slave/linux_chromeos/build/src/build/goma/client/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -shared -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -Wl,-z,defs -pthread -Wl,-z,noexecstack -fPIC -fuse-ld=gold -B/b/build/slave/linux_chromeos/build/src/third_party/binutils/Linux_x64/Release/bin -Wl,--disable-new-dtags -m64 -Wl,--icf=all -o lib/libgfx.so -Wl,-soname=libgfx.so @lib/libgfx.so.rsp && { readelf -d lib/libgfx.so | grep SONAME ; nm -gD -f p lib/libgfx.so | cut -f1-2 -d' '; } > lib/libgfx.so.TOC; else /b/build/slave/linux_chromeos/build/src/build/goma/client/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -shared -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -Wl,-z,defs -pthread -Wl,-z,noexecstack -fPIC -fuse-ld=gold -B/b/build/slave/linux_chromeos/build/src/third_party/binutils/Linux_x64/Release/bin -Wl,--disable-new-dtags -m64 -Wl,--icf=all -o lib/libgfx.so -Wl,-soname=libgfx.so @lib/libgfx.so.rsp && { readelf -d lib/libgfx.so | grep SONAME ; nm -gD -f p lib/libgfx.so | cut -f1-2 -d' '; } > lib/libgfx.so.tmp && if ! cmp -s lib/libgfx.so.tmp lib/libgfx.so.TOC; then mv lib/libgfx.so.tmp lib/libgfx.so.TOC ; fi; fi obj/ui/gfx/gfx.blit.o:../../ui/gfx/blit.cc:function SkColorTypeBytesPerPixel(SkColorType): error: undefined reference to 'gPrivate_SkColorTypeBytesPerPixel' obj/ui/gfx/gfx.canvas.o:../../ui/gfx/canvas.cc:function SkColorTypeBytesPerPixel(SkColorType): error: undefined reference to 'gPrivate_SkColorTypeBytesPerPixel' obj/ui/gfx/gfx.canvas_skia.o:../../ui/gfx/canvas_skia.cc:function SkColorTypeBytesPerPixel(SkColorType): error: undefined reference to 'gPrivate_SkColorTypeBytesPerPixel' obj/ui/gfx/codec/gfx.jpeg_codec.o:../../ui/gfx/codec/jpeg_codec.cc:function SkColorTypeBytesPerPixel(SkColorType): error: undefined reference to 'gPrivate_SkColorTypeBytesPerPixel' clang: error: linker command failed with exit code 1 (use -v to see invocation) ninja: build stopped: subcommand failed. Original issue's description: > move static arrays into impl, to avoid multiple copies > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1889793007 > > Committed: https://skia.googlesource.com/skia/+/6d7cd1f421dbde43dd2db655ca477c05312ec5fd TBR=fmalita@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=skia: Review URL: https://codereview.chromium.org/1899563002
* move static arrays into impl, to avoid multiple copiesGravatar reed2016-04-15
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1889793007 Review URL: https://codereview.chromium.org/1889793007
* spriteblitter for memcpy case (for all configs)Gravatar reed2016-04-15
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1887103003 Review URL: https://codereview.chromium.org/1887103003
* SkSurfaceProps now has a gamma-correct ("AllowSRGBInputs") flag. That's ↵Gravatar brianosman2016-04-06
| | | | | | | | | | | | propagated in a few places so that the backend can do the right thing for L32 vs S32 mode. Also added SkSurfaceProps to SkSpecialImage, so that Image -> Surface conversion can preserve the desired behavior during filtering. Many small changes, including a bunch of comments about places where we may be losing information right now. My approach was to ensure that if anything fails, it will always fall back to "legacy" mode - gamma-correctness is opt-in, so I'll just have to feed things through as missing cases are exposed. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1838953007 Review URL: https://codereview.chromium.org/1845283003
* add kRGBA_F16_SkColorTypeGravatar reed2016-02-05
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1666343002 Review URL: https://codereview.chromium.org/1666343002
* Remove image usage type enum. Use GrTextureParams instead.Gravatar bsalomon2015-10-12
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1404433002
* Use static_assert instead of SK_COMPILE_ASSERT.Gravatar bungeman2015-08-20
| | | | | | | Now that static_assert is allowed, there is no need to use a non- standard compile time assertion Review URL: https://codereview.chromium.org/1306443004
* Extend SkImageGenerator to support natively generated GrTextures. As part of ↵Gravatar reed2015-08-13
| | | | | | | | | | | | this, added uniqueID() to the generator, and made it be in the same namespace is bitmaps, pixelrefs, images. To do this, create SkImageCacherator, which wraps a generator and provides an interface to get a cached answer for either the raster or texture output of the generator. BUG=skia: Review URL: https://codereview.chromium.org/1291803002
* remove now-dead flagsGravatar reed2015-08-01
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1258963005
* Add Rec709 YUV color space support to GrYUVtoRGBEffect.Gravatar rileya2015-07-20
| | | | | | | | | | | This change is motivated by a recent switch in how chromium handles <video> color spaces, making rec709 more commonly used. This will allow video -> canvas copies to take the fast GPU path when we're using 709, just as we do with 601 and jpeg. Chromium-side change: https://codereview.chromium.org/1236313002 Review URL: https://codereview.chromium.org/1241723005
* add callbacks to Images that wrap client-provided contentGravatar reed2015-06-18
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1169553003
* add SkPixmap and external locking to bitmapsGravatar reed2015-05-22
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1074983003
* add kGray_8_SkColorTypeGravatar reed2015-03-17
| | | | | | | | | patch from issue 1014783003 at patchset 60001 (http://crrev.com/1014783003#ps60001) BUG=skia: TBR= Review URL: https://codereview.chromium.org/1010343002
* Revert of Revert of replace kIgnore_SkAlphaType with kUnknown_SkAlphaType ↵Gravatar reed2015-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (patchset #1 id:1 of https://codereview.chromium.org/966753002/) Reason for revert: Android has been updated, so we can re-land this. Original issue's description: > Revert of replace kIgnore_SkAlphaType with kUnknown_SkAlphaType (patchset #3 id:40001 of https://codereview.chromium.org/964613002/) > > Reason for revert: > This breaks Android framework build. See > > https://android-build.storage.googleapis.com/builds/git_master-skia-linux-volantisg-userdebug/1759130/7f0fcdbf3c0d47530d770a15c912298dac20dd7d90a01de63ecb9ba16c96b25c/logs/build_error.log?Expires=1425047630&GoogleAccessId=701025073339-mqn0q2nvir9iurm6q5d00tdv7blbgvjr%40developer.gserviceaccount.com&Signature=BHPS1lffyH7WykwyEw5RXVVXWqQK5rab%2B6Pl1VaUrTlmWT%2FXb6fq%2FBe22AUDZYFPG24MBR%2F2IzIDzTqH3mihQS9wIkcKJ4kJpA2G%2BI3l8jCX20brZSr3bsDSx%2F4wsLwU1bBpIxI%2FbrauoPRqddbXP8sNI1l51u6ZCxpvRQms9Mc%3D > > We need to stop them from using kIgnore before we can reland this. > > Original issue's description: > > replace kIgnore_SkAlphaType with kUnknown_SkAlphaType > > > > BUG=skia: > > TBR= > > > > Committed: https://skia.googlesource.com/skia/+/1c8aeeaebce9675197be31bd769e8ffa2531bf86 > > TBR=reed@google.com,reed@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/574290f61a47bd1ce1f9e2d941533bda9c8f03fe TBR=reed@chromium.org,scroggo@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/966853002
* Revert of replace kIgnore_SkAlphaType with kUnknown_SkAlphaType (patchset #3 ↵Gravatar scroggo2015-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | id:40001 of https://codereview.chromium.org/964613002/) Reason for revert: This breaks Android framework build. See https://android-build.storage.googleapis.com/builds/git_master-skia-linux-volantisg-userdebug/1759130/7f0fcdbf3c0d47530d770a15c912298dac20dd7d90a01de63ecb9ba16c96b25c/logs/build_error.log?Expires=1425047630&GoogleAccessId=701025073339-mqn0q2nvir9iurm6q5d00tdv7blbgvjr%40developer.gserviceaccount.com&Signature=BHPS1lffyH7WykwyEw5RXVVXWqQK5rab%2B6Pl1VaUrTlmWT%2FXb6fq%2FBe22AUDZYFPG24MBR%2F2IzIDzTqH3mihQS9wIkcKJ4kJpA2G%2BI3l8jCX20brZSr3bsDSx%2F4wsLwU1bBpIxI%2FbrauoPRqddbXP8sNI1l51u6ZCxpvRQms9Mc%3D We need to stop them from using kIgnore before we can reland this. Original issue's description: > replace kIgnore_SkAlphaType with kUnknown_SkAlphaType > > BUG=skia: > TBR= > > Committed: https://skia.googlesource.com/skia/+/1c8aeeaebce9675197be31bd769e8ffa2531bf86 TBR=reed@google.com,reed@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/966753002
* replace kIgnore_SkAlphaType with kUnknown_SkAlphaTypeGravatar reed2015-02-27
| | | | | | | BUG=skia: TBR= Review URL: https://codereview.chromium.org/964613002
* export SkImageInfoGravatar reed2015-01-30
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/893603005
* remove dead SK_SUPPORT_LEGACY_N32_NAME codeGravatar reed2014-12-21
| | | | | | | BUG=skia: TBR= Review URL: https://codereview.chromium.org/818903004
* flag imageinfo as srgbGravatar reed2014-11-10
| | | | | | | | | | | | intended uses: - flag a SkSurface as sRGB (only supported by Ganesh for now) - flag images (e.g. png or jpeg) as sRGB if the codec tells us that wins: - faster gamma-correct text (esp. w/ distance-fields) when we can use sRGB for text - better color fidelity when the screen really is sRGB Review URL: https://codereview.chromium.org/676883003
* Add `SkIRect bounds()` convenience method to SkImageInfo and SkBitmap.Gravatar halcanary2014-10-24
| | | | Review URL: https://codereview.chromium.org/646213003
* Add support for the Rec601 YUV color space to GrYUVtoRGBEffect.Gravatar rileya2014-09-12
| | | | | | | | R=bsalomon@google.com, senorblanco@chromium.org, sugoi@chromium.org, reed@google.com Author: rileya@chromium.org Review URL: https://codereview.chromium.org/516463005
* Hide fields in SkImageInfoGravatar reed2014-09-03
| | | | | | | | | R=rmistry@google.com TBR=bsalomon Author: reed@google.com Review URL: https://codereview.chromium.org/536003002
* Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 id:1 of ↵Gravatar reed2014-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/527073003/) Reason for revert: virtual gpu failures in layouttests http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/23717 [6:6:0903/041147:1700960503:INFO:SkBitmap.cpp(1003)] ../../third_party/skia/src/core/SkBitmap.cpp:1003: failed assertion "fPixelRef->info() == pixelRef->info()" [6:6:0903/041147:1700961002:FATAL:SkBitmap.cpp(1003)] SK_CRASH #0 0x7f9867df2c1e base::debug::StackTrace::StackTrace() #1 0x7f9867e89e05 logging::LogMessage::~LogMessage() #2 0x7f98689c4970 SkDebugf_FileLine() #3 0x7f986870ebc6 SkBitmap::deepCopyTo() #4 0x7f98690a3b6d blink::deepSkBitmapCopy() #5 0x7f98690a3abe blink::ImageBuffer::copyImage() #6 0x7f985fd4479e blink::ImageBitmap::ImageBitmap() #7 0x7f985fd45942 blink::ImageBitmap::create() #8 0x7f985fd84fdc blink::ImageBitmapFactories::createImageBitmap() #9 0x7f985fd84d11 blink::ImageBitmapFactories::createImageBitmap() #10 0x7f985ec9a7f2 blink::LocalDOMWindowV8Internal::createImageBitmap13Method() #11 0x7f985ec96b0c blink::LocalDOMWindowV8Internal::createImageBitmapMethod() #12 0x7f985ec91954 blink::LocalDOMWindowV8Internal::createImageBitmapMethodCallback() #13 0x7f9869955af0 v8::internal::FunctionCallbackArguments::Call() #14 0x7f98699833bd v8::internal::Builtin_HandleApiCall() Original issue's description: > Add gamma/sRGB tag to SkImageInfo > > This reverts commit 1cbc68f9659f15206d920dacd434ddf4b658ad1f. > > requires this to land in blink https://codereview.chromium.org/531883002/ > > Committed: https://skia.googlesource.com/skia/+/2f6abdecc5c2f21da13003c615903679abc73fc7 R=fmalita@google.com, reed@chromium.org TBR=fmalita@google.com, reed@chromium.org NOTREECHECKS=true NOTRY=true Author: reed@google.com Review URL: https://codereview.chromium.org/535113002
* Add gamma/sRGB tag to SkImageInfoGravatar reed2014-09-02
| | | | | | | | | | | | This reverts commit 1cbc68f9659f15206d920dacd434ddf4b658ad1f. requires this to land in blink https://codereview.chromium.org/531883002/ R=fmalita@google.com, reed@chromium.org Author: reed@google.com Review URL: https://codereview.chromium.org/527073003
* Revert of Revert of Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 ↵Gravatar reed2014-09-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | id:1 of https://codereview.chromium.org/532583002/) Reason for revert: linux_blink_rel [ RUN ] DeferredImageDecoderTest.drawIntoSkPicture ../../third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp:172: Failure Value of: canvasBitmap.getColor(0, 0) Actual: 0 Expected: static_cast<SkColor>( (static_cast<U8CPU>(255) << 24) | (static_cast<U8CPU>(255) << 16) | (static_cast<U8CPU>(255) << 8) | (static_cast<U8CPU>(255) << 0)) Which is: 4294967295 [ FAILED ] DeferredImageDecoderTest.drawIntoSkPicture (0 ms) [1457/1458] DeferredImageDecoderTest.drawIntoSkPicture (0 ms) [ RUN ] DeferredImageDecoderTest.decodeOnOtherThread ../../third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp:233: Failure Value of: canvasBitmap.getColor(0, 0) Actual: 0 Expected: static_cast<SkColor>( (static_cast<U8CPU>(255) << 24) | (static_cast<U8CPU>(255) << 16) | (static_cast<U8CPU>(255) << 8) | (static_cast<U8CPU>(255) << 0)) Which is: 4294967295 [ FAILED ] DeferredImageDecoderTest.decodeOnOtherThread (1 ms) [1458/1458] DeferredImageDecoderTest.decodeOnOtherThread (1 ms) Retrying 2 tests (retry #2) Original issue's description: > Revert of Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 id:1 of https://codereview.chromium.org/525113005/) > > Reason for revert: > Experiment to see resulting failures > > Original issue's description: > > Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 id:1 of https://codereview.chromium.org/522813002/) > > > > Reason for revert: > > seems to be breaking layout tests in roll > > > > Original issue's description: > > > Add gamma/sRGB tag to SkImageInfo > > > > > > This reverts commit 64ba5fa1ff428858f803523257cd862f8b33423b. > > > > > > BUG=skia: > > > > > > Committed: https://skia.googlesource.com/skia/+/c89aa509d6a094bc1b18d73135343819903a9cfb > > > > TBR=reed@google.com > > NOTREECHECKS=true > > NOTRY=true > > BUG=skia: > > > > Committed: https://skia.googlesource.com/skia/+/b44c1895afae516cb851cd1a0cea83343c354ee4 > > TBR=reed@google.com > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/4581828014eb3d015e6ed55c9a5b6932b8751818 R=reed@google.com TBR=reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@chromium.org Review URL: https://codereview.chromium.org/524593005
* Revert of Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 id:1 of ↵Gravatar reed2014-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/525113005/) Reason for revert: Experiment to see resulting failures Original issue's description: > Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 id:1 of https://codereview.chromium.org/522813002/) > > Reason for revert: > seems to be breaking layout tests in roll > > Original issue's description: > > Add gamma/sRGB tag to SkImageInfo > > > > This reverts commit 64ba5fa1ff428858f803523257cd862f8b33423b. > > > > BUG=skia: > > > > Committed: https://skia.googlesource.com/skia/+/c89aa509d6a094bc1b18d73135343819903a9cfb > > TBR=reed@google.com > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/b44c1895afae516cb851cd1a0cea83343c354ee4 R=reed@google.com TBR=reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@chromium.org Review URL: https://codereview.chromium.org/532583002
* Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 id:1 of ↵Gravatar reed2014-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/522813002/) Reason for revert: seems to be breaking layout tests in roll Original issue's description: > Add gamma/sRGB tag to SkImageInfo > > This reverts commit 64ba5fa1ff428858f803523257cd862f8b33423b. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/c89aa509d6a094bc1b18d73135343819903a9cfb R=reed@google.com TBR=reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@chromium.org Review URL: https://codereview.chromium.org/525113005
* Add gamma/sRGB tag to SkImageInfoGravatar reed2014-09-01
| | | | | | | | | | | This reverts commit 64ba5fa1ff428858f803523257cd862f8b33423b. BUG=skia: R=reed@chromium.org Author: reed@google.com Review URL: https://codereview.chromium.org/522813002
* Revert of Add gamma/sRGB tags to SkImageInfo (patchset #1 of ↵Gravatar reed2014-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/517123002/) Reason for revert: Seems to be triggering assert in blink SSLUITest.TestRedirectHTTPToBadHTTPS (run #1): [ RUN ] SSLUITest.TestRedirectHTTPToBadHTTPS HTTP server started on http://127.0.0.1:58000... sending server_data: {"host": "127.0.0.1", "port": 58000} (36 bytes) HTTPS server started on https://127.0.0.1:58009... sending server_data: {"host": "127.0.0.1", "port": 58009} (36 bytes) ASSERTION FAILED: info.fAlphaType == m_imageInfo.fAlphaType ../../third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp(78) : virtual bool blink::DecodingImageGenerator::onGetPixels(const SkImageInfo &, void *, size_t, SkPMColor *, int *) 1 0x77eb0d3 blink::DecodingImageGenerator::onGetPixels(SkImageInfo const&, void*, unsigned long, unsigned int*, int*) 2 0x92edddc SkImageGenerator::getPixels(SkImageInfo const&, void*, unsigned long, unsigned int*, int*) 3 0x92adf78 SkDiscardablePixelRef::onNewLockPixels(SkPixelRef::LockRec*) 4 0x9369283 SkPixelRef::lockPixels(SkPixelRef::LockRec*) 5 0x9369433 SkPixelRef::lockPixels() 6 0x9213344 SkBitmap::lockPixels() const 7 0x921ca57 SkAutoLockPixels::SkAutoLockPixels(SkBitmap const&, bool) 8 0x921ad80 SkAutoLockPixels::SkAutoLockPixels(SkBitmap const&, bool) 9 0x92b7125 SkDraw::drawBitmap(SkBitmap const&, SkMatrix const&, SkPaint const&) const 10 0x921f4fb SkBitmapDevice::drawBitmap(SkDraw const&, SkBitmap const&, SkMatrix const&, SkPaint const&) 11 0x921f8c7 SkBitmapDevice::drawBitmapRect(SkDraw const&, SkBitmap const&, SkRect const*, SkRect const&, SkPaint const&, SkCanvas::DrawBitmapRectFlags) 12 0x9288e12 SkCanvas::internalDrawBitmapRect(SkBitmap const&, SkRect const*, SkRect const&, SkPaint const*, SkCanvas::DrawBitmapRectFlags) 13 0x9288ee9 SkCanvas::drawBitmapRectToRect(SkBitmap const&, SkRect const*, SkRect const&, SkPaint const*, SkCanvas::DrawBitmapRectFlags) Original issue's description: > Add gamma/sRGB tags to SkImageInfo > > requires this CL to land in chrome > https://codereview.chromium.org/517803002/ > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/228b285ba14a6e9b6d1cc95ea1583caab30168a1 R=fmalita@google.com, fmalita@chromium.org, reed@chromium.org TBR=fmalita@chromium.org, fmalita@google.com, reed@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@google.com Review URL: https://codereview.chromium.org/519583004
* Add gamma/sRGB tags to SkImageInfoGravatar reed2014-08-29
| | | | | | | | | | | | requires this CL to land in chrome https://codereview.chromium.org/517803002/ BUG=skia: R=fmalita@google.com, fmalita@chromium.org, reed@chromium.org Author: reed@google.com Review URL: https://codereview.chromium.org/517123002
* Revert of Revert of Revert of add gamma/sRGB to SkImageInfo (patchset #1 of ↵Gravatar reed2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/511363002/) Reason for revert: android builder in chrome reveals the caller using { } initialization for SkImageInfo, which this CL now makes illegal. Will have to fix the call site before I can re-land this Original issue's description: > Revert of Revert of add gamma/sRGB to SkImageInfo (patchset #1 of https://codereview.chromium.org/512243002/) > > Reason for revert: > this revert was premature -- the chrome canary I looked at is old, and newer ones were green. So trying again... > > Original issue's description: > > Revert of add gamma/sRGB to SkImageInfo (patchset #4 of https://codereview.chromium.org/514753002/) > > > > Reason for revert: > > breaks linker on chrome -- may need SK_API, but not sure. > > > > Original issue's description: > > > add gamma/sRGB to SkImageInfo > > > > > > BUG=skia: > > > > > > Committed: https://skia.googlesource.com/skia/+/615c369777258231054840a88cdb74c68c382485 > > > > TBR=bungeman@google.com,bsalomon@google.com > > NOTREECHECKS=true > > NOTRY=true > > BUG=skia: > > > > Committed: https://skia.googlesource.com/skia/+/dc53701216c0e9f98eacf6c0cda769ebbd200b59 > > TBR=bungeman@google.com,bsalomon@google.com > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/e759a2662273fdf52ebbb3822229945eda317e46 R=bungeman@google.com, bsalomon@google.com TBR=bsalomon@google.com, bungeman@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@google.com Review URL: https://codereview.chromium.org/517113002
* Revert of add SK_API to SkImageInfo (patchset #1 of ↵Gravatar reed2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/513333003/) Reason for revert: need to revert the big ImageInfo CL but since this was landed on top of it, I need to revert this guy first. Original issue's description: > add SK_API to SkImageInfo > > BUG=skia: > TBR=bungeman > NOTRY=True > > Committed: https://skia.googlesource.com/skia/+/bedec8456ff0ea814ed1bba748a86678f458d063 TBR= NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@google.com Review URL: https://codereview.chromium.org/518543002
* add SK_API to SkImageInfoGravatar reed2014-08-28
| | | | | | | | | | BUG=skia: TBR=bungeman NOTRY=True Author: reed@google.com Review URL: https://codereview.chromium.org/513333003
* Revert of Revert of add gamma/sRGB to SkImageInfo (patchset #1 of ↵Gravatar reed2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/512243002/) Reason for revert: this revert was premature -- the chrome canary I looked at is old, and newer ones were green. So trying again... Original issue's description: > Revert of add gamma/sRGB to SkImageInfo (patchset #4 of https://codereview.chromium.org/514753002/) > > Reason for revert: > breaks linker on chrome -- may need SK_API, but not sure. > > Original issue's description: > > add gamma/sRGB to SkImageInfo > > > > BUG=skia: > > > > Committed: https://skia.googlesource.com/skia/+/615c369777258231054840a88cdb74c68c382485 > > TBR=bungeman@google.com,bsalomon@google.com > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/dc53701216c0e9f98eacf6c0cda769ebbd200b59 R=bungeman@google.com, bsalomon@google.com TBR=bsalomon@google.com, bungeman@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@google.com Review URL: https://codereview.chromium.org/511363002
* Revert of add gamma/sRGB to SkImageInfo (patchset #4 of ↵Gravatar reed2014-08-28
| | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/514753002/) Reason for revert: breaks linker on chrome -- may need SK_API, but not sure. Original issue's description: > add gamma/sRGB to SkImageInfo > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/615c369777258231054840a88cdb74c68c382485 R=bungeman@google.com, bsalomon@google.com TBR=bsalomon@google.com, bungeman@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@google.com Review URL: https://codereview.chromium.org/512243002
* add gamma/sRGB to SkImageInfoGravatar reed2014-08-28
| | | | | | | | | BUG=skia: R=bungeman@google.com, bsalomon@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/514753002
* Adjust the alpha type for pixelRefs.Gravatar scroggo2014-07-01
| | | | | | | | | | | | | | Move SkBitmap's validate_alphaType to SkImageInfo, with the new name SkColorTypeValidateAlphaType. Use it in SkPixelRef's constructors, as well as in SkDecodingImageGenerator. This fixes a bug where an SkPixelRef's SkAlphaType could get out of sync with its SkBitmap, when both were assigned the same SkAlphaType. R=reed@google.com, halcanary@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/346593003