mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
8637eba4b3
- remove poisondata stuff (cf5b5d29e5) - Bug 1218488 - clarify buffer ownership for nsICanvasRenderingContextInternal::GetBuffer; r=Bas,baku (dba4272b73) - Bug 1167215 - Re-apply CompositeUntil calls when we get a new batch of textures. r=roc (d57a8ac9e9) - Bug 1220923 - Make nsIntRegion a typedef for IntRegionTyped<UnknownUnits>. r=nical (a5f4e1e283) - Bug 1220898 - Make nsIntMargin a typedef for mozilla::gfx::IntMargin. r=nical (8bdb2f191a) - Bug 1205913 - Differentiate YCbCr, NV12 and RGB textures when drawing layer borders. r=nical (ff5d3dc7df) - Bug 1203376 - Honor filter region settings for lighting filters. r=mstange (8d0565e99a) - Bug 1220512 - ensure next frame status is updated before notifying MediaDecoder::PlaybackEnded. See bug 1220512 comment 1 for the detail. r=cpearce. (c2f434b5d4) - Bug 1207964 - Remove workaround from bug 1080461. r=jwwang (19bff98c14) - Bug 1199904: Only start decoding ahead after explicitly requesting data. r=gerald (8712637b49) - Bug 1197664: Report the total number of decoded frames. CLOSED TREE r=kentuckyfriedtakahe (422827d1af) - Bug 1178596: Reset frame size queue after flushing. r=cpearce (dd40ac4e6b) - Bug 1205911: P1. Cancel pending demux request when searching for next keyframe. r=edwin (8a03e6904f) - Bug 1188313: P1. Attempt to seek audio near video. r=cpearce (a8b6465d97) - Bug 1205911: P2. Ensure demuxer is reset before performing a seek. r=edwin (e93534a1d1) - bit of Bug 1185886: P2 (c2e89be4a3) - bit of Bug 1211443 (98fbb4a4a2) - Bug 1089586: Abort pending seeks. r=jwwang (e81f453204) - Bug 1195094: P1. Properly detects SPS changes for decoders requiring Annex B. r=cpearce (976febcd7c) - Bug 1195094: P2. Ensure TrackInfo object passed to constructor is never modified. r=cpearce (d5c15b2368) - Bug 1218577: Use only Blank PDM if enabled. r=kamidphish (a7e06549cc) - Bug 1210231 - Enable unencrypted <video> playback using Adobe's GMP for decoding. r=jya (7f80702b89) - Bug 1214932 - Add media.wmf.enabled pref. r=jya (8c183c0dd1) - Bug 1213173: Always use FFmpeg regardless of version. r=kentuckyfriedtakahe (e5af2c0c91) - Bug 1211787 - Improve the accuracy of MediaDecoderStateMachine::GetDecodedAudioDuration(). r=roc. (16d755c555) - Bug 1193614 - Schedule State Machine when VideoQueue() is low. r=cpearce (fe608da5fd) - Bug 1219984. Part 1 - remove EventPassMode::Both. In order to support multiple arguments, all arguments must be either moved or copied. r=kinetik. (2ee049008c) - Bug 1219984. Part 2 - add support for multiple arguments. r=kinetik. (1c70d5d69b) - Bug 1219974 - Add DisconnectIfExists() to MediaEventListener. r=kinetik. (43f6ae90b0) - Bug 1192109 - Fix insufficient includes in MediaEventSource.h. r=kinetik. (09eca240a1) - mData, aData (5e87f70853) - Bug 1219330 - Handle PlanaYCbCrImage::SetData failure. r=jya, jesup (144f3c266f) - Bug 1222308. Assume frames that are very old will never be composited. r=nical (1da9be2527) - space (45b67caa85) - Bug 1182426 - Set PlanarYCbCrImage's size in VP8TrackEncoder GTest. r=roc (d70a4d20c4) - Bug 1217080. Move recycling functionality into RecyclingPlanarYCbCrImage. r=nical (e2b2f650d7) - Bug 1216644 - part 1 - simple s/nsAutoArrayPtr/UniquePtr/ changes in gfx/; r=jrmuizel (d19bc51f94) - Bug 1216644 - part 2 - make gfxFontEntry::mUVSData a UniquePtr; r=jrmuizel (605a1bc6b1) - Bug 1216644 - part 3 - make BufferRecycleBin store UniquePtrs; r=jrmuizel (7781281266) - Add an RAII class to lock and unlock textures. (bug 1222863 part 1, r=nical) (abdec485f3) - Use RAII for more TextureClient locking cases. (bug 1222863 part 2, r=nical) (b35486ed3d) - Bug 1212288 - Make ImageContainer::AllocateProducerID callable on all threads; r=roc (fc569b8e48) - Bug 1140947 - Correct some logging in SourceBufferResource.cpp. r=cajbir (fcbb38056c) - Bug 1199573: [MSE] Properly handle partial media header received prior a discontinuity. r=gerald (f1cda54fa3) - Bug 1213726 - Remove AbstractMediaDecoder::HasInitializationData(). r=kinetik. (62f09f816e) - Bug 1034081 - Never seek before startTime. r=rillian Only adjust seek target up to startTime (44139b20ec) - Bug 1196353 - Use standard Xiph extradata format to pass headers from demuxers to decoders. r=jya (41f8dee5af) - Bug 1202332 - XiphExtradataToHeaders miscalculates final header length. r=derf (eec20f90f0) - Bug 1208799: [webm] Use first track found. r=kinetik (7196355e31) - Bug 1190472 - part 1 - improve MediaRawDataQueue's reference-counting behavior; r=kinetik (47b066b8e8) - Bug 1190472 - part 2 - delete unused MediaRawDataQueue::Push method; r=kinetik (f8246efe1b) - Bug 1190472 - part 3 - optimize pushing an entire queue onto MediaRawDataQueue; r=kinetik (045b389bf8) - Bug 1213024 - Comment the structured clone reading and writing, r=fitzgen (1b64f9f502) - Bug 1201620 - Make SavedFrame stacks structured cloneable; r=sfink (87e9b0a04b) - Bug 1221456 - Avoid C4819 warning spam. r=glandium (3dde3cb10a) - Bug 1213752 - IonMonkey: MIPS: Enable MIPS64 support. r=glandium (36da4cbd99) - Bug 1214175 - Make hash table manipulation infallible in Shape::fixupGetterSetterForBarrier() r=terrence (98e5e601ec) - Bug 1215337 - Cache slotSpan(), r=terrence (3e992f9f06) - No Bug - Include jswin.h in jsobj.cpp to unbreak windows non-unified bustage. (r=terrence over IRC) (92cba3254f) - Bug 1052139 - Make prototype-setting first create Object.prototype so that subsequent prototype chain-splicing will work correctly. r=bz (34a8d00d9f) - Bug 1172076 - Improve js::DumpBacktrace to include raw frame pointers and types. r=jandem (f11eb1763b) - Bug 1052139 - Change the boolean constant controlling whether the global object prototype chain is immutable, to enable immutable-prototype enforcement generally. r=duh (b7a1124feb) - Bug 1215363 - Fix a couple of OOM handling issues and make JS_sprintf funcions crash when passed illegal format strings r=terrence (c778891dd3) - Bug 1211331 - Ensure that GC slices are terminated such that we can safely iterate the heap. r=terrence (440308a333) - Bug 1224048 - Use stable hashing for the temporary tables in the JSON parser; r=jonco (7d058f44c9) - Bug 1215678 - Nuke cross compartment wrappers if we fail to add them to the wrapper map r=terrence (8e9e535a11) - Bug 1200732 - Use stable hashing for AutoCycleDetectorSet; r=jonco (68237bdea4) - more poisondata removal (6479b20220) - Bug 1218488 - clarify buffer ownership for nsICanvasRenderingContextInternal::GetBuffer; r=Bas,baku (ae89d929b2) - Bug 1207378 (Part 1) - Add support for a frame rect to Downscaler. r=tn (234866c32f) - Bug 1207378 (Part 2) - Use Downscaler to remove first-frame padding when downscaling GIFs. r=tn (5e995bdca2) - Bug 1207378 - Add FrameRect to non-skia version of BeginFrame. r=seth (939f0510eb) - Bug 1204394 (part 1) - Using StreamingLexer in the BMP decoder. r=seth. (77eaa1e125) - Bug 1204394 (part 2) - Add bmpsuite to the BMP reftests. r=seth. (237a902461) - Bug 1214476 - Remove unused code for encoding BMPv2 files. r=seth. (b8382357d7) - Bug 1213613 (part 1) - Formatting cleanups for nsBMPEncoder.h. r=seth. (4ee65bc173) - Bug 1213613 (part 2) - Move some BMP-related structs. r=seth. (15289784ce) - Bug 1215156 - move SetPixel* functions into nsBMPDecoder.cpp; r=seth (a143c843d4) - Bug 1215763 - part 1 - remove unnecessary nsAutoPtr.h includes; r=seth (f8a3a1f6b0) - Bug 1180715 (1/4) - Track image LoadTime to compare with file mtime. review=seth (bdbd25752c) - Bug 1180715 (2/4) - Provide a nsIFileURL interface for thumbnails. review=ttaubert (24c506569d) - Bug 1147562 - Update remaining callsites of newChannel before landing the shim in toolkit/ (r=gijs) (f7f2ab798f) - Bug 1163866 - Set originalURI correctly for moz-page-thumb:// channels. r=adw (3c7c97928e) - Bug 1180715 (3/4) - Drop parseURI from newChannel2. review=ttaubert (5b409e7d4b) - Bug 1180715 (4/4) - Use nsIURL methods instead of RegExp. review=ttaubert (1f7a026e06) - Bug 1209705 - Propagate the DrawResult for temporary surfaces to the caller in ClippedImage. r=tn (c5be1c7df4) - Bug 1215763 - part 2 - s/nsAutoPtr/UniquePtr/ in image/; r=seth (58c5da3bd2) - Bug 1215763 - part 3 - s/nsAutoArrayPtr/UniquePtr/ in nsBMPEncoder; r=seth (62bc939286) - Bug 1213613 (part 3) - Fix color-scaling of 16bpp BMP images. r=seth. (d06d511564) - Bug 1214072 (part 1) - Read BMP bitfields during metadata decoding. r=seth. (56cc2c02cd) - Bug 1214072 (part 2) - Implement transparency properly for BMP images. r=seth. (b6b07c2d90) - Bug 1218823 - use UniquePtr<> in preference to delete[] in image/; r=seth (5cd21f89a2) - Bug 1215334 (part 1) - Avoid creating a fake header for BMP files in ICO files. r=seth. (67506fc53e) - Bug 1215334 (part 2) - Avoid creating a fake header for BMP files in ICO files. r=seth. (cf6c3f4553) - spacing (b91c58ec87) - Bug 1196494 - part 1: remove unnecessary GetClientBounds call in CompositorParent. r=jrmuziel (685f49ae9c) - Bug 1180008 - Define gtk_window_get_window_type in mozgtk. r=karlt (e7ca7db4d3) - Bug 863512 - Fixing xul dnd panels for linux. r=enndeakin (5d0faaf0dc) - Bug 1195002 - draw to MozContainer window to allow GTK to draw decorations, r=karlt (7a84272fe9) - Bug 1210249 - don't mess with toplevel widget when client side decorations are enabled. r=karlt (464e9ce3fb) - bug 1180008 use mGdkWindow instead of finding it from gtk_widget_get_window(mShell) r=acomminos (024f8bd5a7) - bug 1180008 don't measure size of decorations for override-redirect windows r=acomminos (416ffda363) - Bug 1026803 part 1 - Factor out a common utility class for converting wrapping native times to TimeStamps; r=karlt (915ecdfc40) - Bug 1026803 part 2 - Add an assertion that SystemTimeConverter's template parameter is unsigned; r=karlt (68ccf1569d) - Bug 1026803 part 3 - Make some simplifications to SystemTimeConverter; r=karlt (c38719b7de) - Bug 1026803 part 4 - Convert GTK native event times to timestamps; r=karlt (74ef903992) - Bug 1026803 part 5 - Convert CurrentXXXTimeGetter classes from functors to helper classes; r=karlt (06d49e5965) - Bug 1026803 part 6 - Make SystemTimeConverter detect clock skew; r=karlt (d663ab72b2) - Bug 1026803 part 7 - Store the CurrentX11TimeGetter as a member object on nsWindow; r=karlt (f6a04e6e9c) - Bug 1026803 part 8 - Add ability for CurrentX11TimeGetter to perform an asynchronous request of the current time; r=karlt (961dab1d91) - Bug 1026803 part 8b - Factor out an IsTimeNewerThanTimeStamp method; r=karlt (1afb9f511a) - Bug 1026803 part 9 - Return DOMHighResTimeStamp objects from Event.timeStamp on Linux for Nightly/Aurora builds; r=karlt (975432dbd8) - Fix bustage from changeset 5c5dc6f367ac (bug 1026803) r=bustage on CLOSED TREE (c0be358f84) - fix bustage (e5e97018b6) - Bug 1196494 - part 2: only update nsWindow client offset when _NET_FRAME_EXTENTS property actually changes. r=eihrul (dd7e913d49) - Bug 1170342 - Disable XInput2 by default on GTK3. r=karlt (6a52d65a98) - Bug 1208904 - Fix a condition in nsWindow::SetNonClientMargins; r=roc (fe8c7b3e77) - Bug 1199892 - "Mouse cursor flickers in Flash object with wmode opaque/transparent". r=roc (6d50037e14) - Bug 1171101 - Remove pointer events and gesture scrolling dependencies. r=smaug (3aa5c89ea4) - Bug 978679. Implement touch events for GTK3. r=karlt (adafe58640) - Bug 1209774 - Transform from GDK coords to layout device pixels before calling DispatchEvent. r=karlt (4c81cf74ea) - Bug 1191293. Remove harmless assertion that is triggered by GTK3. r=masayuki (e0b9eb2c80) - Bug 978679. Convert GDK touch event coordinates properly. r=karlt (dfeae08f47) - restore some XP vs Vista differences, Bug 925599 bits (88ff57f06f) - Bug 1220392 - use UniquePtr<T[]> instead of nsAutoArrayPtr<T> in widget/; r=roc (35026aa4c9) - Bug 1214616 - Remove encoding conversion methods from nsPrimitiveHelpers. r=emk. (3a4bdbbc8e) - Bug 1216611 - add mozilla::MakeUniqueFallible and convert uses throughout the tree; r=Waldo (8672c2e3d9) - Bug 1216964 - remove nsAutoArrayPtr use from ActorsParent; r=khuey (ddff59241a) - Bug 1219903 - use UniquePtr<T[]> instead of delete[] calls in layout/generic/; r=dholbert (8b96067a6e) - Bug 1220190 - use UniquePtr<T[]> instead of delete[] calls in layout/xul/; r=dholbert (065b3c521c) - Bug 1220714 - use UniquePtr<T[]> instead of nsAutoArrayPtr<T> in layout/; r=dholbert (6a8245751c) - Bug 1221550 - use UniquePtr<T[]> instead of nsAutoArrayPtr<T> in intl/; r=smontagu (67868889e2) - Bug 1232374 - remove nsAutoArrayPtr usages from toolkit/; r=froydnj (d65586df26) - Bug 1170522 - expose whether or not we're in tablet mode to xul/js/css, r=jimm,ted (5cb134a8d4) - bug 1163872 - Fix a unified build issue in nsXPLookAndFeel.cpp. r=jimm (925e38abed) - bug 1217602 - remove nsIPKIParamBlock r=Cykesiopka (b5f0fc8dfd) - missing bit of old bug (fdcb4fe143) - Bug 1221453 - Use ObjDirPaths for GENERATED_INCLUDES and merge with LOCAL_INCLUDES. r=gps (a0537fff83) - Bug 1194948 - Build gfx/ipc in unified mode and mark as FAIL_ON_WARNINGS. r=BenWa (c88b356ac8) - Bug 815952 - Stop clearing clipboard data originating from a private window after closing private windows. r=ehsan (b94fea061d) - Bug 943296 - widget/gtk/nsDragService.cpp should assume Gtk uses UTF-8. r=karlt. (3613e87354) - Bug 1186661 - Draw drag and drop alpha pixmap correctly on GTK3. r=karlt (ca884af03b) - Bug 983843 - Switch to GtkOffscreenWindow for drag source widget, fixing ghost tabs on some GTK versions. r=karlt (ab56f9d764) - bug 1216916 clean up when InvokeDragSession() fails r=roc (30c811c33e) - Bug 1198128 - Fix -Wshadow warnings in widget/gtk. r=karlt (06bc60349e) - Merge branch 'dev' of https://github.com/rmottola/Arctic-Fox into dev (c79378b7c9) - Bug 1206915 - Move dumping of compositor textures under its own environment variable. r=mattwoodrow (b8ba4f0fbf) - Bug 1213007 - Part 1. Implementing gfxCrash. r=dvander (e307f9d543) - Bug 1208661 - Show display list and layer textures in-line in the HTML paint dump. r=BenWa (7047c68964) - Relax the driver crash guard on nightly and e10s builds. (bug 1200825, r=jgilbert) (1dd81b1257) - Bug 1214802 - gfxEnv - consolidate environment variables used by the graphics code in one place. r=botond (afb61356c6) - Bug 1217192 - Use gfxCriticalNote where we're already using the non-default construction parameter. r=mchang (d04ca17de5) - addback some crash stuff (8a78973a71) - Fix layers.acceleration.force-enabled not working. (bug 1212659, r=jrmuizel) (5eb85d8f64) - Bug 1142516 - Improve assertions and logging on the compositor side. r=Bas (cca63735e5) - Bug 1194335. Use a StackArray for RECTS so we see them in the minidumps. r=mattwoodrow (1a83a134e8) - Bug 1192058 - For DXGI_PRESENT_PARAMETERS, set pDirtyRects to nullptr if DirtyRectsCount == 0. r=BenWa (f78ff0df24) - Bug 1204922 - More information about crashes. r=bas (53cbd02c12) - Bug 1222033 - Rename gfxCrash to gfxDevCrash. r=jrmuizel (32351d0bc7) - Bug 1209812 (part 1) - Remove casts between cairo_format_t and gfxImageFormat. r=nical. (c1bc5cd74c) - Bug 1209812 (part 2) - Remove gfxImageFormat::A1. r=nical. (99f665ad80) - Bug 1182426 - Sort includes in VP8TrackEncoder.cpp alphabetically. r=roc (5f10334ba8) - Bug 1182426 - Don't try to encode new frames of a size other than the initial in VP8TrackEncoder. r=roc (8fb0b8f0d9) - Bug 1182426 - Flatten YUV formats conversion code in VP8TrackEncoder. r=roc (0853d098f7) - Bug 1182426 - Convert non-PlanarYCbCRImages in VP8TrackEncoder. r=roc (d2d78fa94a) - Bug 1204106 - Use correct alpha blend modes for OVER in CompositorOGL. r=jrmuizel (5cc211b9d6) - Bug 1207326 - Part 1: Correct projection clipping rectangle,r=matt.woodrow (8329afb6a7) - Bug 1207326 - Part 2: Add reftest,r=jmuizelaar (d17d6c5d4f) - Bug 1209446 - Make sure mFrameInProgress flag is set to true only when we actually begin drawing new frame. r=nical (4ff48c4149) - Disable screen and multiply mix-blend-mode support in the D3D11 and OGL compositors. (bug 1135271, r=mattwoodrow) (9b4c11a289) - Bug 1210189 - Use nsScreenGonk in nsWindow::StartRemoteDrawing() r=mwu (2653a33972) - Bug 1210514 - Fix color inversion when BasicCompositor is used on gonk r=nical (141fee3bfb) - Bug 1209812 (part 3) - Rename SurfaceFormat::R5G6B5 as R5G6B5_UINT16. r=Bas. (915e7eaba3) - Bug 1209812 (part 4) - Add comments to SurfaceFormat. r=jrmuizel,Bas. (ef1977582f) - Bug 1209812 (part 5) - Add endian-neutral variants to SurfaceFormat. r=nical,Bas. (93c49df8c5) - Bug 1171671 - Simplify Boot Animation control r=mwu (94c4f89b45) - Bug 1210182 - Implement GrallocTextureHostBasic r=nical (4e5ea5b92c) - Bug 1209812 (follow-up) - Android bustage fix on a CLOSED TREE. r=me. (8b2fa6268d) - Bug 1178513 - Added RGBA8888 to RGB565 converter. r=mattwoodrow (8ba5dbd3c9) - Bug 1160689 - thumbnail image corruption on certain videos. r=sotaro (278a2e29f6) - Bug 1204922: When ResizeBuffers fails, make no attempt to do subsequent paints until it succeeds again. r=milan (0c040d8228) - Bug 1215027 - Fix EndFrameForExternalComposition() r=nical (bab4690e54) - Bug 1215364 - Implement BasicCOmpositor::EndFrameForExternalComposition r=nical (c8b9c7bfb9) - Bug 1213968 - Renew the surface on iOS when resuming the compositor r=kats (73489dc21c) - Bug 1201318 - Factor out AddFamily. r=jdaggett (3f2556b8b4) - Bug 1201318 - revise OSX system font handling. r=mstange (f8a8f5f562) - Bug 1163877 - Part 1: Add storage for other FontFaceSets a FontFace is in. r=jdaggett (ab3a16b597) - Bug 1163877 - Part 2: Allow FontFaces to be added to multiple FontFaceSets. r=jdaggett (9b2dd7e5c9) - Bug 1163877 - Part 3: Update state on, and reflow documents for, all FontFaceSets that contain a FontFace whose user font entry updated. r=jdaggett (215db30569) - Bug 1192986 Fix test_interfaces.html to expect Cache API and font loading to be released. r=ehsan (8db9ef1df8) - Bug 1193019 - Rename CSSFontFaceLoadEvent to FontFaceSetLoadEvent. r=khuey (53f373c53d) - Bug 1163877 - Part 4: Tests. r=jdaggett (c6053ca8b4) - Bug 1180415 - initialize downloadable font pattern from FTFace. r=karlt (04aa59ba79) - Bug 1163491 - map local fontnames to fontconfig patterns. r=karlt (ad10ebde2a) - Bug 543715 p1 - distinguish between italic and oblique. r=jfkthame (4c9a0abf64) - Bug 543715 p2 - italic/oblique reftests. r=jfkthame (90fb927148) - bug 1178733 - enable APZ for iOS. r=kats (e41702d9cd) - Bug 1169956. Backout bug 1073209 for tiled image regressions on OS X. r=jrmuizel (a80a29aaa3) - Bug 1073209 - Eliminate usage of CreateSamplingRestrictedDrawable on d2d backends. r=jrmuizel (9ac8781a52) - Bug 1204136 - Align DisplayPort on non-tiling platform. r=botond (1d8be17663) - Bug 1122918 - Put the logical values for 'float' and 'clear' behind a pref, and enable them only on nightly builds and for B2G. r=heycam (a428b34d66) - Bug 1183484 - Cycle collect FontFaceSetIterator. r=bzbarsky (dc49f3f098) - Bug 1027579 - Do not load fonts from the cache if LOAD_BYPASS_CACHE is set. r=jfkthame r=bz (6cf20c9119) - Bug 1201318 - Use nsAutoReleasePool from nsCocoaUtils.h. r=jdaggett (bfe5f05086) - Bug 1201403 - streamline MacOSFontEntry::HasFontTable implementation. r=jfkthame (da06064b86) - Bug 1165611 - fix font smoothing under Linux. r=karlt (166a96603b) - Bug 1160506 - support intra-family font fallback. r=heycam (f56f0507d0) - Bug 1165693 - Cache the result of calling FcConfigSubstitute for our sentinel font name, to make gfxFcPlatformFontList::FindFamily less expensive. r=jdaggett (09ace74bc1) - Bug 1165693 - patch 2 - Cache family-name lookups in gfxFcPlatformFontList::FindFamily, to avoid repeating expensive calls to FcConfigSubstitute. r=jdaggett (ab34bf45c0) - Bug 1174946 - Back out the (incorrectly-implemented) caching of sentinelFirstFamily from bug 1165693, which should be largely overshadowed by the mFcSubstituteCache anyway. r=jdaggett (9b7784b7a6) - Bug 1165766 - Crash in AddFontSetFamilies() r=jtd (13cba8e6c7) - Bug 1170421 - return first font suggested by fontconfig as the default font. r=karlt (426c6bd348) - Bug 1008169 - Font selection and font size dropdowns are reacting very slowly on press up/down,r=jaws (8e395026e1) - Bug 1166161 - Display available font from font.name-list.{family}.{lang} as fallback default font, instead of empty string. (045855761a) - Bug 1187680 - Use NSVisualEffectMaterialMenu for menus if it's available. r=smichaud (0cede2f295) - Bug 1190257. Use the previous vsync timestamp on windows 10. r=jrmuizel (7cf7e2644f) - Bug 1220699 - Add telemetry probe to measure vsync latency in the parent refresh driver. r=avih (347936dffb) - Bug 1221674 - Add telemetry probe in the content process to measure the time between refresh driver ticks. r=kats (1d1b885f10) - Bug 1198362 - Delete PreciseRefreshDriverTimer. r=roc (8fdcca758f) - Bug 1197898 - Delete vsync refresh driver preference. r=kats (eab85ba8dd) - Bug 1210250. Fallback to GDI fonts with a skia backend. r=jwatt (8c374b4bd3) - Bug 1208927 - Initialize queryD3DKMTStatistics so that it can't be accessed uninitialized; r=jrmuizel (69c6781a82) - Bug 1144946 - Delete PreciseRefreshDriverTimerWindowsDwmVsync refresh driver timer. r=roc (a78ccb3d42) - Bug 1187784 (part 4) - Replace nsBaseHashtable::EnumerateRead() calls in layout/ with iterators. r=heycam. (6a09016e6d) - Bug 1187784 (part 3) - Replace nsBaseHashtable::EnumerateRead() calls in layout/ with iterators. r=heycam. (1ce8abd863) - Bug 1187784 (part 2) - Replace nsBaseHashtable::EnumerateRead() calls in layout/ with iterators. r=heycam. (cd98be2f19) - Bug 1187784 (part 1) - Replace nsBaseHashtable::EnumerateRead() calls in layout/ with iterators. r=heycam. (09022514a9) - Bug 1217230 - Set mNeedToRecomputeVisibility true only when style or layout flush. r=seth (8f3edd57c0) - Bug 1167281 - sort scalable fonts first when resolving generic families under Linux. r=karlt (e2ecb89f31) - Bug 1186875 - check if FcFontSort returns non-null. r=jtd (087905da51) - Bug 1218617 - Invalidate whole widget area after external composition r=mattwoodrow (3901f416f5) - Bug 1153499 - Enable push and sw prefs. r=dougt,ehsan (ca0f3a105d) - Bug 1141415 - add expire setting of permission to SpecialPowers. r=jmaher (372bc0c930) - partial Bug 1196665 - Add originAttributes into SpecialPowers. r=bholley (b8407a1bcc) - Bug 1213151 - Part 1: Add a SpecialPowers API for cleaning up the STS data that works in both e10s and non-e10s modes; r=jdm (04bba17fd3) - Bug 1213151 - Part 2: Use SpecialPowers.cleanUpSTSData() in a few tests; r=jdm (cce5f23dac) - Bug 1214593 - Remove service worker periodic updater. r=ehsan (87cfebcd0d) - fix tests, fix spaces (9cba57e7ff) - Bug 1207499 - Part 10: Remove use of expression closure from testing/. r=jmaher (652faa8963) - Bug 1204154 - Clean up jar manifests that needlessly specify the source file. r=dao (f116e33bed) - Bug 1222943 (part 1) - Change Touch::mRadius from nsIntPoint to LayoutDeviceIntPoint. r=kats. (dcc6c15797) - Bug 1222943 (part 2) - Remove an unnecessary call to ToUnknownSize(). r=botond. (08f644f194) - Bug 1220925 - Event::GetScreenCoords should return CSSIntPoint instead of LayoutDevicePoint. r=botond (4e4f54e8e7) - Bug 943294 - Leave dealing with legacy codepages for clipboard data to Windows itself. r=jmathies. (124ecbfa3e) - Bug 1243507 - Reimplement non-Unicode clipboard formats as bug 943294 broke drag and drop between some Unicode-unaware apps. r=jimm (02edc31ed9) - ported Bug 1254980 - Ensure that text/html is still written to the clipboard. r=enndeakin a=sylvestre (9cd4c0e41a) - nsWindow: build fix (1c3e798a89)
527 lines
17 KiB
C++
527 lines
17 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include <new> // Workaround for bug in VS10; see bug 981264.
|
|
#include <cmath>
|
|
#include <utility>
|
|
|
|
#include "gfxDrawable.h"
|
|
#include "gfxPlatform.h"
|
|
#include "gfxUtils.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/Move.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "mozilla/Pair.h"
|
|
#include "mozilla/Tuple.h"
|
|
|
|
#include "ImageRegion.h"
|
|
#include "Orientation.h"
|
|
#include "SVGImageContext.h"
|
|
|
|
#include "ClippedImage.h"
|
|
|
|
namespace mozilla {
|
|
|
|
using namespace gfx;
|
|
using layers::LayerManager;
|
|
using layers::ImageContainer;
|
|
using std::make_pair;
|
|
using std::modf;
|
|
using std::pair;
|
|
|
|
namespace image {
|
|
|
|
class ClippedImageCachedSurface
|
|
{
|
|
public:
|
|
ClippedImageCachedSurface(already_AddRefed<SourceSurface> aSurface,
|
|
const nsIntSize& aSize,
|
|
const Maybe<SVGImageContext>& aSVGContext,
|
|
float aFrame,
|
|
uint32_t aFlags,
|
|
DrawResult aDrawResult)
|
|
: mSurface(aSurface)
|
|
, mSize(aSize)
|
|
, mSVGContext(aSVGContext)
|
|
, mFrame(aFrame)
|
|
, mFlags(aFlags)
|
|
, mDrawResult(aDrawResult)
|
|
{
|
|
MOZ_ASSERT(mSurface, "Must have a valid surface");
|
|
}
|
|
|
|
bool Matches(const nsIntSize& aSize,
|
|
const Maybe<SVGImageContext>& aSVGContext,
|
|
float aFrame,
|
|
uint32_t aFlags) const
|
|
{
|
|
return mSize == aSize &&
|
|
mSVGContext == aSVGContext &&
|
|
mFrame == aFrame &&
|
|
mFlags == aFlags;
|
|
}
|
|
|
|
already_AddRefed<SourceSurface> Surface() const
|
|
{
|
|
RefPtr<SourceSurface> surf(mSurface);
|
|
return surf.forget();
|
|
}
|
|
|
|
DrawResult GetDrawResult() const
|
|
{
|
|
return mDrawResult;
|
|
}
|
|
|
|
bool NeedsRedraw() const
|
|
{
|
|
return mDrawResult != DrawResult::SUCCESS &&
|
|
mDrawResult != DrawResult::BAD_IMAGE;
|
|
}
|
|
|
|
private:
|
|
RefPtr<SourceSurface> mSurface;
|
|
const nsIntSize mSize;
|
|
Maybe<SVGImageContext> mSVGContext;
|
|
const float mFrame;
|
|
const uint32_t mFlags;
|
|
const DrawResult mDrawResult;
|
|
};
|
|
|
|
class DrawSingleTileCallback : public gfxDrawingCallback
|
|
{
|
|
public:
|
|
DrawSingleTileCallback(ClippedImage* aImage,
|
|
const nsIntSize& aSize,
|
|
const Maybe<SVGImageContext>& aSVGContext,
|
|
uint32_t aWhichFrame,
|
|
uint32_t aFlags)
|
|
: mImage(aImage)
|
|
, mSize(aSize)
|
|
, mSVGContext(aSVGContext)
|
|
, mWhichFrame(aWhichFrame)
|
|
, mFlags(aFlags)
|
|
, mDrawResult(DrawResult::NOT_READY)
|
|
{
|
|
MOZ_ASSERT(mImage, "Must have an image to clip");
|
|
}
|
|
|
|
virtual bool operator()(gfxContext* aContext,
|
|
const gfxRect& aFillRect,
|
|
const Filter& aFilter,
|
|
const gfxMatrix& aTransform)
|
|
{
|
|
MOZ_ASSERT(aTransform.IsIdentity(),
|
|
"Caller is probably CreateSamplingRestrictedDrawable, "
|
|
"which should not happen");
|
|
|
|
// Draw the image. |gfxCallbackDrawable| always calls this function with
|
|
// arguments that guarantee we never tile.
|
|
mDrawResult =
|
|
mImage->DrawSingleTile(aContext, mSize, ImageRegion::Create(aFillRect),
|
|
mWhichFrame, aFilter, mSVGContext, mFlags);
|
|
|
|
return true;
|
|
}
|
|
|
|
DrawResult GetDrawResult() { return mDrawResult; }
|
|
|
|
private:
|
|
RefPtr<ClippedImage> mImage;
|
|
const nsIntSize mSize;
|
|
const Maybe<SVGImageContext>& mSVGContext;
|
|
const uint32_t mWhichFrame;
|
|
const uint32_t mFlags;
|
|
DrawResult mDrawResult;
|
|
};
|
|
|
|
ClippedImage::ClippedImage(Image* aImage,
|
|
nsIntRect aClip)
|
|
: ImageWrapper(aImage)
|
|
, mClip(aClip)
|
|
{
|
|
MOZ_ASSERT(aImage != nullptr, "ClippedImage requires an existing Image");
|
|
}
|
|
|
|
ClippedImage::~ClippedImage()
|
|
{ }
|
|
|
|
bool
|
|
ClippedImage::ShouldClip()
|
|
{
|
|
// We need to evaluate the clipping region against the image's width and
|
|
// height once they're available to determine if it's valid and whether we
|
|
// actually need to do any work. We may fail if the image's width and height
|
|
// aren't available yet, in which case we'll try again later.
|
|
if (mShouldClip.isNothing()) {
|
|
int32_t width, height;
|
|
RefPtr<ProgressTracker> progressTracker =
|
|
InnerImage()->GetProgressTracker();
|
|
if (InnerImage()->HasError()) {
|
|
// If there's a problem with the inner image we'll let it handle
|
|
// everything.
|
|
mShouldClip.emplace(false);
|
|
} else if (NS_SUCCEEDED(InnerImage()->GetWidth(&width)) && width > 0 &&
|
|
NS_SUCCEEDED(InnerImage()->GetHeight(&height)) && height > 0) {
|
|
// Clamp the clipping region to the size of the underlying image.
|
|
mClip = mClip.Intersect(nsIntRect(0, 0, width, height));
|
|
|
|
// If the clipping region is the same size as the underlying image we
|
|
// don't have to do anything.
|
|
mShouldClip.emplace(!mClip.IsEqualInterior(nsIntRect(0, 0, width,
|
|
height)));
|
|
} else if (progressTracker &&
|
|
!(progressTracker->GetProgress() & FLAG_LOAD_COMPLETE)) {
|
|
// The image just hasn't finished loading yet. We don't yet know whether
|
|
// clipping with be needed or not for now. Just return without memorizing
|
|
// anything.
|
|
return false;
|
|
} else {
|
|
// We have a fully loaded image without a clearly defined width and
|
|
// height. This can happen with SVG images.
|
|
mShouldClip.emplace(false);
|
|
}
|
|
}
|
|
|
|
MOZ_ASSERT(mShouldClip.isSome(), "Should have computed a result");
|
|
return *mShouldClip;
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED0(ClippedImage, ImageWrapper)
|
|
|
|
NS_IMETHODIMP
|
|
ClippedImage::GetWidth(int32_t* aWidth)
|
|
{
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->GetWidth(aWidth);
|
|
}
|
|
|
|
*aWidth = mClip.width;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ClippedImage::GetHeight(int32_t* aHeight)
|
|
{
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->GetHeight(aHeight);
|
|
}
|
|
|
|
*aHeight = mClip.height;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ClippedImage::GetIntrinsicSize(nsSize* aSize)
|
|
{
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->GetIntrinsicSize(aSize);
|
|
}
|
|
|
|
*aSize = nsSize(mClip.width, mClip.height);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ClippedImage::GetIntrinsicRatio(nsSize* aRatio)
|
|
{
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->GetIntrinsicRatio(aRatio);
|
|
}
|
|
|
|
*aRatio = nsSize(mClip.width, mClip.height);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<SourceSurface>)
|
|
ClippedImage::GetFrame(uint32_t aWhichFrame,
|
|
uint32_t aFlags)
|
|
{
|
|
DrawResult result;
|
|
RefPtr<SourceSurface> surface;
|
|
Tie(result, surface) = GetFrameInternal(mClip.Size(), Nothing(), aWhichFrame, aFlags);
|
|
return surface.forget();
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<SourceSurface>)
|
|
ClippedImage::GetFrameAtSize(const IntSize& aSize,
|
|
uint32_t aWhichFrame,
|
|
uint32_t aFlags)
|
|
{
|
|
// XXX(seth): It'd be nice to support downscale-during-decode for this case,
|
|
// but right now we just fall back to the intrinsic size.
|
|
return GetFrame(aWhichFrame, aFlags);
|
|
}
|
|
|
|
Pair<DrawResult, RefPtr<SourceSurface>>
|
|
ClippedImage::GetFrameInternal(const nsIntSize& aSize,
|
|
const Maybe<SVGImageContext>& aSVGContext,
|
|
uint32_t aWhichFrame,
|
|
uint32_t aFlags)
|
|
{
|
|
if (!ShouldClip()) {
|
|
RefPtr<SourceSurface> surface = InnerImage()->GetFrame(aWhichFrame, aFlags);
|
|
return MakePair(surface ? DrawResult::SUCCESS : DrawResult::NOT_READY,
|
|
Move(surface));
|
|
}
|
|
|
|
float frameToDraw = InnerImage()->GetFrameIndex(aWhichFrame);
|
|
if (!mCachedSurface ||
|
|
!mCachedSurface->Matches(aSize, aSVGContext, frameToDraw, aFlags) ||
|
|
mCachedSurface->NeedsRedraw()) {
|
|
// Create a surface to draw into.
|
|
RefPtr<DrawTarget> target = gfxPlatform::GetPlatform()->
|
|
CreateOffscreenContentDrawTarget(IntSize(aSize.width, aSize.height),
|
|
SurfaceFormat::B8G8R8A8);
|
|
if (!target) {
|
|
NS_ERROR("Could not create a DrawTarget");
|
|
return MakePair(DrawResult::TEMPORARY_ERROR, RefPtr<SourceSurface>());
|
|
}
|
|
|
|
RefPtr<gfxContext> ctx = new gfxContext(target);
|
|
|
|
// Create our callback.
|
|
RefPtr<DrawSingleTileCallback> drawTileCallback =
|
|
new DrawSingleTileCallback(this, aSize, aSVGContext, aWhichFrame, aFlags);
|
|
RefPtr<gfxDrawable> drawable =
|
|
new gfxCallbackDrawable(drawTileCallback, aSize);
|
|
|
|
// Actually draw. The callback will end up invoking DrawSingleTile.
|
|
gfxUtils::DrawPixelSnapped(ctx, drawable, aSize,
|
|
ImageRegion::Create(aSize),
|
|
SurfaceFormat::B8G8R8A8,
|
|
Filter::LINEAR,
|
|
imgIContainer::FLAG_CLAMP);
|
|
|
|
// Cache the resulting surface.
|
|
mCachedSurface =
|
|
MakeUnique<ClippedImageCachedSurface>(target->Snapshot(), aSize, aSVGContext,
|
|
frameToDraw, aFlags,
|
|
drawTileCallback->GetDrawResult());
|
|
}
|
|
|
|
MOZ_ASSERT(mCachedSurface, "Should have a cached surface now");
|
|
RefPtr<SourceSurface> surface = mCachedSurface->Surface();
|
|
return MakePair(mCachedSurface->GetDrawResult(), Move(surface));
|
|
}
|
|
|
|
NS_IMETHODIMP_(bool)
|
|
ClippedImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags)
|
|
{
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->IsImageContainerAvailable(aManager, aFlags);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
NS_IMETHODIMP_(already_AddRefed<ImageContainer>)
|
|
ClippedImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
|
|
{
|
|
// XXX(seth): We currently don't have a way of clipping the result of
|
|
// GetImageContainer. We work around this by always returning null, but if it
|
|
// ever turns out that ClippedImage is widely used on codepaths that can
|
|
// actually benefit from GetImageContainer, it would be a good idea to fix
|
|
// that method for performance reasons.
|
|
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->GetImageContainer(aManager, aFlags);
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
static bool
|
|
MustCreateSurface(gfxContext* aContext,
|
|
const nsIntSize& aSize,
|
|
const ImageRegion& aRegion,
|
|
const uint32_t aFlags)
|
|
{
|
|
gfxRect imageRect(0, 0, aSize.width, aSize.height);
|
|
bool willTile = !imageRect.Contains(aRegion.Rect()) &&
|
|
!(aFlags & imgIContainer::FLAG_CLAMP);
|
|
bool willResample = aContext->CurrentMatrix().HasNonIntegerTranslation() &&
|
|
(willTile || !aRegion.RestrictionContains(imageRect));
|
|
return willTile || willResample;
|
|
}
|
|
|
|
NS_IMETHODIMP_(DrawResult)
|
|
ClippedImage::Draw(gfxContext* aContext,
|
|
const nsIntSize& aSize,
|
|
const ImageRegion& aRegion,
|
|
uint32_t aWhichFrame,
|
|
Filter aFilter,
|
|
const Maybe<SVGImageContext>& aSVGContext,
|
|
uint32_t aFlags)
|
|
{
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->Draw(aContext, aSize, aRegion, aWhichFrame,
|
|
aFilter, aSVGContext, aFlags);
|
|
}
|
|
|
|
// Check for tiling. If we need to tile then we need to create a
|
|
// gfxCallbackDrawable to handle drawing for us.
|
|
if (MustCreateSurface(aContext, aSize, aRegion, aFlags)) {
|
|
// Create a temporary surface containing a single tile of this image.
|
|
// GetFrame will call DrawSingleTile internally.
|
|
DrawResult result;
|
|
RefPtr<SourceSurface> surface;
|
|
Tie(result, surface) =
|
|
GetFrameInternal(aSize, aSVGContext, aWhichFrame, aFlags);
|
|
if (!surface) {
|
|
MOZ_ASSERT(result != DrawResult::SUCCESS);
|
|
return result;
|
|
}
|
|
|
|
// Create a drawable from that surface.
|
|
RefPtr<gfxSurfaceDrawable> drawable =
|
|
new gfxSurfaceDrawable(surface, aSize);
|
|
|
|
// Draw.
|
|
gfxUtils::DrawPixelSnapped(aContext, drawable, aSize, aRegion,
|
|
SurfaceFormat::B8G8R8A8, aFilter);
|
|
|
|
return result;
|
|
}
|
|
|
|
return DrawSingleTile(aContext, aSize, aRegion, aWhichFrame,
|
|
aFilter, aSVGContext, aFlags);
|
|
}
|
|
|
|
static SVGImageContext
|
|
UnclipViewport(const SVGImageContext& aOldContext,
|
|
const pair<nsIntSize, nsIntSize>& aInnerAndClipSize)
|
|
{
|
|
nsIntSize innerSize(aInnerAndClipSize.first);
|
|
nsIntSize clipSize(aInnerAndClipSize.second);
|
|
|
|
// Map the viewport to the inner image. (Note that we don't take the aSize
|
|
// parameter of Draw into account, just the clipping region.)
|
|
CSSIntSize vSize(aOldContext.GetViewportSize());
|
|
vSize.width = ceil(vSize.width * double(innerSize.width) / clipSize.width);
|
|
vSize.height =
|
|
ceil(vSize.height * double(innerSize.height) / clipSize.height);
|
|
|
|
return SVGImageContext(vSize,
|
|
aOldContext.GetPreserveAspectRatio());
|
|
}
|
|
|
|
DrawResult
|
|
ClippedImage::DrawSingleTile(gfxContext* aContext,
|
|
const nsIntSize& aSize,
|
|
const ImageRegion& aRegion,
|
|
uint32_t aWhichFrame,
|
|
Filter aFilter,
|
|
const Maybe<SVGImageContext>& aSVGContext,
|
|
uint32_t aFlags)
|
|
{
|
|
MOZ_ASSERT(!MustCreateSurface(aContext, aSize, aRegion, aFlags),
|
|
"Shouldn't need to create a surface");
|
|
|
|
gfxRect clip(mClip.x, mClip.y, mClip.width, mClip.height);
|
|
nsIntSize size(aSize), innerSize(aSize);
|
|
if (NS_SUCCEEDED(InnerImage()->GetWidth(&innerSize.width)) &&
|
|
NS_SUCCEEDED(InnerImage()->GetHeight(&innerSize.height))) {
|
|
double scaleX = aSize.width / clip.width;
|
|
double scaleY = aSize.height / clip.height;
|
|
|
|
// Map the clip and size to the scale requested by the caller.
|
|
clip.Scale(scaleX, scaleY);
|
|
size = innerSize;
|
|
size.Scale(scaleX, scaleY);
|
|
} else {
|
|
MOZ_ASSERT(false,
|
|
"If ShouldClip() led us to draw then we should never get here");
|
|
}
|
|
|
|
// We restrict our drawing to only the clipping region, and translate so that
|
|
// the clipping region is placed at the position the caller expects.
|
|
ImageRegion region(aRegion);
|
|
region.MoveBy(clip.x, clip.y);
|
|
region = region.Intersect(clip);
|
|
|
|
gfxContextMatrixAutoSaveRestore saveMatrix(aContext);
|
|
aContext->Multiply(gfxMatrix::Translation(-clip.x, -clip.y));
|
|
|
|
return InnerImage()->Draw(aContext, size, region,
|
|
aWhichFrame, aFilter,
|
|
aSVGContext.map(UnclipViewport,
|
|
make_pair(innerSize, mClip.Size())),
|
|
aFlags);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
ClippedImage::RequestDiscard()
|
|
{
|
|
// We're very aggressive about discarding.
|
|
mCachedSurface = nullptr;
|
|
|
|
return InnerImage()->RequestDiscard();
|
|
}
|
|
|
|
NS_IMETHODIMP_(Orientation)
|
|
ClippedImage::GetOrientation()
|
|
{
|
|
// XXX(seth): This should not actually be here; this is just to work around a
|
|
// what appears to be a bug in MSVC's linker.
|
|
return InnerImage()->GetOrientation();
|
|
}
|
|
|
|
nsIntSize
|
|
ClippedImage::OptimalImageSizeForDest(const gfxSize& aDest,
|
|
uint32_t aWhichFrame,
|
|
Filter aFilter, uint32_t aFlags)
|
|
{
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
|
|
aFlags);
|
|
}
|
|
|
|
int32_t imgWidth, imgHeight;
|
|
if (NS_SUCCEEDED(InnerImage()->GetWidth(&imgWidth)) &&
|
|
NS_SUCCEEDED(InnerImage()->GetHeight(&imgHeight))) {
|
|
// To avoid ugly sampling artifacts, ClippedImage needs the image size to
|
|
// be chosen such that the clipping region lies on pixel boundaries.
|
|
|
|
// First, we select a scale that's good for ClippedImage. An integer
|
|
// multiple of the size of the clipping region is always fine.
|
|
nsIntSize scale(ceil(aDest.width / mClip.width),
|
|
ceil(aDest.height / mClip.height));
|
|
|
|
// Determine the size we'd prefer to render the inner image at, and ask the
|
|
// inner image what size we should actually use.
|
|
gfxSize desiredSize(imgWidth * scale.width, imgHeight * scale.height);
|
|
nsIntSize innerDesiredSize =
|
|
InnerImage()->OptimalImageSizeForDest(desiredSize, aWhichFrame,
|
|
aFilter, aFlags);
|
|
|
|
// To get our final result, we take the inner image's desired size and
|
|
// determine how large the clipped region would be at that scale. (Again, we
|
|
// ensure an integer multiple of the size of the clipping region.)
|
|
nsIntSize finalScale(ceil(double(innerDesiredSize.width) / imgWidth),
|
|
ceil(double(innerDesiredSize.height) / imgHeight));
|
|
return mClip.Size() * finalScale;
|
|
} else {
|
|
MOZ_ASSERT(false,
|
|
"If ShouldClip() led us to draw then we should never get here");
|
|
return InnerImage()->OptimalImageSizeForDest(aDest, aWhichFrame, aFilter,
|
|
aFlags);
|
|
}
|
|
}
|
|
|
|
NS_IMETHODIMP_(nsIntRect)
|
|
ClippedImage::GetImageSpaceInvalidationRect(const nsIntRect& aRect)
|
|
{
|
|
if (!ShouldClip()) {
|
|
return InnerImage()->GetImageSpaceInvalidationRect(aRect);
|
|
}
|
|
|
|
nsIntRect rect(InnerImage()->GetImageSpaceInvalidationRect(aRect));
|
|
rect = rect.Intersect(mClip);
|
|
rect.MoveBy(-mClip.x, -mClip.y);
|
|
return rect;
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|