summaryrefslogtreecommitdiffstats
path: root/skia
Commit message (Collapse)AuthorAgeFilesLines
* Fix for Skia data race. This may introduce some performance issues; will ↵senorblanco@google.com2010-06-221-5/+9
| | | | | | | | | | | watch perf bots carefully. BUG=46672 TEST=see perf bits Review URL: http://codereview.chromium.org/2876001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50510 0039d316-1c4b-4281-b951-d872f2087c98
* TTF: Re-disable crashing test.vandebo@chromium.org2010-06-181-1/+2
| | | | | | | | | | TBR=jhawkins TEST=none BUG=none Review URL: http://codereview.chromium.org/2841016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50283 0039d316-1c4b-4281-b951-d872f2087c98
* TTF: Reenable some disabled tests.vandebo@chromium.org2010-06-181-1/+1
| | | | | | | | | | | | | | | | (recommit changes that were reverted, minus troublesome one original CL: http://codereview.chromium.org/2819011 ) DevToolsSanityTest.TestConsoleLog seems to work ProxyResolverV8Test.FAILS_ReturnUnicode VectorCanvasTest.FAILS_Matrix TEST=none BUG=disabled tests Review URL: http://codereview.chromium.org/2870014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50279 0039d316-1c4b-4281-b951-d872f2087c98
* FAILS tests should not turn the bot red.vandebo@chromium.org2010-06-181-1/+1
| | | | | | | | | | | | | | | | | | | Revert 50258 - TTF: Reenable some disabled tests. DevToolsSanityTest.TestConsoleLog seems to work ProxyResolverV8Test.FAILS_ReturnUnicode DepTest.FAILS_TestDepDisable VectorCanvasTest.FAILS_Matrix TEST=none BUG=disabled tests Review URL: http://codereview.chromium.org/2819011 TBR=vandebo@chromium.org Review URL: http://codereview.chromium.org/2862016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50261 0039d316-1c4b-4281-b951-d872f2087c98
* TTF: Reenable some disabled tests.vandebo@chromium.org2010-06-181-1/+1
| | | | | | | | | | | | | | DevToolsSanityTest.TestConsoleLog seems to work ProxyResolverV8Test.FAILS_ReturnUnicode DepTest.FAILS_TestDepDisable VectorCanvasTest.FAILS_Matrix TEST=none BUG=disabled tests Review URL: http://codereview.chromium.org/2819011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50258 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 49982 - patchthakis@chromium.org2010-06-161-1/+0
| | | | | | | TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/2825006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50002 0039d316-1c4b-4281-b951-d872f2087c98
* patchthakis@chromium.org2010-06-161-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49982 0039d316-1c4b-4281-b951-d872f2087c98
* Map Liberation Sans Mono and Ascender Sans Mono to Courier New.jshin@chromium.org2010-06-161-4/+11
| | | | | | | | | | | | | | | | | | | They're metrically compatible with each other, but the former is sans serif (monospace) while ther latter is serif (monospace), which is why we didn't include this mapping in the two previous CLs (one by Evan and the other by me). However, on ChromeOS, we use 'Ascender Sans Mono' as a substitute for Courier New so that they have to be regarded as 'identical'. Without this change, a text node styled with 'Courier New' is not rendered with our replacement font while a text node styled with 'Courier New, momospace' or 'monospace' is rendered with our replacement font. BUG=cros:4006 TEST=See the bug. Review URL: http://codereview.chromium.org/2838003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49975 0039d316-1c4b-4281-b951-d872f2087c98
* Mac/clang: Uncontentious fixes.thakis@chromium.org2010-06-111-1/+1
| | | | | | | | | | | | | * Remove unused variables * Make types in h and cc files agree * Use subclasses if we call subclass methods * Fix one real bug (`if (a); a->foo()`) * Fix forward declarations to be correct * Don't mark some definitions with "extern" Review URL: http://codereview.chromium.org/2730015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49570 0039d316-1c4b-4281-b951-d872f2087c98
* Treat "Ascender Sans" and "Ascender Serif" as equivalent to jshin@chromium.org2010-06-071-4/+9
| | | | | | | | | | | | | | | | | | | | "Arial" and "Times New Roman" as Liberation Sans/Serif are. Ascender Sans/Serif are metrically compatible fonts with the Arial/Times New Roman. The names are tentative and will change when they're finally released. I didn't add 'MONOSPACE' to FontEquivClass enum for 'Courier New => Ascender Sans Mono'. We can do that when the font and its name are finalized. BUG=cros:3815 (http://crosbug.com/3815 ) TEST=Without Liberation/Arial/TNR on a machine but with Ascender Sans/Serif, go to a page specifying Arial and Times New Roman. Ascender Sans/Serif are used in their place and there is no noticeable layout issue. Review URL: http://codereview.chromium.org/2674004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49077 0039d316-1c4b-4281-b951-d872f2087c98
* chunk of straightforward ifdef/include changes for BSD portpvalchev@google.com2010-05-191-4/+4
| | | | | | | based on sprewell's patch Review URL: http://codereview.chromium.org/2069009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47687 0039d316-1c4b-4281-b951-d872f2087c98
* GYP changes for FreeBSD and OpenBSDpvalchev@google.com2010-05-141-1/+1
| | | | | | Review URL: http://codereview.chromium.org/1480002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47327 0039d316-1c4b-4281-b951-d872f2087c98
* NSSize is equivalent to CGSize in the 64-bit Mac environment.mark@chromium.org2010-05-141-0/+4
| | | | | | | | BUG=44215, 18323 TEST=none Review URL: http://codereview.chromium.org/2134003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47308 0039d316-1c4b-4281-b951-d872f2087c98
* Skia roll 536:560agl@chromium.org2010-04-277-24/+62
| | | | | | | | | | | | This also includes Evan's patch: http://codereview.chromium.org/1611033 This roll sits after a revert to Skia's hairline change so, hopefully, doesn't need any rebaselines. The try servers mostly agree although there's one (clip-path-text-and-shape.svg on Windows) that I need to keep on eye on. (That's why I'm landing this before MTV is active.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45696 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Make image dragging 162.4% more awesome.thakis@chromium.org2010-04-051-0/+3
| | | | | | | | | | | | | | | | | | | Also needs a webkit patch to do anything ( https://bugs.webkit.org/show_bug.cgi?id=37069 ), but can be landed independently. BUG=11457,18992 TEST=(all require the webkit patch, so this won't work yet) http://html5demos.com/drag and http://ljouanneau.com/lab/html5/demodragdrop.html Dragging should show image http://www.google.com/ Dragging google image should show image http://www.travelvivi.com/wp-content/uploads/2009/09/Eiffel_Tower.jpg Dragging image should work, drag image should be smaller than image itself Random website Mark some text, drag it. Should show drag cursor and no image Review URL: http://codereview.chromium.org/1539018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43631 0039d316-1c4b-4281-b951-d872f2087c98
* Eliminate WebCore include paths when compiling Chromium code.darin@chromium.org2010-04-031-3/+0
| | | | | | | | | | | | | In the process of trying to do this, I discovered some unnecessary config.h includes as well as some remaining WebCore function calls. R=dglazkov BUG=none TEST=none Review URL: http://codereview.chromium.org/1521010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43574 0039d316-1c4b-4281-b951-d872f2087c98
* linux: add a NonHintedSans font to test_shellagl@chromium.org2010-03-251-3/+1
| | | | | | | | This is used by an upcoming layout test. http://codereview.chromium.org/1303001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42612 0039d316-1c4b-4281-b951-d872f2087c98
* linux: be more conservative in Liberation font fallbackevan@chromium.org2010-03-232-66/+41
| | | | | | | | | | | | | Rather than encoding all of the supposedly metric-compatible fonts from fontconfig, let's only whitelist fonts we know really improve the web for users. The Helvetica and Courier New substitutes don't look too great. BUB=39099 Review URL: http://codereview.chromium.org/1235001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42399 0039d316-1c4b-4281-b951-d872f2087c98
* Move image codec stuff to toplevel gfx.ben@chromium.org2010-03-181-1/+1
| | | | | | | | | TBR=darin BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41911 0039d316-1c4b-4281-b951-d872f2087c98
* Remove WebCore usage from vector_canvas_unittest.ccdarin@chromium.org2010-03-121-20/+16
| | | | | | | | | | R=maruel BUG=none TEST=none Review URL: http://codereview.chromium.org/916001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41460 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 40951 - UpStreamimg *image_decoder_unittest. Used WebKit API's ↵kkanetkar@chromium.org2010-03-101-9/+2
| | | | | | | | | | | | | | | | ImageDecoder to decouple WebCore deps. Corresponding WebKit Bug 35415. BUG=28063 TEST=Run unit tests. Review URL: http://codereview.chromium.org/661231 TBR=yaar@chromium.org Review URL: http://codereview.chromium.org/802001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41112 0039d316-1c4b-4281-b951-d872f2087c98
* svn prop fixes. Applied to all files not in third_party.pkasting@chromium.org2010-03-091-10/+10
| | | | | | | | | | | | * Removed eol-style, executable and mergeinfo from BMP/GIF/ICO/JPEG files, and set correct mime-type. * Removed executable and mergeinfo from .c/.cc/.cpp/.h/.m/.mm and .gyp files, and set eol-style to LF. TBR=evanm BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40991 0039d316-1c4b-4281-b951-d872f2087c98
* UpStreamimg *image_decoder_unittest. Used WebKit API's ImageDecoder toyaar@chromium.org2010-03-081-2/+9
| | | | | | | | | | | decouple WebCore deps. Corresponding WebKit Bug 35415. BUG=28063 TEST=Run unit tests. Review URL: http://codereview.chromium.org/661231 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40951 0039d316-1c4b-4281-b951-d872f2087c98
* linux: handle basic metric-compatibile font fallbackevan@chromium.org2010-03-082-24/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a page CSS asks for: font-family: Arial, sans-serif; and you don't have Arial, fontconfig tries to provide a substitute. However, as far as I can tell there is no way to distinguish fontconfig picking Liberation Sans (a metric-equivalent substitute for Arial) or it picking a bad substitute like Times New Roman. So historically we didn't allow fontconfig to do any fallback at all. (In this example, we would then match attempt to match sans-serif, which as a last resort we do allow fontconfig to do fallback on, so it could pick e.g. DejaVu Sans or any other font matching "sans".) Frustratingly, fontconfig knows whether a font substitute is an equivalent font or just a last-resort fallback one -- in the XML files the equivalents are marked with 'binding="same"' -- but I played around with the API for a few hours and couldn't figure out any way to get this information out of it. So I hardcode a list of equivalent fonts. Ugh. This fixes some sites where they specify Arial and then have pixel-width-specified page layout that breaks when you use any other sans-serif font. BUG=18159,32005,33125,others I've since forgotten about TEST=uninstall Arial; visit one of the sites mentioned in the bug list Review URL: http://codereview.chromium.org/668127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40912 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll to r55636.levin@chromium.org2010-03-081-0/+1
| | | | | | | | | | One minor build fix due to WebKit r55633. TBR=michaeln@chromium.org Review URL: http://codereview.chromium.org/668172 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40878 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: make "NonAntiAliasedSans" a magic font name.agl@chromium.org2010-03-021-1/+3
| | | | | | | | | | | This will be used in a layout test for per-strike renderer preferences. BUG=none TEST=Future layout test http://codereview.chromium.org/660383 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40410 0039d316-1c4b-4281-b951-d872f2087c98
* Add library support for subpixel rendering of images during Resize().brettw@chromium.org2010-03-012-2/+128
| | | | | | | | | BUG=34809 TEST=No test since inactive by default. For a very manual test, modify Resize() to only call the subpixel variant. Then go to your favorite web page (with some image) and choose Zoom > Smaller git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40292 0039d316-1c4b-4281-b951-d872f2087c98
* Separate neon flags from armv7, because some platforms have armv7a but no neon.piman@chromium.org2010-02-261-4/+12
| | | | | | | | For ffmpeg, I copied the "arm" configs (which include neon) into "arm-neon" configs, and changed HAVE_NEON=1 to 0 in the existing ones. Also, I removed the explicit cflags in ffmpeg.gyp since they are already set in common.gypi Review URL: http://codereview.chromium.org/660067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40163 0039d316-1c4b-4281-b951-d872f2087c98
* Move skia_utils_gtk.cc/.h to app/gfx/. Original patch by Thiago Farina (see ↵pkasting@chromium.org2010-02-263-57/+1
| | | | | | | | | http://codereview.chromium.org/660063 ), r=me. BUG=22853 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40083 0039d316-1c4b-4281-b951-d872f2087c98
* Solaris: Second set adding in Solaris as an OS optionevan@chromium.org2010-02-183-4/+6
| | | | | | | | | | TEST=compiles BUG=30101 Patch by James Choi <jchoi42@pha.jhu.edu>. Review URL: http://codereview.chromium.org/606075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39362 0039d316-1c4b-4281-b951-d872f2087c98
* Make clicking on side tabs to select them work. ben@chromium.org2010-02-113-55/+0
| | | | | | | | | | | | Use a simple round rect for the visual treatment. Add some rect conversion utils. http://crbug.com/34509 TEST=none Review URL: http://codereview.chromium.org/597012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38856 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 38828 - Make clicking on side tabs to select them work.ben@chromium.org2010-02-113-0/+55
| | | | | | | | | | | | | | Use a simple round rect for the visual treatment. Add some rect conversion utils. http://crbug.com/34509 TEST=none Review URL: http://codereview.chromium.org/597012 TBR=ben@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38834 0039d316-1c4b-4281-b951-d872f2087c98
* Make clicking on side tabs to select them work.ben@chromium.org2010-02-113-55/+0
| | | | | | | | | | | | Use a simple round rect for the visual treatment. Add some rect conversion utils. http://crbug.com/34509 TEST=none Review URL: http://codereview.chromium.org/597012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38828 0039d316-1c4b-4281-b951-d872f2087c98
* Enable the use of Freetype's emboldening in Chrome/Linux. Skia's is not so ↵senorblanco@chromium.org2010-02-071-0/+4
| | | | | | | | | | | pretty. BUG=http://crbug.com/22360 TEST=fast/encoding/denormalised-voiced-japanese-chars.html Review URL: http://codereview.chromium.org/583001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38320 0039d316-1c4b-4281-b951-d872f2087c98
* FreeBSD/OpenBSD ifdefs for skiapvalchev@google.com2010-02-046-10/+11
| | | | | | Review URL: http://codereview.chromium.org/569036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38080 0039d316-1c4b-4281-b951-d872f2087c98
* OpenBSD/FreeBSD GYP changes (most of the remaining ones)pvalchev@google.com2010-02-041-2/+2
| | | | | | Review URL: http://codereview.chromium.org/565043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38079 0039d316-1c4b-4281-b951-d872f2087c98
* Dropping unconnected obsolete vsprops files.bradnelson@google.com2010-02-031-11/+0
| | | | | | | | | BUG=8042 TEST=None Review URL: http://codereview.chromium.org/567033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38016 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for gratuitous fake emboldening of already-bold fonts on Linux.senorblanco@chromium.org2010-02-031-1/+1
| | | | | | | | | BUG=22360 TEST=none Review URL: http://codereview.chromium.org/564038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37974 0039d316-1c4b-4281-b951-d872f2087c98
* Linux/fontconfig: support retrieving a default font via CreateTypeface(NULL, ↵tschmelcher@chromium.org2010-02-011-2/+0
| | | | | | | | | | | | | NULL, ...). This is needed in order for SkTypeface::UniqueID(NULL) to not crash. (By removing the else branch, Match() is called with resolved_family_name as the empty string, which it supports.) TEST=built and tested O3D on Linux x64 and tried to render "Arial" on a system that didn't have it; verified resulting call to UniqueID(NULL) did not crash and the app successfully rendered text with some sort of default font BUG=none Review URL: http://codereview.chromium.org/551210 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37758 0039d316-1c4b-4281-b951-d872f2087c98
* Lands paint logging with the appropriate include this time:sky@chromium.org2010-01-201-0/+4
| | | | | | | | | | | | Adds some CHECKs in hopes of figuring out why we're getting crashes during painting. BUG=25324 TEST=none TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/554009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36636 0039d316-1c4b-4281-b951-d872f2087c98
* Reverts CHECKs as broke build. I likely need to include base/logging.sky@chromium.org2010-01-191-3/+0
| | | | | | | | | | BUG=25324 TEST=none TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/542129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36572 0039d316-1c4b-4281-b951-d872f2087c98
* Adds some CHECKs in hopes of figuring out why we're getting crashessky@chromium.org2010-01-191-0/+3
| | | | | | | | | | | during painting. BUG=25324 TEST=none Review URL: http://codereview.chromium.org/543118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36567 0039d316-1c4b-4281-b951-d872f2087c98
* arm: fix debug buildpiman@chromium.org2010-01-131-7/+24
| | | | | | Review URL: http://codereview.chromium.org/542028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36094 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Add favicons to task manager.thakis@chromium.org2010-01-132-0/+8
| | | | | | | | | | | | | Pull NSImage cache out of search engine dialog into its own class, reuse that. Implement browser icon code in task_manager_resource_provider's browser resource provider. BUG=13156 TEST=Open task manager. You should see icons. Open search engine manager, should still show icons. Review URL: http://codereview.chromium.org/549021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36087 0039d316-1c4b-4281-b951-d872f2087c98
* Skia roll 457:466agl@chromium.org2010-01-041-0/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35471 0039d316-1c4b-4281-b951-d872f2087c98
* Returns an error immediately without sending IPC message when a font family ↵yusukes@google.com2009-12-183-1/+10
| | | | | | | | | | | | | | | | | | | | | | name to resolve is too long. This change is important when a site has @font-face rule like: // http://paulirish.com/webkit-fontface-hang.html @font-face{font-family:testfont;src:url('data:font/ttf;base64,AA.....<<looooooooooong base64 data>>.....aQ==')} In such a case, WebCore first calls SkFontHost::CreateTypeface() with the (possibly very long) data-uri string itself, then calls SkFontHost::CreateTypefaceFromStream() with decoded byte stream. Since render_sandbox_host_linux.cc just ignores too long IPC message, the renderer process could block indefinitely waiting for a reply inside recvmsg() system call called from SkFontHost::CreateTypeface(). I'm not sure if the WebCore behavior (i.e. calling CreateTypeface with data-uris) is reasonable, but I believe the Skia part is better to be fixed anyway. Non data-uri font family names could be very long too: @font-face{font-family:testfont;src:local('AA........AA');} BUG=29861 TEST=First, set up your Linux SUID Sandbox binary: http://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment. Then start Chromium and visit http://paulirish.com/webkit-fontface-hang.html or http://typekit.com/. Verify that the renderer does not freeze. Review URL: http://codereview.chromium.org/507037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34915 0039d316-1c4b-4281-b951-d872f2087c98
* Roll DEPS for skia 451:457. USE_NEW_BUILDER was removed, since it's now ↵senorblanco@chromium.org2009-12-171-3/+0
| | | | | | | | | | | enabled by default in Skia. BUG=none TEST=none Review URL: http://codereview.chromium.org/502057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34865 0039d316-1c4b-4281-b951-d872f2087c98
* Roll DEPS for Skia 450:451. Enable USE_NEW_BUILDER in Skia. Mark as failingsenorblanco@chromium.org2009-12-044-21/+12
| | | | | | | | | | | | the ~85 layout tests that now need rebaselining (due to slight pixel coverage change). Refactor SkUserConfig.h a tad. Rebaseline unit test VectorCanvasTest.ClippingIntersect. BUG=24646 TEST=none Review URL: http://codereview.chromium.org/464044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33863 0039d316-1c4b-4281-b951-d872f2087c98
* Preserve optimized scrolling in the presence of multiple animating rects.darin@chromium.org2009-12-044-21/+27
| | | | | | | | | | | | | | Change PlatformCanvas so that it only fills with "sea foam green" when bitmap data is not externally supplied. Modifying the interface to make this an option bloated the CL too much. I may do this as a follow-up. Adds a new --show-paint-rects command line flag that will render a border around paint rects to help debug and study WebKit painting issues. R=brettw BUG=25905 TEST=none Review URL: http://codereview.chromium.org/414016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33861 0039d316-1c4b-4281-b951-d872f2087c98
* arm: Add thumb target and associated fixesjoel@chromium.org2009-12-041-6/+3
| | | | | | | | | | Add arm_thumb=1 to GYP_DEFINES to enable BUG=29203 Review URL: http://codereview.chromium.org/463027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33799 0039d316-1c4b-4281-b951-d872f2087c98