aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm
Commit message (Collapse)AuthorAge
...
* fix gm self-testGravatar commit-bot@chromium.org2014-01-08
| | | | | | | | | | | | | | BUG=skia:1971 NOTREECHECKS=True NOTRY=True R=caryclark@google.com TBR=caryclark Author: epoger@google.com Review URL: https://codereview.chromium.org/128793002 git-svn-id: http://skia.googlecode.com/svn/trunk@12964 2bbb7eff-a529-9590-31e7-b0007b416f81
* change offset to xy for pixelref subsettingGravatar reed@google.com2014-01-08
| | | | | | | | | BUG= R=scroggo@google.com Review URL: https://codereview.chromium.org/105893012 git-svn-id: http://skia.googlecode.com/svn/trunk@12958 2bbb7eff-a529-9590-31e7-b0007b416f81
* suppress on gpu for nowGravatar reed@google.com2014-01-08
| | | | | | | | BUG=skia:1956 Review URL: https://codereview.chromium.org/128333002 git-svn-id: http://skia.googlecode.com/svn/trunk@12953 2bbb7eff-a529-9590-31e7-b0007b416f81
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2014-01-08
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12950 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline_server: allow spaces within test/config namesGravatar commit-bot@chromium.org2014-01-07
| | | | | | | | | | | | | | | (SkipBuildbotRuns) BUG=skia:1969 NOTREECHECKS=True NOTRY=True R=bsalomon@google.com TBR=bsalomon Author: epoger@google.com Review URL: https://codereview.chromium.org/99373010 git-svn-id: http://skia.googlecode.com/svn/trunk@12943 2bbb7eff-a529-9590-31e7-b0007b416f81
* Make imagealphathreshold GM skip replay modes until it is fixed.Gravatar bsalomon@google.com2014-01-07
| | | | | | | | TBR=zork@chromium.org Review URL: https://codereview.chromium.org/94043005 git-svn-id: http://skia.googlecode.com/svn/trunk@12942 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix build warnings in SkAlphaThresholdFilterGravatar commit-bot@chromium.org2014-01-07
| | | | | | | | | | | BUG=None R=bsalomon@google.com Author: zork@chromium.org Review URL: https://codereview.chromium.org/101763010 git-svn-id: http://skia.googlecode.com/svn/trunk@12937 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add AlphaThreshold filter.Gravatar commit-bot@chromium.org2014-01-06
| | | | | | | | | | | | | This is based on the Bitmap Alpha Threshold filter, and will be used by Chromium to implement the window shape API. R=bsalomon@chromium.org, wez@chromium.org, bsalomon@google.com, reed@google.com Author: zork@chromium.org Review URL: https://codereview.chromium.org/115633002 git-svn-id: http://skia.googlecode.com/svn/trunk@12935 2bbb7eff-a529-9590-31e7-b0007b416f81
* create gm/rebaseline_server/test_all.pyGravatar commit-bot@chromium.org2014-01-06
| | | | | | | | | | | | | Uses proper Python unittest framework to launch all unittests within the directory. NOTRY=True R=rmistry@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/125253002 git-svn-id: http://skia.googlecode.com/svn/trunk@12915 2bbb7eff-a529-9590-31e7-b0007b416f81
* Make SkImageFilter crop rects relative to the primitive origin, instead of ↵Gravatar senorblanco@chromium.org2014-01-03
| | | | | | | | | | | | | | | | | | relative to their parent's crop rect. This is required by SVG semantics, and is more sane anyway. To do this, this patch changes the "offset/loc" parameter in filterImage() / onFilterImage() from an inout-param to an out-param only, so that the calling filter can know how much the input filter wants its result offset (and doesn't include the original primitive position). This offset can then be applied to the current filter's crop rect. (I've renamed the parameter "offset" in all cases to make this clear.) This makes the call sites in SkCanvas/SkGpuDevice responsible for applying the resulting offset to the primitive's position, which is actually a fairly small change. This change also fixes SkTileImageFilter and SkOffsetImageFilter to correctly handle an input offset, which they weren't before. This required modifying the GM's, since they assumed the broken behaviour. NOTE: this will require rebaselining the imagefiltersgraph test, since it has a new test case. NOTE: this will "break" the Blink layout tests css3/filters/effect-reference-subregion-chained-hw.html and css3/filters/effect-reference-subregion-hw.html, but it actually makes them give correct results. It should be suppressed on the skia roll, and I'll rebaseline it. R=reed@google.com Review URL: https://codereview.chromium.org/112803004 git-svn-id: http://skia.googlecode.com/svn/trunk@12895 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline gm self-tests after ↵Gravatar commit-bot@chromium.org2014-01-03
| | | | | | | | | | | | | | | | | https://code.google.com/p/skia/source/detail?r=12850 The GM self-test's fragility is already noted in https://code.google.com/p/skia/issues/detail?id=1068 ('make gm self-test more robust') NOTRY=True NOTREECHECKS=True R=mtklein@google.com TBR=mtklein Author: epoger@google.com Review URL: https://codereview.chromium.org/112203006 git-svn-id: http://skia.googlecode.com/svn/trunk@12885 2bbb7eff-a529-9590-31e7-b0007b416f81
* make results_test.py work better within python unittest frameworkGravatar commit-bot@chromium.org2014-01-03
| | | | | | | | | | | BUG= R=rmistry@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/122443006 git-svn-id: http://skia.googlecode.com/svn/trunk@12882 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add Options to SkDecodingImageGenerator, simplify API.Gravatar halcanary@google.com2014-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: We want to remove redundant classes from Skia. To that end we want to remove SkImageRef and its subclasses and replace their uses with SkDiscardablePixelRef + SkDecodingImageGenerator. Since Android uses SkImageRef, we need to make sure that SkDecodingImageGenerator allows all of the settings that Android exposes in BitmapFactory.Options. To that end, we have created an Options struct for the SkDecodingImageGenerator which lets the client of the generator set sample size, dithering, and bitmap config. We have made the SkDecodingImageGenerator constructor private and replaced the SkDecodingImageGenerator::Install functions with a SkDecodingImageGenerator::Create functions (one for SkData and one for SkStream) which now take a SkDecodingImageGenerator::Options struct. Also added a ImageDecoderOptions test which loops through a list of sets of options and tries them on a set of 5 small encoded images. Also updated several users of SkDecodingImageGenerator::Install to follow new call signature - gm/factory.cpp, LazyDecodeBitmap.cpp, and PictureTest.cpp, CachedDecodingPixelRefTest.cpp. We also added a new ImprovedBitmapFactory Test which simulates the exact function that Android will need to modify to use this, installPixelRef() in BitmapFactory. R=reed@google.com, scroggo@google.com Committed: https://code.google.com/p/skia/source/detail?r=12744 Review URL: https://codereview.chromium.org/93703004 git-svn-id: http://skia.googlecode.com/svn/trunk@12855 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add default resource path for skia test cases in gm and bench tools.Gravatar tfarina@chromium.org2013-12-31
| | | | | | | | | | BUG=skia:1765 TEST=./out/Release/gm --match downsamplebitmap_image R=mtklein@google.com, scroggo@google.com, yunchao.he@intel.com Review URL: https://codereview.chromium.org/120873002 git-svn-id: http://skia.googlecode.com/svn/trunk@12850 2bbb7eff-a529-9590-31e7-b0007b416f81
* reenable vertices gm, adding picture supportGravatar reed@google.com2013-12-30
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/112913005 git-svn-id: http://skia.googlecode.com/svn/trunk@12845 2bbb7eff-a529-9590-31e7-b0007b416f81
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2013-12-30
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12838 2bbb7eff-a529-9590-31e7-b0007b416f81
* really disable replayGravatar mike@reedtribe.org2013-12-30
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12836 2bbb7eff-a529-9590-31e7-b0007b416f81
* suppress pictures for vertices for nowGravatar mike@reedtribe.org2013-12-30
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12835 2bbb7eff-a529-9590-31e7-b0007b416f81
* add gm::verticesGravatar mike@reedtribe.org2013-12-30
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12834 2bbb7eff-a529-9590-31e7-b0007b416f81
* create unittest for gm/rebaseline_server/results.pyGravatar commit-bot@chromium.org2013-12-23
| | | | | | | | | | | NOTRY=True R=rmistry@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/117413006 git-svn-id: http://skia.googlecode.com/svn/trunk@12819 2bbb7eff-a529-9590-31e7-b0007b416f81
* Adding additional optional parameters to imagediffdb to make calling from ↵Gravatar rmistry@google.com2013-12-21
| | | | | | | | | | Cluster Telemetry possible. R=epoger@google.com Review URL: https://codereview.chromium.org/117823008 git-svn-id: http://skia.googlecode.com/svn/trunk@12816 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline_server: stop catching KeyboardInterrupt (ctrl-C)Gravatar commit-bot@chromium.org2013-12-19
| | | | | | | | | | | | | | (SkipBuildbotRuns) NOTRY=True NOTREECHECKS=True R=rmistry@google.com TBR=rmistry Author: epoger@google.com Review URL: https://codereview.chromium.org/115863003 git-svn-id: http://skia.googlecode.com/svn/trunk@12783 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline_server: add more timing and progress info to server-side logGravatar commit-bot@chromium.org2013-12-19
| | | | | | | | | | | | | | (SkipBuildbotRuns) BUG=skia:1941 NOTRY=True NOTREECHECKS=True R=bsalomon@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/105213007 git-svn-id: http://skia.googlecode.com/svn/trunk@12777 2bbb7eff-a529-9590-31e7-b0007b416f81
* Accept displacement with no displacement inputGravatar commit-bot@chromium.org2013-12-19
| | | | | | | | | | | BUG= R=senorblanco@google.com, senorblanco@chromium.org, sugoi@google.com, bsalomon@google.com, bsalomon@chromium.org Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/104853005 git-svn-id: http://skia.googlecode.com/svn/trunk@12773 2bbb7eff-a529-9590-31e7-b0007b416f81
* Yet another round of valgrind suppressionsGravatar robertphillips@google.com2013-12-19
| | | | | | | | https://codereview.chromium.org/116053004/ git-svn-id: http://skia.googlecode.com/svn/trunk@12766 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove SkBitmapAlphaThresholdShaderGravatar commit-bot@chromium.org2013-12-18
| | | | | | | | | | R=bsalomon@google.com Author: zork@chromium.org Review URL: https://codereview.chromium.org/108653012 git-svn-id: http://skia.googlecode.com/svn/trunk@12759 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert of https://codereview.chromium.org/93703004/Gravatar commit-bot@chromium.org2013-12-18
| | | | | | | | | | | | | | | Reason for revert: Test failures R=scroggo@google.com, djsollen@google.com, reed@google.com, halcanary@google.com TBR=djsollen@google.com, halcanary@google.com, reed@google.com, scroggo@google.com NOTREECHECKS=true NOTRY=true Author: robertphillips@google.com Review URL: https://codereview.chromium.org/103753007 git-svn-id: http://skia.googlecode.com/svn/trunk@12747 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add Options to SkDecodingImageGenerator, simplify API.Gravatar halcanary@google.com2013-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: We want to remove redundant classes from Skia. To that end we want to remove SkImageRef and its subclasses and replace their uses with SkDiscardablePixelRef + SkDecodingImageGenerator. Since Android uses SkImageRef, we need to make sure that SkDecodingImageGenerator allows all of the settings that Android exposes in BitmapFactory.Options. To that end, we have created an Options struct for the SkDecodingImageGenerator which lets the client of the generator set sample size, dithering, and bitmap config. We have made the SkDecodingImageGenerator constructor private and replaced the SkDecodingImageGenerator::Install functions with a SkDecodingImageGenerator::Create functions (one for SkData and one for SkStream) which now take a SkDecodingImageGenerator::Options struct. Also added a ImageDecoderOptions test which loops through a list of sets of options and tries them on a set of 5 small encoded images. Also updated several users of SkDecodingImageGenerator::Install to follow new call signature - gm/factory.cpp, LazyDecodeBitmap.cpp, and PictureTest.cpp, CachedDecodingPixelRefTest.cpp. We also added a new ImprovedBitmapFactory Test which simulates the exact function that Android will need to modify to use this, installPixelRef() in BitmapFactory. R=reed@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/93703004 git-svn-id: http://skia.googlecode.com/svn/trunk@12744 2bbb7eff-a529-9590-31e7-b0007b416f81
* Suppress questionable gpu errorsGravatar robertphillips@google.com2013-12-18
| | | | | | | | https://codereview.chromium.org/118283002/ git-svn-id: http://skia.googlecode.com/svn/trunk@12743 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline_server: write JSON files using Unix line endings, even on WindowsGravatar commit-bot@chromium.org2013-12-18
| | | | | | | | | | | | | | (SkipBuildbotRuns) BUG=skia:1815 NOTRY=True NOTREECHECKS=True R=bsalomon@google.com, epoger@google.com Author: epoger@gmail.com Review URL: https://codereview.chromium.org/117783004 git-svn-id: http://skia.googlecode.com/svn/trunk@12739 2bbb7eff-a529-9590-31e7-b0007b416f81
* [PDF] Fix clipping in xfermode improvement.Gravatar commit-bot@chromium.org2013-12-17
| | | | | | | | | | | | | | In some cases, the wrong clip (src clip instead of initial clip) was used. Switch almost exclusively to initial clip because it is safe and generates a smaller result. BUG=chromium:328009 R=reed@google.com, bungeman@google.com Author: vandebo@chromium.org Review URL: https://codereview.chromium.org/116423004 git-svn-id: http://skia.googlecode.com/svn/trunk@12729 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline_server: return rebaseline results faster, and reload UI page ↵Gravatar commit-bot@chromium.org2013-12-17
| | | | | | | | | | | | | | | | | | | | | | | automatically after Old way: Wait until server has loaded the updated results before telling the user the rebaseline was successful, and trust the user to reload the page before submitting more baselines. New way: Make server load the updated results in a separate thread, and automatically reload the page so that the user can submit more baselines if she wants to. (SkipBuildbotRuns) NOTRY=True NOTREECHECKS=True R=bsalomon@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/117453002 git-svn-id: http://skia.googlecode.com/svn/trunk@12717 2bbb7eff-a529-9590-31e7-b0007b416f81
* remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floatsGravatar reed@google.com2013-12-17
| | | | | | | | | | | | | To keep the CL (slightly) managable, this does not make any changes to existing macros (e.g. SkScalarMul). Just tackling #ifdef constructs this time around. BUG= R=bsalomon@google.com, caryclark@google.com Review URL: https://codereview.chromium.org/117053002 git-svn-id: http://skia.googlecode.com/svn/trunk@12712 2bbb7eff-a529-9590-31e7-b0007b416f81
* Tweaks in how to apply bitmap filter levels in GPU.Gravatar commit-bot@chromium.org2013-12-16
| | | | | | | | | | | | | | Fix fallback to MIP from bicubic for bitmap shaders Skip MIP level generation on GPU when not minifying Add medium quality and mixed up/down matrix test cases to filterbitmap tests R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/103913012 git-svn-id: http://skia.googlecode.com/svn/trunk@12697 2bbb7eff-a529-9590-31e7-b0007b416f81
* Don't run the GM in serialization modes.Gravatar senorblanco@chromium.org2013-12-12
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12662 2bbb7eff-a529-9590-31e7-b0007b416f81
* Implement an SkPicture image filter source. This is required for the ↵Gravatar senorblanco@chromium.org2013-12-12
| | | | | | | | | | external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect. R=reed@google.com Review URL: https://codereview.chromium.org/114263002 git-svn-id: http://skia.googlecode.com/svn/trunk@12661 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert "Implement an SkPicture image filter source. This is required for the ↵Gravatar senorblanco@chromium.org2013-12-12
| | | | | | | | external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect." This reverts commit a620349a24471546ad2e8f0679774c1f5b4de0a4 (r12656). git-svn-id: http://skia.googlecode.com/svn/trunk@12657 2bbb7eff-a529-9590-31e7-b0007b416f81
* Implement an SkPicture image filter source. This is required for the ↵Gravatar senorblanco@chromium.org2013-12-12
| | | | | | | | | | external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect. R=reed@google.com Review URL: https://codereview.chromium.org/114263002 git-svn-id: http://skia.googlecode.com/svn/trunk@12656 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fixed a displacement issueGravatar commit-bot@chromium.org2013-12-12
| | | | | | | | | | | | | The displacement filter was assuming that both inputs were of the same size, which is true in blink, but not necessarily in a compromised stream. BUG=327372 R=senorblanco@chromium.org, senorblanco@google.com, reed@google.com, fmalita@chromium.org, fmalita@google.com, sugoi@google.com Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/101623007 git-svn-id: http://skia.googlecode.com/svn/trunk@12655 2bbb7eff-a529-9590-31e7-b0007b416f81
* Reverting r12635 (Make leak counters thread-safe - ↵Gravatar robertphillips@google.com2013-12-12
| | | | | | https://codereview.chromium.org/99483003) due to compile errors on Mac 10.6 & in Chrome git-svn-id: http://skia.googlecode.com/svn/trunk@12637 2bbb7eff-a529-9590-31e7-b0007b416f81
* Make leak counters thread-safe and turn them on by default for DebugGravatar commit-bot@chromium.org2013-12-12
| | | | | | | | | | | | | | | | | | | | | | | | Make leak counters implemented with SK_DECLARE_INST_COUNT thread-safe. Enable the leak counting for Debug builds. Protect the instance counter initialization step (initStep) by using SkOnce. Makes SkOnce.h part of the public API, since SkInstCnt is public. Protect the per-class child list shared variable with a per-class mutex. Changes the behavior in the way that if the child list has been "cleaned up", it will still try to create subsequent child lists. BUG=skia:1219 R=robertphillips@google.com, mtklein@google.com, bungeman@gmail.com, bsalomon@google.com, bungeman@google.com Author: kkinnunen@nvidia.com Review URL: https://codereview.chromium.org/99483003 git-svn-id: http://skia.googlecode.com/svn/trunk@12635 2bbb7eff-a529-9590-31e7-b0007b416f81
* Tiny, urgent fix for rebaseline_server to accept new baselines.Gravatar commit-bot@chromium.org2013-12-11
| | | | | | | | | | | | | | | (SkipBuildbotRuns) R=jcgregorio@google.com TBR=jcgregorio NOTREECHECKS=True NOTRY=True BUG= Author: epoger@google.com Review URL: https://codereview.chromium.org/99763007 git-svn-id: http://skia.googlecode.com/svn/trunk@12628 2bbb7eff-a529-9590-31e7-b0007b416f81
* improve bitmap font support (FreeType only)Gravatar bungeman@google.com2013-12-10
| | | | | | | | | | | | | | | This commit improves SkFontHost_FreeType's support for bitmap fonts, adding a number of features: - Intelligent bitmap strike selection. - Inter-strike bitmap font scaling. - Colour bitmap font support (FreeType 2.5.0+). BUG= R=reed@google.com Review URL: https://codereview.chromium.org/23684041 git-svn-id: http://skia.googlecode.com/svn/trunk@12607 2bbb7eff-a529-9590-31e7-b0007b416f81
* [PDF] PDF rasterizers fed garbage data in release mode.Gravatar vandebo@chromium.org2013-12-09
| | | | | | | | | BUG=skia:1885 TBR=epoger@google.com Review URL: https://codereview.chromium.org/103213007 git-svn-id: http://skia.googlecode.com/svn/trunk@12589 2bbb7eff-a529-9590-31e7-b0007b416f81
* Implement srcRect and dstRect functionality in SkBitmapSource. This is ↵Gravatar senorblanco@chromium.org2013-12-09
| | | | | | | | | | | | | | required for the "preserveAspectRatio" options of SVG's feImage. Covered by new GM "bitmapsource". This also includes some changes to the xfermodeimagefilter and tileimagefilter GMs to properly handle the CTM. This worked before only because SkBitmapSource was ignoring the CTM. Now that it respects it, we need to give the correct transform. This also means the GMs now work while zoomed. It also implements CTM support for SkTileImageFilter. NOTE: this will require rebaselining a number of imagefilter GMs on Nexus4, since they render in perspective (using the CTM). The changes to the results should all be improvements. R=reed@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/106933002 git-svn-id: http://skia.googlecode.com/svn/trunk@12571 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add more valgrind suppressionsGravatar robertphillips@google.com2013-12-09
| | | | | | | | https://codereview.chromium.org/102443003/ git-svn-id: http://skia.googlecode.com/svn/trunk@12561 2bbb7eff-a529-9590-31e7-b0007b416f81
* Just a typo. Rename StrokeRect to StrokeRects in strokerects.cpp, making it ↵Gravatar commit-bot@chromium.org2013-12-09
| | | | | | | | | | | | different from the class name in strokerect.cpp for debugging. R=bungeman@google.com, reed@google.com Author: yunchao.he@intel.com Review URL: https://codereview.chromium.org/99573004 git-svn-id: http://skia.googlecode.com/svn/trunk@12557 2bbb7eff-a529-9590-31e7-b0007b416f81
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2013-12-07
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12555 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add GM to test bitmap shaders with basic geometry and bitmap masks.Gravatar commit-bot@chromium.org2013-12-06
| | | | | | | | | | R=reed@google.com, bsalomon@google.com, rmistry@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/98433004 git-svn-id: http://skia.googlecode.com/svn/trunk@12543 2bbb7eff-a529-9590-31e7-b0007b416f81
* Reverting 12528 & 12533 (Implement srcRect and dstRect functionality in ↵Gravatar robertphillips@google.com2013-12-06
| | | | | | | | | | SkBitmapSource) due to image differences on N4 https://codereview.chromium.org/108623002/ git-svn-id: http://skia.googlecode.com/svn/trunk@12534 2bbb7eff-a529-9590-31e7-b0007b416f81