ade0c810ea
Bug 1157064 - implementation of font-display. r=heycam,khuey
2016-01-07 14:03:05 +09:00
40dd7eed07
Bug 1157064 - font-display descriptor parsing. r=dbaron
2016-01-07 14:02:58 +09:00
57630a6b66
Bug 1219352 - Pack the FrameMetrics booleans. r=botond
...
--HG--
extra : commitid : AWU27s9DKzG
2016-01-06 20:50:01 -05:00
0d7d89c6a4
Bug 1219352 - Rearrange fields in FrameMetrics. r=botond
...
This patch:
- Maintains a consistent ordering between the lists of fields in the
FrameMetrics constructor, operator==, IPC read/write functions, and the
actual order of fields in FrameMetrics. As part of this, missing default
initializers are added to the FrameMetrics constructor, and fields omitted
from the operator== are explicitly noted.
- Moves all the boolean values to the end of the set of field (for better
packing).
- Moves the scroll id and parent scroll id to the front of the list, so that
the operator== can fail faster in the common case.
--HG--
extra : commitid : 6ink6xmxH38
2016-01-06 20:50:01 -05:00
5e3b5adcf2
Bug 1219352 - Update a couple of bool-setters to take a bool argument. r=botond
...
--HG--
extra : commitid : BSeR1YwEqNy
2016-01-06 20:50:01 -05:00
5053ceed98
Bug 1230352 - Update to Oculus SDK 0.8.0,r=vlad
2015-09-22 09:38:28 -04:00
4b651d870f
Bug 1231881 - Remove NativeSurfaceType::CAIRO_SURFACE. r=bas.
...
We have both NativeSurfaceType::CAIRO_CONTEXT and
NativeSurfaceType::CAIRO_SURFACE. They both refer to DrawTargets with Cairo
backends. The only reason for having both is so you can call GetNativeSurface()
and get either the |cairo_t*| or the underlying |cairo_surface_t*|.
I argue that this convenience confuses things more than it helps. This patch
removes CAIRO_SURFACE, and adds explicit cairo_get_target() calls where
necessary.
--HG--
extra : rebase_source : 6f1701a8131d854c7f623272182029847876754e
2016-01-05 14:24:08 -08:00
8d672d003f
Bug 1236167: P1. Do not attempt to destroy a non allocated surface. r=nical
2016-01-07 09:30:32 +11:00
2e3ff601d6
Bug 842894 - Support DirectWrite using the Skia backend. r=bas
2016-01-06 11:35:04 -08:00
871a98516f
Bug 1236266 - Use release assert in IPC serialization for regions (r=jmuizelaar)
2016-01-06 10:22:54 -08:00
e5a4fce1c1
Bug 1236266 - Don't generate invalid empty regions in pixman (r=jmuizelaar)
2016-01-06 10:22:54 -08:00
d051a1eb3c
Merge m-c to inbound. a=merge
2016-01-06 09:50:26 -05:00
1d22ec87d3
Merge inbound to m-c. a=merge
2016-01-06 09:43:47 -05:00
8612fa1f8c
Backout Bug 1221056 - make the destroy messages for PTexture and PCompositable part of the current transaction when applicable. r=sotaro
...
For breaking Firefox OS boot startup (see bug 1237197)
--HG--
extra : commitid : Eoiq2mNqfw9
2016-01-06 14:59:35 +01:00
ef979a7523
Bug 1234343 (part 2) - Add a missing GfxMemoryImageReporter::DidAlloc() call. r=Bas.
...
--HG--
extra : rebase_source : 12a3b1cbdb89627ff956bf34021ba88de4e418a9
2016-01-05 18:26:29 -08:00
59e6a9ae67
Bug 1234343 (part 1) - Make GfxMemoryImageReporter::sAmount signed. r=Bas.
...
This is so that if it goes negative (due to missing DidAlloc() calls) it shows
up in about:memory as a negative number, rather than a huge positive number.
--HG--
extra : rebase_source : 8022cd5a958f2fa14ff9af26624de8b795e4d4d5
2016-01-05 18:26:17 -08:00
6b46bb89da
Backed out changeset ad7bcc14bc9c (bug 1236266) for causing perma leaks
...
--HG--
extra : commitid : 8D1VqyqYDLw
2016-01-06 14:02:58 +05:30
becd126e52
Backed out changeset 38405f32bcbc (bug 1236266)
...
--HG--
extra : commitid : IwCw2YT3aTZ
2016-01-06 14:02:50 +05:30
247ba57ebf
Backed out changeset 39aca33612f1 (bug 1236266)
...
--HG--
extra : commitid : AalW5RyEMsG
2016-01-06 14:02:47 +05:30
9a22f96774
Bug 1236266 - Fix up review comment (r=jmuizelaar)
2016-01-05 22:10:40 -08:00
2d5dab22d4
Bug 1236266 - Don't generate invalid empty regions in pixman (r=jmuizelaar)
2016-01-05 21:59:46 -08:00
30155a0988
Bug 1236266 - Use release assert in IPC serialization for regions (r=jmuizelaar)
2016-01-05 21:59:46 -08:00
12b9a82473
Bug 1220629 - Part 6: Implement PushLayer/PopLayer API in several wrapper DT types. r=jrmuizel
...
--HG--
extra : rebase_source : 5a421568fa20b23d7ceef71eb58014e29dbc1c76
2016-01-06 00:23:33 +01:00
b5ed4b63ba
Bug 1220629 - Part 5: Implement PushLayer/PopLayer API for Direct2D 1.1. r=jrmuizel
...
--HG--
extra : rebase_source : ec545e1bde6741e9bc461b1a6ab966e7b6c9236a
2016-01-06 00:23:29 +01:00
e41984d2c7
Bug 1220629 - Part 4: Allow gfxContext to use the native pushlayer implementations based on a pref. r=jrmuizel
...
--HG--
extra : rebase_source : 78f439fd806576f9c4cd55ea49f12a2994e46fc3
2016-01-06 00:04:42 +01:00
6b108bc5cb
Bug 1220629 - Part 3: Implement PushLayer/PopLayer API in cairo. r=jrmuizel
...
--HG--
extra : rebase_source : 058ed10659456f59761535f7538ced6df5425aec
2016-01-06 00:04:38 +01:00
fd6c57413d
Bug 1220629 - Part 2: Prepare DrawTargetD2D1 for the possibilities of layers existing inside it. r=jrmuizel
...
--HG--
extra : rebase_source : 97685e7ee1e9249dd465bfcee40bd7401f2a6e4e
2016-01-05 09:03:08 +01:00
e6f7f09b31
Bug 1220629 - Part 1: Add PushLayer/PopLayer API to DrawTarget baseclass. r=jrmuizel
...
--HG--
extra : rebase_source : 49ad072bc61d9d46c0b5d3fe2797624922f5083c
2016-01-05 09:00:59 +01:00
00e6ef23e8
Bug 1236167 - Don't attempt to take a compositor snapshot if parameters are incorrect. r=jrmuizel
2016-01-06 13:56:00 +01:00
22854d8a96
Bug 1234472 - Add gonk sideband stream handling to gfx ipc r=nical
2016-01-05 20:50:39 -08:00
4d9fc4395b
Bug 1221056 - make the destroy messages for PTexture and PCompositable part of the current transaction when applicable. r=sotaro
2016-01-05 14:03:26 +01:00
1fe62dee68
Bug 1156742 Part 24: Add new Recorded event to record font data. r=bas
...
We create and destroy ScaledFonts for every piece of text we write.
That causes a huge amount of duplicated data within the recording.
This splits out the recording of the font data itself from the ScaledFont.
The key generated to determine uniqueness could probably be fairly easily faked, but for our purposes that doesn't matter.
2016-01-05 10:08:58 +00:00
401ebce4ed
Bug 1156742 Part 22: Change ScaledFontDWrite to support creation from TrueType Collection data. r=bas
2016-01-05 10:08:58 +00:00
74de9c73ae
Bug 1156742 Part 21: Use GetDirect3D11Device instead of DrawTargetD2D::GetDWriteFactory to determine if DWrite fonts should be used. r=Bas
...
This method will allow for acceleration being disabled through prefs and blacklisting.
2016-01-05 10:08:58 +00:00
b24d50e720
Bug 1156742 Part 20: Move Moz2D PreferenceAccess into its own header. r=bas
...
This is so we can add a new preference in Part 21, which has nothing to do with logging.
2016-01-05 10:08:58 +00:00
0c7ef20c4d
Bug 1156742 Part 19: Implement GetFontFileData for ScaledFontWin. r=bas
2016-01-05 10:08:58 +00:00
532eb778ab
Bug 1156742 Part 18: Fix the way we hold custom font data so that they can be recorded with Moz2D. r=bas
2016-01-05 10:08:57 +00:00
3b91f57af4
Bug 1156742 Part 17: Add virtual destructor to RecorededEvent and fix subsequent crash with DWrite playback fonts. r=bas
2016-01-05 10:08:57 +00:00
af9224e713
Bug 1156742 Part 16: Add recording and forwarding of Matrix attribute set for Moz2D recording. r=bas
2016-01-05 10:08:57 +00:00
20e589aec1
Bug 1156742 Part 13: Create a Moz2D PrintTranslator. r=bas
...
A better solution to the ScaledFonts issue comes in Part 24.
2016-01-05 10:08:57 +00:00
e707786501
Bug 1156742 Part 12: Record CreateSimilarDrawTarget separately for Moz2D. r=bas
...
This is so we can create the real print DrawTarget from our nsDeviceContext at the beginning of each page.
Default behaviour for other Translators is still to always use CreateSimilarDrawTarget.
2016-01-05 10:08:57 +00:00
fdd98bfb6b
Bug 1156742 Part 9: Add a new nsIDeviceContextSpec for proxied printing. r=roc
...
This also changes aPrintToFileName parameter for BeginDocument to an nsAString& from char16_t*.
Having a char16_t* caused a pain with VS2105 where wchar_t != char16_t (as on VS2103), after it had been sent over IPDL.
This could have been worked around with casting, but this seemed like the tidier solution.
2016-01-05 10:08:57 +00:00
b8e80a4a76
Bug 1156742 Part 8: Change gfxWindowsSurface, so that a non-printing surface can be used when recording a print. r=roc
2016-01-05 10:08:57 +00:00
f35de7e1be
Bug 1156742 Part 7: Refactor nsDeviceContext.cpp to use printing surface for size and nsIDeviceContextSpec for DPI and scale. r=roc
...
These changes are to make using an off screen surface behind our DrawTarget in the child easier.
It still creates the real printing surface for some of the calculations,
removing this will be required for future tightening of the sandbox.
2016-01-05 10:08:57 +00:00
c6e61e8846
Bug 1156742 Part 4: Add an in memory DrawEventRecorder. r=bas
2016-01-05 10:08:57 +00:00
9536340a3a
Bug 1156742 Part 3: Add support for FontType::CAIRO to CreateScaledFontForTrueTypeData on Windows. r=bas
...
Parts of this change and related code get moved around in Part 24.
2016-01-05 10:08:56 +00:00
7b7cad771e
Bug 1156742 Part 2: Make gfx thebes/gl/2d work with UNICODE defined. r=bas, r=glandium
2016-01-05 10:08:56 +00:00
940fb516d4
Bug 1156742 Part 1: Change Moz2D recording, so that it can be used in isolation. r=bas
...
These are mainly changes to make sure we have recorded relevant dependencies to each draw operation.
Where we can't record them on the fly like this, it makes sure the object has originated from our DrawTarget.
2016-01-05 10:08:56 +00:00
b78efb440f
Bug 1234566: Use LoadLibraryA instead of LoadLibrary in some skia Windows code to allow UNICODE to be defined. r=lsalzman
...
Patch already landed upstream on skia in commit 7a897c0f796df0a1c5b4ee5930b29bfed17ad1b4.
2016-01-05 10:08:56 +00:00
3ebd8ac2fd
Bug 1235858 - Record the time stamp, use it for crash reports. r=botond
2015-12-30 11:47:00 +01:00
c6013bd937
Bug 1228507 - Initialize mBlendOpacity. r=Bas
...
--HG--
extra : rebase_source : d596023a4d50572ef597d9a34772354d25c8fcc9
2015-11-27 00:10:00 -05:00
a9f31c44eb
Bug 1232219 (part 4) - Enable -Wunused for C code, except where it's too annoying. r=glandium.
...
--HG--
extra : rebase_source : febc9aac7ec5e3699742e728065c370dcee4f0f3
2015-12-16 22:59:42 -08:00
b9aee9ebb5
Bug 1194851 - Add helper functions HasDisplayPort() and HasCriticalDisplayPort(). r=kats
...
This makes it clearer whether we're just checking if a displayport exists,
or we're actually consuming its value.
--HG--
extra : source : 70bb222e860669a6cf6e803dbd57f088ca4fbc04
2015-12-16 17:22:23 -05:00
06e901cb9f
Bug 1231550 - Use DrawTarget instead of gfxContext and/or nsRenderingContext in many places in font/text code. r=jfkthame.
...
AutoTextRun now only needs a DrawTarget instead of an nsRenderingContext, and
similar nsRenderingContext/gfxContext-to-DrawTarget replacements can be
propagated a long way up the call graph. This patch replaces 93 occurrences of
nsRenderingContext and 135 occurrences of gfxContext with DrawTarget; that's
13% of them.
The patch is mostly plumbing changes. A couple of not-entirely-plumbing
changes:
- It adds a comment about the null check in
gfxGlyphExtents::GetTightGlyphExtentsAppUnits().
- A couple of functions simply had an unused gfxContext or nsRenderingContext
parameter removed, e.g. SetLineBreaks().
--HG--
extra : rebase_source : 8f56994bb4d254a86788b17ab2864ebc758a7e6b
2015-12-15 13:56:41 -08:00
cebf4a5bfa
Bug 1228211 (part 2) - Remove unused functions in nsRenderingContext. r=dholbert.
...
The following functions in nsRenderingContext are unused and this patch removes
them: the zero-arg constructor, the |DrawTarget*| constructor, and both Init()
functions.
--HG--
extra : rebase_source : 5e8a5d6eb76b97491de3299409d2d6488ea20613
2015-11-25 14:34:57 -08:00
0fb767e1f4
Bug 1232231 - BorrowDrawTarget can return nullptr - be ready for it. r=nical
...
--HG--
extra : rebase_source : de5fe177dd405078ba9c370b49b3168a8a51bc29
extra : source : e22122a3bf90033684f1ce762ea29d7e10ae3b93
2016-01-04 09:50:00 -05:00
f447bec986
Bug 1233619 (part 2) - Moz2Dify BeginUpdate() and BeginUpdateBackground() functions. r=roc.
...
The only non-trivial change is in BasicPaintedLayer::Validate().
--HG--
extra : rebase_source : 7eed0e384d2d856d918ad025b09e29f796017f51
2015-12-17 19:39:10 -08:00
67e5c3ea2c
Bug 1233619 (part 1) - Remove unneeded gfxContext argument from EndUpdate() and EndUpdateBackground() functions. r=roc.
...
--HG--
extra : rebase_source : cc16e7a77d8d60706cd0406c859aece88d7b18c3
2015-12-17 19:39:09 -08:00
b66e705f39
Bug 1236762 - Simplify locking APIs for SharedSurface. - r=jrmuizel
2016-01-05 15:57:44 -08:00
2866425265
Backed out changeset e22122a3bf90 (bug 1232231) for possibly breaking weightmapping-12579.html CLOSED TREE
...
--HG--
extra : commitid : Ht74vrHsG2d
2016-01-05 16:48:49 -08:00
b657d4b13b
Bug 1232231 - BorrowDrawTarget can return nullptr - be ready for it. r=nical
2016-01-04 09:50:00 -05:00
ac84b221c9
Bug 1235613 - Make gfxCriticalError/Note strings in gfx/ unique. r=jrmuizel
...
--HG--
extra : transplant_source : %8F%1DcB%3A%25%94%95G%EF%B4U%CE%B9%10%E1%A3%BC%E2%3D
2015-12-29 14:03:58 -05:00
5512fbeae7
Bug 1229983 - verify that paths are finite in DrawTargetSkia::Stroke/Fill to handle Canvas paths containing infs. r=jmuizelaar
2015-12-30 13:39:13 -05:00
3493a38202
Bug 1232822 (part 6) - Move RefCairo() from gfxContext to gfxFont. r=jfkthame.
...
Because gfxContext will one day disappear, and gfxFont seems like a good place
to move it to.
2015-12-15 20:10:04 -08:00
16ee19fe3f
Bug 1232822 (part 5) - Moz2Dify GetRoundOffsetsToPixels(). r=jfkthame.
...
Make GetRoundOffsetsToPixel() take a DrawTarget instead of a gfxContext. This
requires moving it into gfxFontShaper. The only change of note within the
function is the use of aDrawTarget->GetTransform().HasNonTranslation() instead
of CurrentMatrix().HasNonTranslation().
2015-12-15 13:56:40 -08:00
8dba3aa24f
Bug 1232822 (part 4) - Remove unused argument from SetPotentialLineBreaks(). r=jfkthame.
2015-12-15 13:56:40 -08:00
62db02a52f
Bug 1232822 (part 3) - Moz2Dify gfxFont::CalcXScale() and gfxFont::PostShapingFixup(). r=jfkthame.
...
This boils down to these two lines being equivalent:
Size t = aContext->UserToDevice(Size(1.0, 0.0));
Size t = aDrawTarget->GetTransform() * Size(1.0, 0.0);
The rest is just plumbing.
2015-12-15 13:56:40 -08:00
52308b4cb3
Bug 1232822 (part 2) - Moz2Dify SetupGlyphExtents(). r=jfkthame.
...
The gfxContextMatrixAutoSaveRestore in SetupGlyphExtents() is now obviously not
needed, and the rest is trivial.
2015-12-15 13:56:40 -08:00
2a8e0225ac
Bug 1232822 (part 1) - Moz2Dify SetupCairoFont(). r=jfkthame.
...
This is now trivial.
2015-12-15 13:56:40 -08:00
e542083969
Bug 1233605 - Cull some uses of gfxContext. r=dholbert.
...
--HG--
extra : rebase_source : eed590fa5fd806f2ed8d754e139e7dd28a8b52e7
2015-12-17 19:36:09 -08:00
5b989f37cb
Bug 1235740 - Remove warning for missing Oculus VR Library from terminal output, as it is spammy and not necessary r=dholbert
...
--HG--
extra : rebase_source : 751b010bda82f69c3e700fc0ed2a25bd375ccdc7
2015-12-30 16:26:37 -08:00
d8849aea49
Bug 1235803 - Remove erroneous assertion r=dholbert
...
- Removed an unnecessary assertion that was erroneously triggering
on shutdown in B2G Mochitests.
--HG--
extra : rebase_source : 1b0d997bf7610fa62d2647f5003edc47d61e3fa6
2015-12-30 14:46:38 -08:00
e0c501a1c1
Bug 1235738 - Move MOZ_DEBUG_DEFINES to build frontend. r=gps
...
MOZ_DEBUG_DEFINES are essentially defines used everywhere. So treat them as
feeding the initial value for DEFINES in each moz.build sandbox. This allows
the kind overrides that was done in the past by resetting MOZ_DEBUG_DEFINES
in Makefiles.
2015-12-31 07:27:23 +09:00
9137c3ddf5
Bug 739117 - Avoid bidi-wrapping the text to be shaped if Core Text direction override API is available. r=jdaggett
2015-12-30 20:29:48 +00:00
08826ed976
Bug 1234494 - part 1 - don't build in Skia GPU code if support is disabled, r=jrmuizel
2015-12-30 12:17:32 -05:00
5fb86d302c
Backed out changeset 21607399e25e (bug 1229983) for failing own R(C) test. r=backout
2015-12-30 15:00:44 +01:00
647eadb92b
Bug 1223193: P2. Cancel ImageBridge proxy functions if shutdown has started. r=nical
2015-12-30 16:52:41 +11:00
eb979d623f
Bug 1223193: P1. Make ImageBridgeChild::mShuttingDown atomic. r=nical
2015-12-30 15:13:19 +11:00
d861b1e812
Bug 1176024 - Have TextureClient::Lock check that it can expose a DrawTarget when it makes sense. r=Bas
2015-12-30 13:23:01 +01:00
69278658e4
Bug 1227210: Ensure the mask and the surface are in the right space when being blended. r=mattwoodrow
2015-11-26 15:51:49 +01:00
cafcefe183
Bug 1229983 - verify that paths are finite in DrawTargetSkia::Stroke/Fill to handle Canvas paths containing infs. r=jmuizelaar
2015-12-16 17:53:11 -05:00
e8e3860c44
Bug 1235407 - Part 3: Force a reset when OpenSharedHandle fails. r=milan
2015-12-30 01:30:47 +01:00
667d7a5517
Bug 1235407 - Part 2: Add ability to force device resets through gfxWindowsPlatform. r=milan
2015-12-30 01:30:47 +01:00
3d1ad5faa9
Bug 1235407 - Part 1: Add telemetry probe to record forced resets. r=milan
2015-12-30 01:30:47 +01:00
41802e0eef
Bug 1234419 - remove unnecessary -fkeep-inline-functions from Skia moz.build, r=jrmuizel
2015-12-29 16:20:01 -05:00
0c83ce5c05
Bug 1182048 - Part 2: Implement e10s support for WebVR,r=vlad
2015-09-17 14:23:13 -07:00
a04d1679f3
Backed out changeset c1f17f489417 (bug 1176024) for crashes
2015-12-29 14:29:09 +01:00
d0ca78d5be
Bug 1176024 - Have TextureClient::Lock check that it can expose a DrawTarget when it makes sense. r=Bas
2015-12-29 13:05:50 +01:00
983842c663
Bug 1187322 - Fix bustage.
...
--HG--
extra : commitid : 8apW68WiB8L
2015-12-29 12:13:24 +01:00
258bcc1298
Bug 1187322 - Don't require accelerated OpenGL contexts for BasicCompositor on OS X. r=jrmuizel
...
--HG--
extra : commitid : D8wNlw49VVb
extra : rebase_source : f0c93866f09de396e835a2920d5db54efe53ffda
extra : amend_source : 7ed5dda1bd555ecc353137bfc9b00b10992a86a1
2015-12-23 16:22:55 +01:00
722e5d85bf
Backed out changeset a7c9fc3f1701 (bug 739117) for unexpected Core Text crashes.
2015-12-29 09:08:24 +00:00
6247e12af2
Bug 1205713 - Merge ImageHostOverlay/ImageClientOverlay to ImageHost/ImageClient r=nical
2015-12-29 01:07:33 -08:00
f90087f1fa
Bug 739117 - Avoid bidi-wrapping the text to be shaped if Core Text direction override API is available. r=jdaggett
2015-12-29 08:23:28 +00:00
46ab91d7db
Bug 1226751 - Remove 358732-* crashtests, since they only race between not testing anything and accidentally setting and leaving a non-default font zoom, breaking later tests
...
--HG--
extra : rebase_source : d8314dd0166f5217355fe1daafdcd85b77f7effb
2015-12-28 20:41:46 -08:00
7d9b6c8298
Bug 1234418 - Not trust glyph run starts from a cluster start character. r=jfkthame
...
--HG--
extra : source : f5014f1b1a5b7cda0c2631aef7b3f2480b0f42ed
2015-12-29 10:52:06 +11:00
35c7e42d9d
Backed out changeset 3242bee2d956 (bug 1234418) for windows build bustage
...
--HG--
extra : commitid : FtpnZwAEEIm
2015-12-28 15:32:12 -08:00
845f0ba847
Bug 1234418 - Not trust glyph run starts from a cluster start character. r=jfkthame
...
--HG--
extra : source : 9c199fbc892dd5712454f0efbcb286c9fc03ff00
2015-12-29 09:48:37 +11:00
3549505a7d
Bug 1195788 - Set arithmetic composite clamp to true for D2D filter node. r=bas
...
--HG--
extra : source : 143122bf7036ee754e587fc99a049078d34eb936
2015-12-29 09:48:37 +11:00
6e689a3d75
Backed out changeset d569d015069d (bug 1176024) for crashes
2015-12-28 12:07:16 +01:00
04ccc28a85
Bug 1176024 - Have TextureClient::Lock check that it can expose a DrawTarget when it makes sense. r=Bas
2015-12-28 10:46:25 +01:00
John Daggett
Kartikaya Gupta
kearwood
Nicholas Nethercote
Jean-Yves Avenard
Mason Chang
Bill McCloskey
Ryan VanderMeulen
Johan Lorenzo
Nigel Babu
Bas Schouten
Nicolas Silva
Sotaro Ikeda
Bob Owen
Milan Sreckovic
Bogdan Postelnicu
Botond Ballo
Jeff Gilbert
Wes Kocher
Lee Salzman
Kearwood (Kip) Gilbert
Mike Hommey
Jonathan Kew
Sebastian Hengst
Carsten "Tomcat" Book
Markus Stange
Phil Ringnalda
Xidorn Quan