Commit Graph

9946 Commits

Author SHA1 Message Date
James Willcox
1fb2df1aed Bug 980048 - Don't use EGL fences on Pandaboard r=jgilbert 2014-03-05 15:49:55 -06:00
James Willcox
39bceadc21 Bug 939276 - Use a single GLContext for all SkiaGL canvases r=jgilbert,vlad,gwright,bjacob
--HG--
rename : gfx/gl/GLContextSkia.cpp => gfx/gl/SkiaGLGlue.cpp
2014-03-05 15:49:37 -06:00
James Willcox
9953e94be2 Bug 956993 - Rely on OES_EGL_image_external for SharedSurface_EGLImage r=jgilbert 2014-03-05 15:48:58 -06:00
Milan Sreckovic
6cffe8ba37 Bug 910860: Use gfxPrefs to make sure preferences are evaluated on the main thread. This still leaves the preference re-evaluated all the time, not just at startup. Changing that is another bug. r=bgirard. 2014-03-05 16:25:09 -05:00
Ehsan Akhgari
4788926251 Bug 979816 - Backout bug 977701 because of a Talos regression
Landed on a CLOSED TREE
2014-03-05 15:18:09 -05:00
Ryan VanderMeulen
7c3c52f385 Backed out changesets 23ab61f4bba1, d0f6a0106f43, and 9b656ca5ec50 (bug 974575) for Linux crashtest asserts. 2014-03-05 15:23:26 -05:00
Jonathan Watt
ee17c700e4 Bug 950368 - Make nsWindowsShellService's WriteBitmap act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow 2014-03-04 16:56:44 +00:00
Andreas Gal
5ce95a9e25 Bug 975772 - Cleanup RectTriangles and allow DrawQuads to take triangles or triangle strips. r=bjacob 2014-03-05 14:18:38 -05:00
John Daggett
03ba3d97f5 Bug 969388 - Null-check the bundle ID to avoid 10.9 crash in CTFontManagerSetAutoActivationSetting. r=smichaud 2014-03-05 14:18:38 -05:00
Jonathan Kew
cab8d41180 bug 970891 - don't assume the primary font will always support the <space> character - fall back down the font stack if necessary. r=roc 2014-02-11 15:28:21 +00:00
Jonathan Kew
a9774efd8a bug 974575 - support color glyphs in cairo_image_surface's _composite_glyphs function. r=jrmuizel 2014-03-05 18:33:21 +00:00
Jonathan Kew
c74d67db15 bug 974575 - correction for bad commit (a0f556f37fb7016aa304b7cf0e811c0d38f0b969) ported from upstream. r=jrmuizel 2014-03-05 18:33:21 +00:00
Jonathan Kew
dc59002ceb bug 974575 - backport Behdad's patches for color bitmap glyph support from current cairo trunk. r=jrmuizel
* * *
[ft] Fix resizing of bitmap fonts
From b94a519aad3d5b50aa6de47ee16ee6a099de9791 Mon Sep 17 00:00:00 2001
Say, you were asking cairo for a font at 200px.  For bitmap-only fonts,
cairo was finding the closes strike size and using it.  If the strike
was at 20px, well, that's what you were getting.  We now scale that 20px
strike by a factor of 10 to get the correct size rendering.

Note that by itself this patch doesn't change much on the Linux desktop.
The reason is that the size you are interested in (eg. 200px) is lost by
fontconfig.  When you request a font at 200px, fontconfig returns a font
pattern that says 20px, and so the next layers thing you want a font at
20px.  To address that, one also needs a piece of fontconfig config that
puts the 200 back into the pixelsize.  Something like this:

<match target="font">
  <test name="scalable" mode="eq">
    <bool>false</bool>
  </test>
  <edit name="pixelsize" mode="assign">
    <times>
      <name>size</name>
      <name>dpi</name>
      <double>0.0138888888888</double> <!--1/72.-->
    </times>
  </edit>
</match>

I'm going to try to upstream this config so it will be enabled by
default.  The config can be a bit smarter.  For example, if
metricshinting is enabled and the size difference is small, we may as
well not scale.

The nice thing about this is that the configuration of whether and when
to scale bitmaps will be done in fontconfig, not cairo / Qt / ... code.
---
* * *
[FT] Prefer downscaling bitmap glyphs to upscaling

From a8f1b456db744e33a10b2301df03528787e5b1ca Mon Sep 17 00:00:00 2001
Say, you have bitmap strikes for sizes 50ppem and 100ppem.
To render at 60ppem, it's much better to downscale the 100ppem
bitmap than upscale 50ppem one.  Prefer downscaling.
---
* * *
[ft] I meant fabs(), not abs()

From 13bd8d09b44e50649f6fc4d58d036bc32c1d5c5b Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix memory bug in copying bitmaps

From a0f556f37fb7016aa304b7cf0e811c0d38f0b969 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix wrong assumptions

From e738079302a968b7b1fb9101cd4d92a8887bedce Mon Sep 17 00:00:00 2001
If subpixel rendering is enabled, but FT returns a 8bit gray bitmap
(perhaps because the font has 8bit embedded bitmaps) we were hitting
the assertions because the assumptions made were wrong.  Fix up.
---
* * *
Towards support loading color glyphs from FreeType

From 2cc353c3dbe01b4d8f65d6de800f2b1d6004a1c2 Mon Sep 17 00:00:00 2001
See comments.
---
* * *
Support 2bit and 4bit embedded bitmaps

From 9444ef09ccde2735258cc1bd2f1912119a32dd88 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix math

From 7d26341072b13a78d4b3fe58779057ac020be487 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Add missing include

From 0554d76402321b25cc952180e4d19436a9038d1a Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix alignment

From 34a747e7bdeba1cfe17318f80fbe6720d47bc023 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Ensure alignment of bitmaps received from FreeType

From 46d9db96d460fea72f0420102e8a90c6a7231f79 Mon Sep 17 00:00:00 2001
---
2014-03-05 18:33:21 +00:00
Markus Stange
16402cbab3 Bug 960178 - Fix lighting filter PowCache. r=Bas 2014-03-05 18:41:38 +01:00
Markus Stange
c431a14625 Bug 963086 - Detect filter rect XMost()/YMost() overflow and protect against out-of-range data acess. f=dholbert, r=Bas 2014-03-05 18:41:19 +01:00
Ed Morley
6ac01d1925 Backed out changeset fe2afc55a0d1 (bug 950368) for shutdown crashes on B2G 2014-03-05 17:10:38 +00:00
Jonathan Watt
5fa483d9dc Bug 950368 - Make nsWindowsShellService's WriteBitmap act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow 2014-03-04 16:56:44 +00:00
Ryan VanderMeulen
88ac28dca2 Backed out changeset 6f05267b4afc (bug 798033) for Android bustage. 2014-03-05 09:55:52 -05:00
Sushil Chauhan
35ac903785 Bug 978341 - CompositorOGL::clearFBRect api needs to map the rect to OGL coordinates. r=jgilbert 2014-03-04 18:07:32 -08:00
snigdha
dde15b4b7a Bug 798033 - Headers should generally not do "using namespace" at file scope. r=jib, r=jmathies, r=rjesup, r=ekr, r=ncameron, r=blassey 2014-03-05 08:47:45 -05:00
Carsten "Tomcat" Book
6969a9f3be merge b2g-inbound to mozilla-central 2014-03-05 13:24:51 +01:00
L. David Baron
365f5250f9 Bug 828173 patch 3: Add a concept of pending animations to Layer, like pending transform. r=mattwoodrow 2014-03-04 20:13:21 -08:00
L. David Baron
4bc85751cb Bug 828173 patch 2: Make Layer::AddAnimation have the caller fill in the data instead of taking parameters. r=mattwoodrow
(This is a bigger simplification later in the patch queue, when I add a
variant of AddAnimation called AddAnimationForNextTransaction.)
2014-03-04 20:13:21 -08:00
Brian Birtles
2f7bcc48d5 Bug 972199 part 1 - Make SampleAnimations filter out animations that are yet to start; r=nrc
When restoring the refresh driver after testing we can arrive at a situation
where a layer has an animation that has yet to start. However, calling
ElementAnimations::GetPositionInIteration with a negative value from the
compositor thread is an error.

This patch detects animations on the compositor thread that are yet-to-start and
skips them when sampling. It also moves the activeAnimations = true line up as
otherwise we would need special logic to wake up the compositor after the delay
has finished.
2014-03-05 10:19:15 +09:00
Ehsan Akhgari
444a26ed8e Bug 976896 - Port STL_FLAGS to moz.build; r=mshal 2014-03-04 19:39:06 -05:00
Milan Sreckovic
cfe0774568 Bug 978274: Initialize gfxPrefs earlier, rename some methods, delete MigratePrefs from gfxPlatform. r=bgirard. 2014-03-04 12:26:33 -05:00
Ehsan Akhgari
f5dd4e8ef8 Bug 978594 - Part 3: Port some of the per-source flags to moz.build; r=glandium
--HG--
extra : rebase_source : fe4cd059eddda221af420e1517250772816d7ee8
2014-03-02 15:41:32 -05:00
Dan Glastonbury
1b7800558e Bug 975824 - Disable S3TC compressed texture support on VMware Gallium 0.4 with
llvmpipe. r=jgilbert
2014-02-28 16:57:03 +10:00
Phil Ringnalda
2e6a1fd51c Back out bbd7b1da5d36:b0d1c4456b73 (bug 974575) and 6e8140ae4961 (bug 969814) for ASan bustage 2014-03-03 22:40:07 -08:00
Jonathan Kew
ebd14f5c7a bug 974575 - support color glyphs in cairo_image_surface's _composite_glyphs function. r=jrmuizel 2014-03-04 05:37:40 +00:00
Jonathan Kew
fe145a977c bug 974575 - backport Behdad's patches for color bitmap glyph support from current cairo trunk. r=jrmuizel
* * *
[ft] Fix resizing of bitmap fonts
From b94a519aad3d5b50aa6de47ee16ee6a099de9791 Mon Sep 17 00:00:00 2001
Say, you were asking cairo for a font at 200px.  For bitmap-only fonts,
cairo was finding the closes strike size and using it.  If the strike
was at 20px, well, that's what you were getting.  We now scale that 20px
strike by a factor of 10 to get the correct size rendering.

Note that by itself this patch doesn't change much on the Linux desktop.
The reason is that the size you are interested in (eg. 200px) is lost by
fontconfig.  When you request a font at 200px, fontconfig returns a font
pattern that says 20px, and so the next layers thing you want a font at
20px.  To address that, one also needs a piece of fontconfig config that
puts the 200 back into the pixelsize.  Something like this:

<match target="font">
  <test name="scalable" mode="eq">
    <bool>false</bool>
  </test>
  <edit name="pixelsize" mode="assign">
    <times>
      <name>size</name>
      <name>dpi</name>
      <double>0.0138888888888</double> <!--1/72.-->
    </times>
  </edit>
</match>

I'm going to try to upstream this config so it will be enabled by
default.  The config can be a bit smarter.  For example, if
metricshinting is enabled and the size difference is small, we may as
well not scale.

The nice thing about this is that the configuration of whether and when
to scale bitmaps will be done in fontconfig, not cairo / Qt / ... code.
---
* * *
[FT] Prefer downscaling bitmap glyphs to upscaling

From a8f1b456db744e33a10b2301df03528787e5b1ca Mon Sep 17 00:00:00 2001
Say, you have bitmap strikes for sizes 50ppem and 100ppem.
To render at 60ppem, it's much better to downscale the 100ppem
bitmap than upscale 50ppem one.  Prefer downscaling.
---
* * *
[ft] I meant fabs(), not abs()

From 13bd8d09b44e50649f6fc4d58d036bc32c1d5c5b Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix memory bug in copying bitmaps

From a0f556f37fb7016aa304b7cf0e811c0d38f0b969 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix wrong assumptions

From e738079302a968b7b1fb9101cd4d92a8887bedce Mon Sep 17 00:00:00 2001
If subpixel rendering is enabled, but FT returns a 8bit gray bitmap
(perhaps because the font has 8bit embedded bitmaps) we were hitting
the assertions because the assumptions made were wrong.  Fix up.
---
* * *
Towards support loading color glyphs from FreeType

From 2cc353c3dbe01b4d8f65d6de800f2b1d6004a1c2 Mon Sep 17 00:00:00 2001
See comments.
---
* * *
Support 2bit and 4bit embedded bitmaps

From 9444ef09ccde2735258cc1bd2f1912119a32dd88 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix math

From 7d26341072b13a78d4b3fe58779057ac020be487 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Add missing include

From 0554d76402321b25cc952180e4d19436a9038d1a Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix alignment

From 34a747e7bdeba1cfe17318f80fbe6720d47bc023 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Ensure alignment of bitmaps received from FreeType

From 46d9db96d460fea72f0420102e8a90c6a7231f79 Mon Sep 17 00:00:00 2001
---
2014-03-04 05:37:40 +00:00
Ehsan Akhgari
baaa63a87b Bug 978594 - Part 1: Remove the old code to support MSVC 2005 and 2008 from gfx/cairo/libpixman/src/Makefile.in; r=glandium 2014-03-03 22:47:56 -05:00
Jeff Gilbert
455a10d14e Bug 978414 - GLContextCGL::IsDoubleBuffered should be const at definition. - r=bustage on a CLOSED TREE 2014-03-03 19:13:34 -08:00
Jeff Gilbert
e490d9e4e0 Bug 978414 - Mark GLContext virtuals const and MOZ_OVERRIDE where appropriate. - r=bjacob 2014-03-03 18:47:43 -08:00
Ehsan Akhgari
780631919e Fix the merge conflict of bug 958596 and bug 978776 2014-03-03 18:24:04 -05:00
Ryan VanderMeulen
ee46e14cf6 Merge m-c to inbound. 2014-03-03 17:23:35 -05:00
Ryan VanderMeulen
ed45530108 Merge inbound to m-c. 2014-03-03 17:00:34 -05:00
Milan Sreckovic
d719a6c5a4 Bug 971943: 5. Add float support to gfxPrefs. apz.max_event_acceleration, apz.fling_friction, apz.fling_stopped_threshold, apz.max_velocity_queue_size, apz.max_velocity_pixels_per_ms preferences moved to gfxPrefs. r=kgupta. 2014-03-03 11:53:21 -05:00
Ryan VanderMeulen
2263fa8009 Backed out changeset 9024f38e3809 (bug 843666) for bustage. 2014-03-03 11:21:10 -05:00
Jeff Gilbert
0a4104089f Bug 843666 - Implement color-buffer-(half-)float for WebGL. r=kamidphish 2014-03-03 10:36:52 -05:00
Milan Sreckovic
8abbaf6943 Bug 971943: 6. gfx.android.rgb16.force (startup only), gfx.gralloc.fence-with-readpixels (changing during session) moved to gfxPrefs. r=sikeda. 2014-03-03 17:11:06 -05:00
Ehsan Akhgari
021bd3f1b2 Bug 978626 - Stop exporting the skia symbols from xul.dll; r=jrmuizel 2014-03-03 16:39:31 -05:00
Ehsan Akhgari
2f66c33c1b Bug 978776 - Stop exporting moz2d symbols from xul.dll; r=jrmuizel 2014-03-03 14:38:33 -05:00
Ed Morley
adbbebc086 Merge mozilla-central and inbound 2014-03-03 14:50:56 +00:00
Ed Morley
738f300f74 Merge latest green b2g-inbound changeset and mozilla-central 2014-03-03 14:45:43 +00:00
Markus Stange
6d0e5d3a43 Bug 975773 - Filter primitives in error states can have inputs. r=roc 2014-03-03 14:31:27 +01:00
L. David Baron
5819a672f3 Bug 978603: Make sure implicit copy constructors and assignment operators aren't invoked for gfxGlyphExtents (which would at least mess up leak statistics if not actually leak). r=jfkthame
Originally written while investigating bug 435138.
2014-03-03 00:54:39 -08:00
L. David Baron
909593b568 Bug 978608: Shut down pango's fontmap cleanly and shut down fontconfig, #if CLEANUP_MEMORY. r=karlt
This bumps the minimum required pango version to 1.22, released 29 Sep 2008.
2014-03-03 00:54:38 -08:00
Thomas Zimmermann
f65815cf66 Bug 978086: Fix initialization order in LayerRenderState, r=nical
C++ requires constructors to initialize fields in the order of the
fields' definitions.
2014-03-03 09:15:00 +01:00
Jonathan Kew
a703a305b8 bug 978313 - initialize matchType appropriately for run-initial control chars that default to the primary font. r=jdaggett 2014-03-03 08:02:05 +00:00
Matt Woodrow
412ca024cc Bug 977891 - Move the ForceComposite message to PLayerTransaction so that we can identify the right compositor with e10s. r=nical 2014-03-03 13:59:58 +13:00
Ryan VanderMeulen
d22b79826e Merge inbound to m-c. 2014-02-28 16:03:19 -05:00
Ryan VanderMeulen
93c5eb1160 Merge m-c to b2g-inbound. 2014-02-28 10:16:37 -05:00
Carsten "Tomcat" Book
67109b9a5c merge b2g-inbound to mozilla-central 2014-02-28 14:42:11 +01:00
Wes Kocher
45d489c9d5 Merge m-c to b2g-inbound 2014-02-27 17:47:32 -08:00
Wes Kocher
19c85055e8 Merge inbound to m-c 2014-02-27 16:52:51 -08:00
Ryan VanderMeulen
d8c7359358 Merge m-c to b2g-inbound. 2014-02-27 17:34:25 -05:00
Ryan VanderMeulen
47e286d04d Merge inbound to m-c. 2014-02-27 16:55:18 -05:00
Sotaro Ikeda
d4c5f44335 Bug 977596 - Fix build failure on flatfish r=jmuizelaar 2014-02-27 13:26:22 -08:00
Sushil Chauhan
9058bca2dc Bug 976717 - Pass the Framebuffer rectangle to be cleared to LayerComposite. r=ncameron 2014-02-27 11:07:34 -08:00
stefanh@inbox.com
0d496326a6 Bug 970079 - Native theming for MacOS X help buttons, widget part. r=mstange, roc. 2014-02-27 18:12:16 +01:00
Horia Iosif Olaru
c26db357b5 Bug 952051 - Change the GetOperator call in FlushGroup to take into account the mix-blend-mode operator for the group. r=roc
Create a new GetEffectiveOperator function that also takes into acount the mix-blend-mode operator for basic layers. Replace logic that chooses between the effective mix blend mode and the operator returned by GetOperator, with calls to this function.
2014-02-27 11:56:48 -05:00
Benjamin Bouvier
7a3e028e1e Bug 939843: Required changes in the rest of the tree; r=froydnj
--HG--
extra : rebase_source : 5757eb2b73755c8da08112b91b025a8fa860d7e8
2014-02-27 16:23:16 +01:00
Ehsan Akhgari
6b9893cdfc Bug 977279 - Add a missing initguid.h include to DrawTargetD2D.cpp 2014-02-28 10:42:23 -05:00
L. David Baron
83913734c9 Bug 978495: Initialize mozilla::layers::TextureClientX11::mLocked. r=nical 2014-03-02 10:29:06 -08:00
Jonathan Kew
556f3ad69b bug 978129 - don't assert when decoding empty 'name' table strings. r=jdaggett 2014-03-02 14:52:12 +00:00
Kyle Huey
5ee8d26b21 No bug: dos2unix GLTextureImage.cpp. r=me
DONTBUILD
2014-02-28 17:32:07 -08:00
Milan Sreckovic
36ea3a3997 Bug 977833 - Initialize gfxPrefs so that the tests have access to preferences evaluated that way. r=bgirard 2014-02-28 12:45:27 -05:00
Geoff Brown
6d670dcd38 Bug 978277 - Disable gfx/tests/crashtests/815489.html on Android 2.3 2014-02-28 14:58:39 -07:00
Carsten "Tomcat" Book
ac78ac1ab1 Merge mozilla-central to b2g-inbound 2014-02-27 15:59:39 +01:00
Sotaro Ikeda
1d7fd44c1a Bug 975384 - Add pointer check to GrallocTextureHostOGL r=nical 2014-02-27 06:40:48 -08:00
Phil Ringnalda
30526870e0 Merge m-c to m-i 2014-02-26 21:28:10 -08:00
Ryan VanderMeulen
14f5637c5f Backed out changeset 0569a8a2f83d (bug 958727) for causing performance regressions. 2014-02-26 20:48:41 -05:00
Sotaro Ikeda
3f742d24e6 Bug 977393 - Fix build failure on gonk KK r=pchang 2014-02-26 17:46:34 -08:00
Vivien Nicolas
3bcab20aab Bug 977207 - The fps counter requires a restart to be displayed. r=bgirard 2014-02-26 23:12:35 +01:00
Ryan VanderMeulen
973641573f Merge m-c to b2g-inbound. 2014-02-26 16:43:08 -05:00
Sotaro Ikeda
7792cdd77e Bug 976766 - Clear layer's buffers when ClearCachedResources() r=nical 2014-02-26 13:41:17 -08:00
Sotaro Ikeda
7cc924bfb0 Bug 974629 - Add pointer check to TextureClient::Finalize() r=nical 2014-02-26 13:34:41 -08:00
Ehsan Akhgari
149b11176b Bug 935778 - Part 0.7: Emit the correct type name from FilterNodeLightingSoftware; r=jrmuizel, parts r=dbaron 2014-02-26 10:13:48 -05:00
Morris Tseng
ec58a2b65a Bug 975937 - Crash in mozilla::layers::ShaderProgramOGL::Activate(). r=gal 2014-02-26 09:04:47 -05:00
Phil Ringnalda
e2d9d3bd7e Back out d0b4c5c28fb0 (bug 956993) for Android test failures
CLOSED TREE
2014-02-27 20:25:55 -08:00
James Willcox
6a8862bec2 Bug 956993 - Rely on OES_EGL_image_external for SharedSurface_EGLImage r=jgilbert 2014-02-27 20:48:38 -06:00
Ehsan Akhgari
83a695ee85 Bug 977701 - Move skia, cairo and pixman to libxul; r=jrmuizel 2014-02-27 21:14:54 -05:00
Matt Woodrow
541e0d0cbf Bug 970294 - Set our surface offset as a gfxContext device offset instead of a transform so that other callers don't accidentally overwrite it. r=nrc 2014-02-28 12:32:38 +13:00
Ryan VanderMeulen
bd214454e7 Merge m-c to inbound. 2014-02-27 17:33:47 -05:00
Ryan VanderMeulen
af8c67273f Merge m-c to inbound on a CLOSED TREE. 2014-02-28 16:06:20 -05:00
Matt Woodrow
ec92f23916 Bug 971720 - Adjust the source pattern transform when masking with RotatedBuffer to take the mask transform into account. r=roc 2014-03-01 08:51:17 +13:00
Matt Woodrow
1916f43649 Bug 976877 - Don't simplify invalidation regions since it leads to poor results. r=roc 2014-03-01 08:49:05 +13:00
Milan Sreckovic
d10a7bc160 Bug 971943: 4. gfx.layerscope.port and gfx.layerscope.enabled moved to gfxPrefs. r=dglastonbury 2014-02-28 12:59:38 -05:00
Milan Sreckovic
0b746a394e Bug 971943: 3. gfx.apitrace.enabled (ANDROID only) preference moved to gfxPrefs. r=gwright 2014-02-28 12:59:38 -05:00
Milan Sreckovic
588797fcdf Bug 971943: 2. webgl.force-layers-readback preference moved to gfxPrefs. r=gw280 2014-02-28 12:59:37 -05:00
Milan Sreckovic
e5117a25a9 Bug 971943: 1. Remove unused variable. r=me. 2014-02-28 12:59:35 -05:00
Andrew McCreight
c479f2a541 Bug 962608 - Make PL_DHashTableInit infallible by default. r=briansmith,bsmedberg,ehsan,froydnj,jduell,jfkthame,roc,smaug 2014-02-27 10:04:09 -08:00
Sotaro Ikeda
616504a7bc Bug 975146 - Do not use hw composer for screenshot r=bas 2014-03-04 14:36:52 -08:00
Ryan VanderMeulen
f181cc040a Merge m-c to b2g-inbound. 2014-03-04 17:25:07 -05:00
Ben Kelly
672e111b8e Bug 977975: Improve composition thread warning debug. r=benwa 2014-03-04 14:41:24 -05:00
Botond Ballo
07af8b0a38 Bug 958596 - Print ScrollableLayerGuids of APZCs when printing the tree. r=kats 2014-01-22 18:44:59 -05:00
Botond Ballo
de9b8a5e87 Bug 958596 - Allow gfx logging of long long. r=Bas 2014-01-22 18:38:31 -05:00
Botond Ballo
0a08c5b4ea Bug 958596 - Print the APZC tree for debugging. r=kats 2014-01-22 15:09:03 -05:00
Botond Ballo
9c798dd5bb Bug 958596 - Add a content description field to FrameMetrics and populate it if the apz.printtree pref is on. r=kats,tn 2014-01-22 16:37:57 -05:00
Botond Ballo
5bda1577dd Bug 958596 - Allow TreeLog logging to be conditioned on a pref. r=Bas 2014-01-22 15:19:01 -05:00
Botond Ballo
51adf1e7a4 Bug 958596 - Add support a tree logging utility. r=Bas 2014-01-21 20:14:47 -05:00
Botond Ballo
d4d1d77eca Bug 958596 - Allow writing a log statement that does not end in a newline. r=Bas 2014-01-21 18:59:17 -05:00
Botond Ballo
fa0ea774fa Bug 958596 - Allow gfx logging of any rect, size, and point. r=Bas 2014-01-21 18:38:34 -05:00
Botond Ballo
017d1dcf2d Bug 958596 - Add gfx logging support for 'char'. r=Bas 2014-01-21 20:26:00 -05:00
Botond Ballo
3116196a8c Bug 958596 - Add support for gfx logging on android and b2g. r=Bas 2014-01-21 20:11:52 -05:00
Botond Ballo
f435a42cd8 Bug 958596 - Allow gfx/2d/Logging.h to be used outside of gfx/2d. r=Bas 2014-02-18 21:59:34 -05:00
Ehsan Akhgari
91df1527b5 Bug 976392 - Move moz2d to libxul; r=jrmuizel 2014-02-25 15:42:23 -05:00
Ed Morley
371641c5fa Backed out changeset 07f3cfaa7900 (bug 958596) for build failures on Windows 2014-02-25 17:17:47 +00:00
Ed Morley
629596b79a Backed out changeset dfadc8e2c38e (bug 958596) 2014-02-25 17:17:26 +00:00
Ed Morley
d05e8e0965 Backed out changeset b190a7268dd4 (bug 958596) 2014-02-25 17:17:23 +00:00
Ed Morley
9e1d9e4332 Backed out changeset b228fa36e700 (bug 958596) 2014-02-25 17:17:19 +00:00
Ed Morley
6e6b7a1cf2 Backed out changeset ff5de50c1333 (bug 958596) 2014-02-25 17:17:16 +00:00
Ed Morley
a54497e6fc Backed out changeset eb4286cfa305 (bug 958596) 2014-02-25 17:17:12 +00:00
Ed Morley
0b1a9ed15a Backed out changeset c88e6d34fe90 (bug 958596) 2014-02-25 17:17:09 +00:00
Ed Morley
afee079378 Backed out changeset a29e486e2214 (bug 958596) 2014-02-25 17:17:02 +00:00
Ed Morley
37101405ae Backed out changeset 7a16622e6b38 (bug 958596) 2014-02-25 17:16:59 +00:00
Ed Morley
f268460850 Backed out changeset 8e8db64bbaba (bug 958596) 2014-02-25 17:16:55 +00:00
Ed Morley
35a77da61e Backed out changeset 63d96f3e3e42 (bug 958596) 2014-02-25 17:16:52 +00:00
Botond Ballo
4f03179492 Bug 958596 - Print ScrollableLayerGuids of APZCs when printing the tree. r=kats
--HG--
extra : rebase_source : cc3688109bb8a8a074e24b2f0268fdc556f05c1f
2014-02-25 10:56:46 -05:00
Botond Ballo
3e3cbbe526 Bug 958596 - Allow gfx logging of long long. r=Bas
--HG--
extra : rebase_source : c65c224a3ce6f09636be594eb68a95cc791841f7
2014-01-22 18:38:31 -05:00
Botond Ballo
445a53b951 Bug 958596 - Print the APZC tree for debugging. r=kats
--HG--
extra : rebase_source : bac86951246ba92f983a2ced3f7079143b5d42a1
2014-01-22 15:09:03 -05:00
Botond Ballo
1d1bf83ff4 Bug 958596 - Add a content description field to FrameMetrics and populate it if the apz.printtree pref is on. r=kats,tn
--HG--
extra : rebase_source : f009ad9d779fb1a3afa525fe7e5eb3a399aee628
2014-01-22 16:37:57 -05:00
Botond Ballo
f173a70f36 Bug 958596 - Allow TreeLog logging to be conditioned on a pref. r=Bas
--HG--
extra : rebase_source : 4390b6b07ec6cf195839f6e8386c769a8b234dd0
2014-01-22 15:19:01 -05:00
Botond Ballo
1d75d84d0d Bug 958596 - Add support a tree logging utility. r=Bas
--HG--
extra : rebase_source : 1bb9385ea2f9ce653ec0d5acd529edb63a385117
2014-01-21 20:14:47 -05:00
Botond Ballo
61a402ee3f Bug 958596 - Allow writing a log statement that does not end in a newline. r=Bas
--HG--
extra : rebase_source : a26166451eb22c50b6bb32c2728bd07bdbf6e859
2014-01-21 18:59:17 -05:00
Botond Ballo
a2f8254eaa Bug 958596 - Allow gfx logging of any rect, size, and point. r=Bas
--HG--
extra : rebase_source : b884b10446f5bc026285e6b16c202c7d9a2c377b
2014-01-21 18:38:34 -05:00
Botond Ballo
48f0bac38a Bug 958596 - Add gfx logging support for 'char'. r=Bas
--HG--
extra : rebase_source : 2938fc27a6541fd5dd5ac1cf94f3e69ed3997ecc
2014-01-21 20:26:00 -05:00
Botond Ballo
e789867210 Bug 958596 - Add support for gfx logging on android and b2g. r=Bas
--HG--
extra : rebase_source : 8d5a1c0dfc4f5f74e8417531b1f9f39c54e85d49
2014-01-21 20:11:52 -05:00
Botond Ballo
51707830d7 Bug 958596 - Allow gfx/2d/Logging.h to be used outside of gfx/2d. r=Bas
--HG--
extra : rebase_source : 7c99fccae55d8116f12b52ed74e178590c2c7414
2014-02-18 21:59:34 -05:00
Carsten "Tomcat" Book
60446c5e55 Merge mozilla-central to mozilla-inbound 2014-02-25 15:18:06 +01:00
Carsten "Tomcat" Book
3d4f8f1aaf merge b2g-inbound to mozilla-central 2014-02-25 14:30:13 +01:00
John Daggett
d372330f86 Bug 975460 - check for null CTFontRef after creation. r=jfkthame 2014-02-25 16:37:26 +09:00
Benoit Jacob
1ecd039ca4 Bug 974356 - 4/4 - make CreateIPDLActor error out if TextureParent::Init() failed - r=nical 2014-02-25 08:12:50 -05:00
Benoit Jacob
5347606301 Bug 974356 - 3/4 - Make TextureHost::CreateIPDLActor check for bad MemoryTextures - r=nical 2014-02-25 08:12:49 -05:00
Benoit Jacob
5941604c55 Bug 974356 - 2/4 - add an IsSameProcess method to ISurfaceAllocator - r=nical 2014-02-25 08:12:49 -05:00
Phil Ringnalda
761929bf63 Back out b157f5d0c235 (bug 974197) for b2g reftest-4 and reftest-6 failures
CLOSED TREE
2014-02-24 21:06:18 -08:00
Ryan VanderMeulen
ce38a1c6d5 Backed out changeset 96f2905b175d (bug 978479) for OSX reftest failures.
CLOSED TREE
2014-03-06 14:14:52 -05:00
Andreas Gal
0fe0fc9984 Bug 978479 - Remove flipped quad texture from mQuadVBO. r=bjacob 2014-03-06 12:50:29 -05:00
Ryan VanderMeulen
0636b6fe12 Backed out changesets e7c4304d45d7 and 75d3146ac0d3 (bug 970891) for Android reftest failures.
CLOSED TREE
2014-03-06 11:00:26 -05:00
Jonathan Kew
ee16a48ded bug 970891 - don't assume the primary font will always support the <space> character - fall back down the font stack if necessary. r=roc 2014-02-11 15:28:21 +00:00
Ehsan Akhgari
46df6b30e3 Fix up skia's generate_mozbuild.py to make it match the moz.build file, no bug, DONTBUILD 2014-03-06 08:58:52 -05:00
Jonathan Kew
5fb4a596fa bug 974575 - support color glyphs in cairo_image_surface's _composite_glyphs function. r=jrmuizel 2014-03-06 12:29:23 +00:00
Jonathan Kew
b1bced401f bug 974575 - correction for bad commit (a0f556f37fb7016aa304b7cf0e811c0d38f0b969) ported from upstream. r=jrmuizel 2014-03-06 12:29:23 +00:00
Jonathan Kew
db93ca8e58 bug 974575 - backport Behdad's patches for color bitmap glyph support from current cairo trunk. r=jrmuizel
* * *
[ft] Fix resizing of bitmap fonts
From b94a519aad3d5b50aa6de47ee16ee6a099de9791 Mon Sep 17 00:00:00 2001
Say, you were asking cairo for a font at 200px.  For bitmap-only fonts,
cairo was finding the closes strike size and using it.  If the strike
was at 20px, well, that's what you were getting.  We now scale that 20px
strike by a factor of 10 to get the correct size rendering.

Note that by itself this patch doesn't change much on the Linux desktop.
The reason is that the size you are interested in (eg. 200px) is lost by
fontconfig.  When you request a font at 200px, fontconfig returns a font
pattern that says 20px, and so the next layers thing you want a font at
20px.  To address that, one also needs a piece of fontconfig config that
puts the 200 back into the pixelsize.  Something like this:

<match target="font">
  <test name="scalable" mode="eq">
    <bool>false</bool>
  </test>
  <edit name="pixelsize" mode="assign">
    <times>
      <name>size</name>
      <name>dpi</name>
      <double>0.0138888888888</double> <!--1/72.-->
    </times>
  </edit>
</match>

I'm going to try to upstream this config so it will be enabled by
default.  The config can be a bit smarter.  For example, if
metricshinting is enabled and the size difference is small, we may as
well not scale.

The nice thing about this is that the configuration of whether and when
to scale bitmaps will be done in fontconfig, not cairo / Qt / ... code.
---
* * *
[FT] Prefer downscaling bitmap glyphs to upscaling

From a8f1b456db744e33a10b2301df03528787e5b1ca Mon Sep 17 00:00:00 2001
Say, you have bitmap strikes for sizes 50ppem and 100ppem.
To render at 60ppem, it's much better to downscale the 100ppem
bitmap than upscale 50ppem one.  Prefer downscaling.
---
* * *
[ft] I meant fabs(), not abs()

From 13bd8d09b44e50649f6fc4d58d036bc32c1d5c5b Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix memory bug in copying bitmaps

From a0f556f37fb7016aa304b7cf0e811c0d38f0b969 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix wrong assumptions

From e738079302a968b7b1fb9101cd4d92a8887bedce Mon Sep 17 00:00:00 2001
If subpixel rendering is enabled, but FT returns a 8bit gray bitmap
(perhaps because the font has 8bit embedded bitmaps) we were hitting
the assertions because the assumptions made were wrong.  Fix up.
---
* * *
Towards support loading color glyphs from FreeType

From 2cc353c3dbe01b4d8f65d6de800f2b1d6004a1c2 Mon Sep 17 00:00:00 2001
See comments.
---
* * *
Support 2bit and 4bit embedded bitmaps

From 9444ef09ccde2735258cc1bd2f1912119a32dd88 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix math

From 7d26341072b13a78d4b3fe58779057ac020be487 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Add missing include

From 0554d76402321b25cc952180e4d19436a9038d1a Mon Sep 17 00:00:00 2001
---
* * *
[ft] Fix alignment

From 34a747e7bdeba1cfe17318f80fbe6720d47bc023 Mon Sep 17 00:00:00 2001
---
* * *
[ft] Ensure alignment of bitmaps received from FreeType

From 46d9db96d460fea72f0420102e8a90c6a7231f79 Mon Sep 17 00:00:00 2001
---
2014-03-06 12:29:22 +00:00
Wes Kocher
1282000702 Backed out 12 changesets (bug 958596) for several Android permafails to fix a CLOSED TREE
Backed out changeset e4c0e3d3a768 (bug 958596)
Backed out changeset 7bc4f48d6b05 (bug 958596)
Backed out changeset 89cd12e3db45 (bug 958596)
Backed out changeset 283411053340 (bug 958596)
Backed out changeset 5329fa8c8847 (bug 958596)
Backed out changeset 0d1d26d588e3 (bug 958596)
Backed out changeset 715fe9eb5dfd (bug 958596)
Backed out changeset 66dde9d67ffa (bug 958596)
Backed out changeset 79e589f75065 (bug 958596)
Backed out changeset 1ed4c880ab70 (bug 958596)
Backed out changeset 1d40b0b8036d (bug 958596)
Backed out changeset ad35d51d9781 (bug 958596)
2014-02-25 18:34:47 -08:00
Botond Ballo
d9ee73dc9d Bug 958596 - Print ScrollableLayerGuids of APZCs when printing the tree. r=kats
--HG--
extra : amend_source : 11e8919bbe6c3ac9e28663cc5d4ab9a20aeef896
2014-02-25 19:35:06 -05:00
Botond Ballo
a5acb8c402 Bug 958596 - Allow gfx logging of long long. r=Bas 2014-01-22 18:38:31 -05:00
Botond Ballo
6598eb3605 Bug 958596 - Print the APZC tree for debugging. r=kats 2014-01-22 15:09:03 -05:00
Botond Ballo
bf9ca02460 Bug 958596 - Add a content description field to FrameMetrics and populate it if the apz.printtree pref is on. r=kats,tn 2014-01-22 16:37:57 -05:00
Botond Ballo
715e804b56 Bug 958596 - Allow TreeLog logging to be conditioned on a pref. r=Bas 2014-01-22 15:19:01 -05:00
Botond Ballo
c9085e04cb Bug 958596 - Add support a tree logging utility. r=Bas 2014-01-21 20:14:47 -05:00
Botond Ballo
31b54b299b Bug 958596 - Allow writing a log statement that does not end in a newline. r=Bas 2014-01-21 18:59:17 -05:00
Botond Ballo
484deeb390 Bug 958596 - Allow gfx logging of any rect, size, and point. r=Bas 2014-01-21 18:38:34 -05:00
Botond Ballo
991dd05512 Bug 958596 - Add gfx logging support for 'char'. r=Bas 2014-01-21 20:26:00 -05:00
Botond Ballo
9179478234 Bug 958596 - Add support for gfx logging on android and b2g. r=Bas 2014-01-21 20:11:52 -05:00
Botond Ballo
9600ef6281 Bug 958596 - Allow gfx/2d/Logging.h to be used outside of gfx/2d. r=Bas 2014-02-18 21:59:34 -05:00
Matt Woodrow
5a28db799a Bug 975592 - Make sure we find the correct composition manager when updating child process layer trees. r=nical
--HG--
extra : rebase_source : 5e1457117293c74a362a0570aca2673c90038334
2014-02-25 11:45:40 +13:00
Matt Woodrow
20b7e3325b Bug 974709 - Use a separate texture for each X11TextureSource and keep the pixmap bound. r=nical
--HG--
extra : rebase_source : 06012985e185f517d8a807788e35ea1efcaf39d8
2014-02-22 22:22:43 +13:00
Sotaro Ikeda
c0ff94d478 Bug 957323 - Handle android's fence on gonk r=nical,doublec,pchang 2014-02-24 20:23:41 -08:00
Wes Kocher
e45e2f6185 Merge m-c to b2g-inbound 2014-02-24 18:28:37 -08:00
Ben Kelly
e97af6982f Bug 976035: Cap max fling velocity at pref'd limit. r=kats 2014-02-24 16:08:31 -05:00
Maksim Lebedev
c40bfc6b23 Bug 973660 - TEST-UNEXPECTED-FAIL AsyncPanZoomController.LongPress when touch action enabled r=drs,kats 2014-02-24 01:31:18 -05:00
Ehsan Akhgari
b8d7d5b236 Bug 975730 - Remove an unused CFLAGS from the qcms build system; r=mshal
MOZ_QCMS is not used anywhere.
2014-02-22 21:41:02 -05:00
Milan Sreckovic
cb708a45b9 Bug 946907: Make sure GLContext reads preferences through gfxPrefs which means it's done on the main thread. Rename the macro to DECL_GFX_PREF before it gets used in a lot of places. r=bjacob 2014-02-22 18:53:04 -05:00
Ehsan Akhgari
50862d75c8 Bug 935778 - Part 1.1: Re-add the refcount assertions for AddRef(), and make the assertions for Release() use a signed integer 2014-02-22 11:23:03 -05:00
Kartikaya Gupta
e8bce1378a Bug 898563. r=botond 2014-02-21 17:58:30 -05:00
Benoit Jacob
1b9fd6371f Bug 970747 - 6/6 - Make LayerTransactionParent::RecvUpdate error out if RepositionChild fails - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
340ad52d84 Bug 970747 - 5/6 - Make ContainerLayer::RepositionChild always perform checks and return bool - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
52bcbbf9fd Bug 970747 - 4/6 - Make LayerTransactionParent::RecvUpdate error out if RemoveChild fails - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
42f76f6266 Bug 970747 - 3/6 - Make ContainerLayer::RemoveChild always perform checks and return bool - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
cc2564fac3 Bug 970747 - 2/6 - Make LayerTransactionParent::RecvUpdate error out if InsertAfter fails - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
de6342ddcf Bug 970747 - 1/6 - Make ContainerLayer::InsertAfter always perform checks and return bool - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
5a2a768330 Bug 968825 - Null pointer checks in LayerTransactionParent - r=jrmuizel 2014-02-21 16:50:25 -05:00
Morris Tseng
acfcb2590b Bug 975121 - Fix reversed colors with gfx.xrender.enabled = false. r=gal 2014-02-24 10:09:55 -05:00
Mason Chang
709b458cbc Bug 917416 - Make App Renderframe Opaque. r=roc 2014-02-24 10:09:55 -05:00
Ehsan Akhgari
fe19ed8113 Bug 935778 - Part 1: Add RefCountType, a type compatible with nsrefcnt, to MFBT; r=dbaron,froydnj 2014-02-21 14:45:50 -05:00
Ryan VanderMeulen
2ca1b199db Backed out changeset 18183f6ef0d8 (bug 910860) for xpcshell and reftest failures. 2014-02-21 12:35:35 -05:00
Milan Sreckovic
3923aa0c9b Bug 910860 - Use gfxPrefs to make sure preferences are evaluated on the main thread. This still leaves the preference re-evaluated. r=BenWa 2014-02-18 19:55:48 -05:00
Robert O'Callahan
860f3a36ae Bug 973767. Put the compositor into test mode via an IPDL transaction. r=mattwoodrow
--HG--
extra : rebase_source : d40cf8624f93b85298cc501ff315522220522fb6
2014-02-12 17:41:57 +13:00
Ehsan Akhgari
067fa188b6 Bug 935778 - Part 0.2: Spray some MOZ_DECLARE_REFCOUNTED_TYPENAME across the tree 2014-02-20 21:33:49 -05:00
Oleg Romashin
79dd3f3972 Bug 974335 - Refactor Qt Widget Backend implementation. Qt Only changes NPDB. r=romaxa
--HG--
rename : dom/system/unix/Makefile.in => dom/system/qt/Makefile.in
rename : dom/system/unix/QTMLocationProvider.cpp => dom/system/qt/QTMLocationProvider.cpp
rename : dom/system/unix/QTMLocationProvider.h => dom/system/qt/QTMLocationProvider.h
rename : dom/system/unix/nsHapticFeedback.cpp => dom/system/qt/QtHapticFeedback.cpp
rename : dom/system/unix/nsHapticFeedback.h => dom/system/qt/QtHapticFeedback.h
rename : dom/system/unix/moz.build => dom/system/qt/moz.build
2014-02-20 18:09:02 -08:00
Oleg Romashin
97ea26ae06 Bug 974335 - Refactor Qt Widget Backend implementation. skia build fix. r=gw280 2014-02-18 12:45:31 -08:00
Oleg Romashin
dd8bbb70eb Bug 974335 - Refactor Qt Widget Backend implementation. gl changes . r=bjacob 2014-02-20 18:08:50 -08:00
Bill McCloskey
b9eee1d1e8 Bug 974007 - Change OMTC behavior when browser.tabs.remote is set (r=mattwoodrow,felipe) 2014-02-20 17:26:41 -08:00
Wes Kocher
a774349143 Backed out changeset cf6a31bca4e0 (bug 939276) for webgl reftest crash
--HG--
rename : gfx/gl/SkiaGLGlue.cpp => gfx/gl/GLContextSkia.cpp
2014-02-20 15:23:52 -08:00
Kartikaya Gupta
03c5e5c8ce Bug 965945 - Prevent the parent process from running out of memory if the child process requests a giant gralloc buffer. r=bjacob 2014-02-19 12:08:00 -05:00
James Willcox
df0c006a7c Bug 939276 - Use a single GLContext for all SkiaGL canvases r=vlad,gwright,bjacob
--HG--
rename : gfx/gl/GLContextSkia.cpp => gfx/gl/SkiaGLGlue.cpp
extra : rebase_source : 8e85dd34a67c2e193480e9f1f5baf68a898790fe
2014-02-20 16:20:28 -06:00
Matt Woodrow
365afc3765 Bug 947227 - Remove SurfaceStream_TripleBuffer_Async since it no longer has any users. r=jgilbert 2014-02-21 11:08:36 +13:00
Matt Woodrow
87af70d830 Bug 947227 - Stop using SurfaceStream_TripleBuffer_Async since it can hang if the compositor fails to pull the latest surface. r=jgilbert 2014-02-21 11:08:05 +13:00
Benoit Jacob
fa38812d80 Bug 971695 - 2/2 - make YCbCrImageDataSerializer check data size - r=nical 2014-02-20 16:04:13 -05:00
Benoit Jacob
fb744ce009 Bug 971695 - 1/2 - make ImageDataSerializer check data size - r=nical 2014-02-20 16:04:11 -05:00
Benoit Jacob
b9dfe856c4 Bug 971678 - Validate the compositable type in SetCompositableHost - r=nical 2014-02-20 15:07:04 -05:00
Benoit Jacob
e025cb0982 Bug 969549 - Make PCompositableTransaction check actual layer types before casting - r=nical 2014-02-20 15:05:48 -05:00
Benoit Jacob
513b00930e Bug 968001 - In OpSetRoot, check that the new root is a root - r=nical 2014-02-20 15:05:08 -05:00
Benoit Jacob
0fad7ce678 Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it - r=mattwoodrow 2014-02-20 11:41:39 -05:00
Benoit Jacob
2452416427 Bug 968833 - 2/2 - ThebesLayerComposite should be TYPE_THEBES, not TYPE_SHADOW - r=nical 2014-02-20 11:41:04 -05:00
Benoit Jacob
9372f00a95 Bug 968833 - 1/2 - Make PLayerTransaction check actual layer types before casting - r=jrmuizel 2014-02-20 11:40:55 -05:00
Jan Beich
fa2fd2e470 Bug 974272 - Remove obsolete skia patch for BSDs. r=gw280 2014-02-20 09:36:10 -05:00
Jan Beich
ab53755dd8 Bug 974272 - Unbreak skia on tier3 platforms by dropping unused setProcessorAffinity() implementation. r=gw280 2014-02-20 09:35:58 -05:00