Ehsan Akhgari
666a59371c
Back out bug 594774 because of reftest failures and crashtest assertions
2010-09-15 12:28:29 -04:00
Gervase Markham
ed8c9853d7
Bug 595865 - numerous updates to the IDN TLD whitelist. a=beltzner.
2010-09-15 17:06:55 +01:00
Oleg Romashin
27fa97f1ea
Bug 556487 - Disable layers for non-ipc API. r=roc a=blocking2.0
2010-09-15 09:02:47 -07:00
Robert O'Callahan
832fbcb619
Bug 594774. Test a=blocking-beta6+
2010-09-15 11:30:27 -04:00
Boris Zbarsky
7b0a48122f
Bug 578890. Stop leaking shutdown observers from prefbranches. r=bsmedberg
2010-11-04 16:06:05 -04:00
Chris Jones
6b660e608b
Like bug 607123, disable tests that are bogus without the test plugin. rs=roc a=test-only
2010-11-03 14:37:16 -05:00
Mounir Lamouri
abf118e3a7
Fix intermittent failures in test_cocoa_focus.html. r=jst a=tests
2010-11-03 00:48:45 +01:00
Mounir Lamouri
69515390a1
Bug 595062 - Fix Intermittent mochitest-ipcplugins failures in test_cocoa_focus.html. r=jst a=tests
2010-10-29 21:50:27 +02:00
Dan Witte
4af4661231
Bug 590512 - Firefox 4.0b Crash [@ PL_DHashTableOperate | nsPrefBranch::GetBoolPref(char const*, int*) ]. r=dougt, a=final+
2010-10-07 14:00:17 -07:00
Alon Zakai
59ba7c8aa3
Bug 595142 - Animated gif/apng do not animate when used as background. r=bholley,joe a=blocking-final+
2010-10-07 11:54:34 -07:00
Josh Matthews
90338b14d0
Bug 601557 - Retain requests to avoid early GC.
2010-10-04 04:38:42 -04:00
Jonathan Kew
3e72e86729
bug 527276 - part 5 - implement pref to control whether OTL tables are preserved in sanitized fonts. r=jdaggett a=blocking2.0
2010-10-07 08:59:19 +01:00
Jonathan Kew
a3d07f0790
bug 527276 - part 3 - apply OTS sanitizer to downloaded fonts. r=jdaggett a=blocking2.0
2010-10-07 08:59:19 +01:00
timeless@mozdev.org
79a99ff93e
Bug 615569 warning: statement with no effect for each png_warning/png_chunk_warning
...
r=glennrp
--HG--
extra : rebase_source : 074dd62520f0cc0525ef68175ec8981435ed557a
2010-12-04 11:06:30 +01:00
Vladimir Vukicevic
5aa671acea
b=603367, disable ANGLE/WebGL on Linux until build system issues are fixed (bug 559964)
2010-12-03 14:44:01 -08:00
Josh Aas
10f5a0354f
Bug 573873: Make sure to propagate redirect notifications whenever we don't kill the redirect for plugins. r=jst sr=bz a=blocking2.0betaN+
2010-12-03 10:46:10 -05:00
Josh Aas
c04477ac1b
Bug 615881: Fix several bugs related to the handling of NPAPI's NPPluginFuncs structure. r=bsmedberg a=blocking2.0final+
2010-12-03 00:20:59 -05:00
Emmanuel Gil Peyrot
201fbb3800
Bug 606990 - Remove CAIRO_HAS_DDRAW_SURFACE/CAIRO_DDRAW_USE_GL dead code. r=vlad,jmuizelaar a=bsmedberg
2010-11-24 11:11:45 +01:00
Michael Wu
75eedc3cff
bug 613603 - Don't check the manifest in the omnijar r=tglek a=blocking-fennec
2010-11-23 21:14:52 -05:00
Luke Wagner
2fc61cf52e
Bug 609440, part 3 - remove fallible public APIs, update mozilla (r=bent,jst,mrbkap,waldo,sdwilsh)
2010-12-03 00:24:17 -08:00
Jonathan Kew
08134f2072
bug 624789 - allow for non-ASCII characters when reading plugin info strings on OS X. r=josh a=josh
2011-01-14 13:15:48 +00:00
Mounir Lamouri
b6a36b5882
Bug 610216 - Fix build bustage when SMIL is disabled. r=dholbert a=bustage
2010-11-08 10:59:59 +01:00
Robert O'Callahan
669ff953e8
Bug 602200. Share code to compute effective transforms and opacity, and snap effective transforms. r=bas,sr=vlad,a=blocker
2010-11-08 22:06:15 +13:00
Robert O'Callahan
bdd5b7e09e
Bug 594977. Part 1: Make ui.trackpoint_hack.enabled live, and add ui.window_class_override pref. r=jmathies,a=blocker
2010-11-08 22:06:13 +13:00
Mike Hommey
92227a094a
Bug 605406 part 1 - Don't build files that are included in ftbase.c. r=pavlov,r=khuey,a=blassey
2010-11-07 09:20:51 +01:00
Josh Aas
571458ce11
Remove Windows line endings. No bug. a=josh
2010-11-06 16:27:39 -04:00
Daniel Holbert
0c7a86d62e
Bug 606942: Pause SMIL Animation Controller (not just time container), and allow helper-images to suspend, when SVG-as-an-image is paused. r=roc a=blocking-final
2010-11-06 12:13:01 -07:00
Jacek Caban
e015e6c248
Bug 606846 - nsPluginNativeWindowWin.cpp compilation broken on mingw r=jmathies a=benjamin
...
--HG--
extra : rebase_source : 07b87af2bba5542e022490765c6402f749871642
2010-11-06 14:25:34 +00:00
Scott Greenlay
763efb5eb3
Bug 607444 - Quicktime plugin claims 'application/pdf' MIMEType resulting in single page image for pdf. r=josh
2010-11-06 10:38:45 +01:00
Oleg Romashin
142c1d024b
Bug 595697 - nsIPluginInstance.h(30) : warning C4099: 'gfxASurface' : type name first seen using 'class' now seen using 'struct' r=benjamin a=approval2.0
2010-11-06 10:42:39 +02:00
Phil Ringnalda
6a53b136a5
Bug 608544 - Don't console-spam a totally expected warning about not getting the pref plugins.unloadASAP which has no default value, r+a=josh
2010-10-30 14:01:53 -07:00
Robert O'Callahan
37ce525680
Bug 616901. Fix rect in nptest_windows.cpp, to fix misrendering in 580160-1-ref.html. r=bsmedberg a=tests-only
2010-12-10 10:30:50 -08:00
Scott Greenlay
0a5b711056
Bug 616271: Add architecture and list of invalid plugins to pluginreg, r=josh,taras a=blocking-beta9
2010-12-09 14:28:15 -08:00
Taras Glek
b9e24f22f3
Bug 616271 - Only check plugin validity once r=josh a=blocking-beta9
2010-12-10 10:23:48 -08:00
Patrick McManus
c9ce2e3285
workaround for bugs 614677 and 613977: Disable accelerated SYN retry for FF 4.0 Beta 8. r=jduell, a=shaver
2010-12-09 15:19:28 -08:00
Robert Longson
618ecff833
Bug 617448 - remove svg.enabled as the browser now uses SVG and fails to start if it's disabled r+a=roc
2010-12-08 21:25:06 +00:00
Patrick McManus
725731c1fa
Bug 616733: Disable websockets by default. r=peterv,jst a=beta8
...
Can be turned on by setting preference
network.websocket.override-security-block. Websockets can only be used if
override-security-block and network.websocket.enabled are both set to true.
At a future time, with a more secure websocket protocol, the
override-security-block preference can be removed.
This action is based on the security concern over an HTTP cache
poisoning attack as described in
http://www.adambarth.com/experimental/websocket.pdf
2010-12-08 14:12:51 -08:00
timeless@mozdev.org
3abf353848
Bug 615066 potential crash [@ nsPluginHost::HandleBadPlugin] if !aInstance
...
r=josh, a=josh
--HG--
extra : rebase_source : c9116eca854b56984cbebdf347658a8caa93a274
2010-12-08 12:22:10 +00:00
Mats Palmgren
a1431d3f47
Bug 610601 - re-use the frame only if there is image data. r+a=joe
2010-12-08 03:20:52 +01:00
Joe Drew
ddfb4ec44c
Bug 528946 - Move the iframe below the script in test_bug497665.html so we don't get checkFirst is not defined when the iframe's onload races parsing the script, a=test
2009-11-19 13:46:00 -08:00
Alon Zakai
e25f68a8cf
Bug 609752 - Remove mChannel from nsProgressNotificationProxy. r=dougt,jduell a=blocking-fennec
2010-11-21 11:21:57 -08:00
Patrick McManus
b46439ff28
Bug 592284 - Accelerate TCP connection retries in HTTP. r=honzab a=blocking2.0
...
Losing a TCP SYN requires a long painful (typically 3 second) delay
before being retried. This patch creates a second parallel connection
attempt for any nsHttpConnection which has not become writable before
a timeout occurs.
If you assume .5% packet loss, this converts a full 3 second delay
from a 1 in 200 event into a 1 in 40,000 event.
Whichever connection establishes itself first is used. If another one
has been started and it does connect before the one being used is
closed then the extra one is handed to the connection manager for use
by a different transaction - essentially a persistent connection with
0 previous transactions on it. (Another way to think about is
pre-fetching a 3WHS on a high latency connection).
The pref network.http.connection-retry-timeout controls the amount of
time in ms to wait for success on the initial connection before beginning
the second one. Setting it to 0 disables the parallel connection, the
default is 250.
2010-11-21 09:50:36 +01:00
Jonathan Kew
d572b7fa06
bug 603879 - part 2 - update harfbuzz integration to support arabic etc shaping. r=jdaggett a=blocking2.0
2010-11-20 17:49:12 +00:00
Scott Greenlay
2633ddbcf2
Bug 613679 - pluginreg.dat rewritten on plugins list construction, even if there are no changes, r=josh, a=josh
2010-11-19 18:00:52 -08:00
Steven Michaud
2e29bcd78b
Bug 611910 - (try again with leak fixed) r=josh a=blocking2.0BetaN+
2010-11-19 14:58:59 -06:00
Daniel Holbert
9863cb8ff8
Backed out changeset 16c2e141d418 (Bug 611910) due to crashtest leak/orange. a=orange
2010-11-19 11:08:13 -08:00
Steven Michaud
ca1e7b72a9
Bug 611910 - r=josh a=blocking2.0BetaN+
2010-11-19 12:14:15 -06:00
Daniel Holbert
6f00bf9e8b
Bug 612662 patch 4: Prevent reentrant calls to VectorImage::Draw, and prevent scrollbars (even unpainted ones) in SVG-as-an-image helper documents. r=roc a=blocking-final+
2010-11-19 08:56:06 -08:00
Werner Lemberg
f2351c161e
Fix Savannah bug #31310 . r=stuart a=blocking-fennec
...
From 59eb9f8cfe7d1df379a2318316d1f04f80fba54a Mon Sep 17 00:00:00 2001
Date: Tue, 12 Oct 2010 05:49:17 +0000
* src/truetype/ttgxvar.c (ft_var_readpackedpoints): Protect against
invalid `runcnt' values.
---
2010-11-18 16:36:23 -05:00
Werner Lemberg
c9d1db2122
[truetype] Improve error handling of `SHZ' bytecode instruction. r=stuart a=blocking-fennec
...
From 0edf0986f3be570f5bf90ff245a85c1675f5c9a4 Mon Sep 17 00:00:00 2001
Date: Wed, 06 Oct 2010 09:52:27 +0000
Problem reported by Chris Evans <scarybeasts@gmail.com>.
* src/truetype/ttinterp.c (Ins_SHZ): Check `last_point'.
---
2010-11-18 16:36:22 -05:00
Benjamin Smedberg
3930901751
Bug 602891 part A - refactor the code which notes intentional crashes for leak logging, so that it can be shared between testplugin and the jetpack. r=ted
...
--HG--
extra : rebase_source : c1f50eb1525883cfec34a7d0fec81d8227c5b8f6
2010-11-17 15:55:25 -05:00
Daniel Holbert
7d7735705e
Bug 611797 part 2: Shift shared code from VectorImage/RasterImage to Image superclass, and add impl for VectorImage::ShouldAnimate. r+a=joe
2010-11-17 12:39:23 -08:00
Daniel Holbert
d54a0c55a5
Bug 611797 part 1: Expand NS_DECL_IMGICONTAINER in RasterImage & VectorImage. r+a=joe
2010-11-17 12:37:08 -08:00
Josh Aas
6094c78eb9
Bug 573873: Fix bug in HTTP handling for plugins. r=jst a=blocking2.0
2010-11-17 14:25:48 -05:00
Jim Mathies
88f27be782
Bug 596094 - Restore plugin subclass when Flash resets it in full screen mode (ipc disabled case). r=jst, a=betaN
2010-10-21 16:52:48 -05:00
Jim Mathies
70d293e34e
Bug 596094 - fix a race condition w/ipc disabled in focus related event handling. r=jst, a=betaN
2010-10-21 16:52:48 -05:00
Jim Mathies
919aff5252
Bug 596094 - Do a little cleanup work on nsPluginNativeWindowWin. r=jst, a=betaN
2010-10-21 16:52:48 -05:00
Ehsan Akhgari
8cb47ac37f
Bug 604820 - Add dot-iran to IDN whitelist; r=gerv a=jst
2010-10-15 21:14:02 -04:00
Dão Gottwald
6d06140d75
correctly remove event listeners in browser_image.js
2010-10-21 10:11:52 +02:00
Jacek Caban
f719b4c3e5
Bug 605116 - Properly declare functions without arguments in npfunctions.h r=joshmoz a=benjamin
2010-10-20 17:30:36 +00:00
Walter Meinl
5a0c2f772a
bug604768 [OS/2] break - follow-up removal of argument to NS_TRY_SAFE_CALL_* macros r=daveryeo a=NPOTB
2010-10-20 17:27:27 +00:00
Robert Sayre
4b57cb09ac
Merge tracemonkey to mozilla-central. a=blockers
2010-10-20 09:13:20 -05:00
Mike Kristoffersen
18266960c0
Bug 599545 - Investigate remote-prefs serialization performance. r=dwitte, a=blocking-fennec2.0b2+
2010-10-19 22:35:08 +02:00
Bas Schouten
334f7c09ff
Bug 605547: Enable D3D10 layers by default. r=jrmuizel a=blocking-beta8
2010-10-19 21:08:36 +02:00
Josh Aas
0b42f3de72
Bug 599087: Re-enable plugin crash tests on Mac OS X. a=test
2010-10-18 16:11:49 -04:00
Josh Aas
41886b010b
Bug 599267: Re-enable "test_bug479979.xul" on Mac OS X. a=test
2010-10-18 08:52:06 -04:00
Dão Gottwald
fb4740e982
no bug - stop using switchToTabHavingURI in this test
...
--HG--
extra : rebase_source : 5d008141da6e923c003d00bb7e48cd1d482a483e
2010-10-17 21:50:15 +02:00
Dão Gottwald
7b1c733e7a
Backed out changeset 6e4cddb22430 in order to fix debug test failures
2010-10-17 21:34:08 +02:00
Dão Gottwald
1031ee6288
no bug - stop using switchToTabHavingURI in this test
...
--HG--
extra : rebase_source : a27d931a8067443d8c183a5650025e2d212bc00e
2010-10-16 19:48:29 +02:00
Jim Mathies
c6d72f81ef
Bug 603417 - Disable oopp for java on windows. r=bsmedberg, josh, a=final.
2010-10-15 11:04:39 -05:00
Ehsan Akhgari
50b7ea5c7b
Bug 604495 - Memory corruption in the GIF decoder destruction; r=joe a=blocking-final+
...
--HG--
extra : rebase_source : cc0de4cde5c66dd69b446c0e0368a9d0560f40ca
2010-10-14 19:53:42 -04:00
Ehsan Akhgari
1a982101c1
Bug 603679 - Shockwave fails to load (10-9 nightly and newer); r=bsmedberg a=blocking-beta8+
...
--HG--
extra : rebase_source : 5bfa6f5e1da87af2b5f4d09cb70570534a0dad70
2010-10-14 19:53:42 -04:00
Josh Aas
2a74634539
Bug 599076: Re-enable "test_crashing.html" on Mac OS X. a=test
2010-10-15 11:12:02 -04:00
Josh Aas
937da48371
Bug 599378: Re-enable "test_hanging.html" on Mac OS X. a=test
2010-10-14 22:05:48 -04:00
Jacek Caban
0456af894a
Bug 603373 - Remove unused library argument of NS_TRY_SAFE_CALL_* macros r=joshmoz a=benjamin
2010-10-14 21:06:31 +00:00
Taras Glek
cf38d1c59a
Bug 594172 - ZipWriter write()s too often r=Mossop a=2.0
2010-09-14 15:47:47 -04:00
Siddharth Agarwal
cfc0ed2c21
Bug 590116. r=joe, sr=vlad, a=blocking-betaN+
2010-09-14 21:45:32 +05:30
Daniel Holbert
9280adab71
Bug 595401: Make SVGRootRenderingObserver toggle "mInObserverList" if it adds itself as a rendering observer. r=roc a=blocking
...
--HG--
extra : rebase_source : 9fc516456c13906f843c473d5c04c845cb4cacee
2010-09-13 17:06:53 -04:00
Vladimir Vukicevic
c5d2c16c6c
b=593720; make webgl less verbose; r=bjacob
2010-09-13 08:40:01 -07:00
Bobby Holley
25302d83c3
Bug 514033 - Error recovery for imagelib - part 16 - Eliminate checks for infallible malloc, use infallible malloc when we need it.r=joe,a=blocker
2010-09-12 08:22:31 -07:00
Bobby Holley
6fd21749ad
Bug 514033 - Error recovery for imagelib - part 15 - Rename Is*Error to Has*Error.r=joe,a=blocker
2010-09-12 08:22:31 -07:00
Bobby Holley
d802000b21
Bug 514033 - Error recovery for imagelib - part 14 - Log data errors to the console.r=joe,a=blocker
2010-09-12 08:22:31 -07:00
Bobby Holley
2def2be9ee
Bug 514033 - Error recovery for imagelib - part 13 - Stop checking IsError() in decoder implementations.r=joe,a=blocker
2010-09-12 08:22:31 -07:00
Bobby Holley
d9a7098dd2
Bug 514033 - Error recovery for imagelib - part 12 - Make Decoder API methods return void.r=joe,a=blocker
2010-09-12 08:22:31 -07:00
Bobby Holley
6768bbbda2
Bug 514033 - Error recovery for imagelib - part 11 - Move error-case teardown notifications into Decoder::Finish(), and call it unconditionally.r=joe,a=blocker
2010-09-12 08:22:30 -07:00
Bobby Holley
93bfdd8baa
Bug 514033 - Error recovery for imagelib - part 10 - Make mObserver and friends Decoder-private.r=joe,a=blocker
2010-09-12 08:22:30 -07:00
Bobby Holley
4f052631cc
Bug 514033 - Error recovery for imagelib - part 9 - Coalesce end-of-decode notifications into superclass.r=joe,a=blocker
2010-09-12 08:22:30 -07:00
Bobby Holley
6b88ca3f31
Bug 514033 - Error recovery for imagelib - part 8 - Remove GIFWrite.r=joe,a=blocker
2010-09-12 08:22:30 -07:00
Bobby Holley
5b4da946e7
Bug 514033 - Error recovery for imagelib - part 7 - Move mIsHidden check inside nsPNGDecoder::EndImageFrame.r=joe,a=blocker
2010-09-12 08:22:30 -07:00
Bobby Holley
578246d765
Bug 514033 - Error recovery for imagelib - part 6 - Get rid of EndFrameDecode() and friends.r=joe,a=blocker
2010-09-12 08:22:30 -07:00
Bobby Holley
b3f97bdc86
Bug 514033 - Error recovery for imagelib - part 5 - Coalesce OnStartDecode into superclass.r=joe,a=blocker
2010-09-12 08:22:30 -07:00
Bobby Holley
aad9b96c04
Bug 514033 - Error recovery for imagelib - part 4 - Stop returning errors from image decoders.r=joe,a=blocker
2010-09-12 08:22:30 -07:00
Bobby Holley
83acf8a223
Bug 514033 - Error recovery for imagelib - part 3 - Make errors returned by superclass methods contingent only on IsError().r=joe,a=blocker
2010-09-12 08:22:28 -07:00
Bobby Holley
9401c8f0d2
Bug 514033 - Error recovery for imagelib - part 2 - Notify the superclass error reporting framework when an error occurs.r=joe
2010-09-12 08:22:27 -07:00
Bobby Holley
eb1d2f2ae8
Bug 514033 - Error recovery for imagelib - part 1 - Introduce error tracking to Decoder.r=joe,a=blocker
2010-09-12 08:22:27 -07:00
Bobby Holley
bb2adb491c
Bug 593489 - Make Image hold onto its URI.r=joe,a=blockerblocker
2010-09-12 08:22:26 -07:00
Robert Sayre
4659902f34
jaegermonkey. what. a=arewefastyet
2010-09-11 15:06:33 -04:00
Robert Sayre
59773ae503
Merge mozilla-central to tracemonkey.
2010-09-10 11:47:11 -04:00
Mounir Lamouri
afad64a8ef
Bug 594952 - Fix compilation of SVGDocumentWrapper.cpp when SMIL is disabled. r=dholbert a2.0=bustage
2010-09-10 07:04:30 +02:00
Taras Glek
c056cff8eb
Bug 590242 - Do not open omnijar 3x r=mwu, sr=bsmedberg, a=beltzner
2010-09-09 14:01:00 -07:00
Ben Turner
cf28451779
Bug 591516 - 'IndexedDB: Add some UI to prompt for IndexedDB permissions'. r=sicking+gavin.
2010-09-09 15:15:40 -07:00
Mounir Lamouri
6d4b563809
Bug 369306 - Tests for bug 369306 and fixing broken tests. r=jst a2.0=test-only
2010-09-09 20:20:06 +02:00
Daniel Holbert
ecd6d13497
Bug 594650: Replace static variable in header file with static variable + accessor method, to fix codesighs & Composer.dll bustage. r=roc r=taras a=bustage
2010-09-09 09:41:58 -07:00
L. David Baron
1771274bc6
Add workaround for bad pixel in pluginproblem reftest. (Bug 459144) a2.0=blocking2.0:beta6
...
--HG--
rename : modules/plugin/test/reftest/pluginproblemui-direction-ref.html => modules/plugin/test/reftest/pluginproblemui-direction-1-ref.html
rename : modules/plugin/test/reftest/pluginproblemui-direction-ref.html => modules/plugin/test/reftest/pluginproblemui-direction-2-ref.html
rename : modules/plugin/test/reftest/pluginproblemui-direction-1.html => modules/plugin/test/reftest/pluginproblemui-direction-2.html
2010-09-09 08:21:47 -07:00
Robert Sayre
edb7aca0d0
merge mozilla-central to tracemonkey.
2010-09-08 10:33:07 -04:00
Jim Mathies
f027840943
Bug 531551 - fix for crashes with older acrobat versions. r=jimm, a=blocking-final.
2010-09-07 11:12:28 -05:00
Joe Drew
46fd89bffd
Bug 581212 - turn on Direct3D accelerated layers by default on Windows. r=vlad a=blocking2.0:beta6+
2010-09-05 01:39:38 -04:00
Mounir Lamouri
bd17b385f2
Merge backout
2010-09-11 02:58:35 +02:00
Mounir Lamouri
de9895d42c
Back out bug 559942
2010-09-11 02:57:06 +02:00
Michael Wu
85b940bc47
Bug 533038 - 7. Extensions should not be extracted into the profile directory, but installed/stored as XPI file, r=Mossop a=blocking-beta6
2010-09-10 15:54:37 -07:00
Byron Milligan
4d7b0becf6
Bug 559942, Part 4: UI change allowing user to turn smart sizing on or off.
...
r=gavin, a=beta6+
2010-09-08 17:49:17 -07:00
L. David Baron
c5062dc79d
Fix missing negation. (Bug 276431) r=dholbert a=orange
2010-09-08 15:56:15 -07:00
Oleg Romashin
3b53e5dd97
Bug 556487 - test should wait for paint after setColor. r=roc a=blocking2.0
...
--HG--
extra : rebase_source : 69ae8709316d2bdad04e7efd3cfc49a5bc8d12d4
2010-09-10 11:30:03 -07:00
Oleg Romashin
1aa4439c1d
Bug 556487 - Plugin child/parent/PluginInstance API part. r=roc a=blocking2.0
...
--HG--
extra : rebase_source : 2c07b0dd0f24e704571f43d3e44dd4126a7b3c7d
2010-09-10 11:28:52 -07:00
Taras Glek
69a8116f85
Bug 589368 - Locale repacking support for jar reordering; r=ted a=blocking-betaN+
2010-09-10 12:30:07 -04:00
Daniel Holbert
66639dce30
Bug 276431 Patch 14: Add SVGRootRenderingObserver helper-class, to catch invalidations in helper-document. r=roc a=blocking
2010-09-08 13:40:40 -07:00
Daniel Holbert
582d6bc46c
Bug 276431 Patch 13: Fill in implementation for mozilla::imagelib::VectorImage. r=joe r=roc a=blocking
2010-09-08 13:40:39 -07:00
Daniel Holbert
7399c41bb2
Bug 276431 Patch 12: Add SVGDocumentWrapper helper-class. r=joe r=roc a=blocking
2010-09-08 13:40:39 -07:00
Daniel Holbert
d36664dafe
Bug 276431 Patch 11: Add stub code for VectorImage. r=joe a=blocking
2010-09-08 13:40:39 -07:00
Daniel Holbert
f246613ef4
Bug 276431 Patch 10: Make imgContainer::Draw take image-viewport-size, and improve nsLayoutUtils drawing wrappers. r=roc r=joe a=blocking
2010-09-08 13:40:39 -07:00
Daniel Holbert
4212070b9f
Bug 276431 Patch 7: Add sentinel value "mozilla::imagelib::kFullImageSpaceRect" in imgIContainer. r=joe a=blocking
2010-09-08 13:40:39 -07:00
Daniel Holbert
f3ccf9a90b
Bug 276431 part 2: Add imgIContainer::GetRootLayoutFrame. r=joe a=blocking
2010-09-08 13:40:38 -07:00
Daniel Holbert
053e30a125
Bug 276431 part 1: For SVG images, pass through OnStartRequest/OnDataAvailable/OnStopRequest from imgRequest. r=joe a=blocking
2010-09-08 13:40:38 -07:00
Joe Drew
32f12f123f
Without roc's reftest patch, we can't turn on D3D9, because we don't have reftest coverage. Back out the on-by-default patch.
2010-09-04 00:34:05 -04:00
Joe Drew
47f098c946
Bug 581212 - turn on Direct3D accelerated layers on Windows. r=vlad a=blocking2.0:beta6+
2010-09-03 23:27:07 -04:00
Doug Turner
59a14c27ff
Bug 592308. IsLowMemory() is terribly slow and there is nothing to do about it. r=bsmedberg a=blocking-fennec2.0
2010-09-02 19:02:06 -03:00
Ms2ger
4185e805f1
Bug 590970 - Don't compare PL_strcasecmp's return value to nsnull; r=joshmoz approval2.0=jst
2010-09-02 22:18:04 +02:00
Luke Wagner
5e9978f911
Bug 581263 - remove slow natives (r=waldo,mrbkap)
2010-08-16 12:35:04 -07:00
David Mandelin
5eba7a1580
[JAEGER] Merge from Tracemonkey.
2010-08-31 10:36:08 -07:00
Miika Jarvinen
ff74404c78
Bug 591019 - Crash if description returned by plugin is empty. r=joshmoz a=b5
2010-08-30 17:40:13 -07:00
David Mandelin
f575742690
[JAEGER] Merge from Tracemonkey.
2010-08-30 11:38:48 -07:00
Michael Wu
61d1bf0634
Bug 591866 - channel-prefs.js should not be in omni.jar, r=bsmedberg a=blocking-beta5
2010-08-30 16:37:08 -07:00
Dan Witte
ccd3c28130
Back out Bug 536324 part 2.
2010-08-30 13:20:39 -07:00
Dan Witte
c4091d7694
Back out Bug 536324 part 3.
2010-08-30 13:20:39 -07:00
Dan Witte
86583b1783
Back out Bug 589292.
2010-08-30 13:20:38 -07:00
Dan Witte
a5ebf043df
Merge m-c -> e10s.
2010-08-28 13:39:42 -07:00
David Mandelin
78cdeefdf2
[JAEGER] Merge from Tracemonkey.
2010-08-24 11:56:29 -07:00
David Mandelin
e312d7b947
[JAEGER] Enable tracejit for content to start testing trace integration on tinderbox
2010-08-23 17:24:34 -07:00
Robert O'Callahan
e1bb3d5dc8
Bug 587887. Create pref for refresh driver timer, and make it 60Hz by default. r=dbaron,a=bsmedberg
2010-08-23 21:30:08 +12:00
David Mandelin
0cc1083236
[JAEGER] Enable tracejit for chrome by default
2010-08-20 16:38:11 -07:00
David Mandelin
a21c621577
Merge from Tracemonkey.
2010-08-19 11:11:36 -07:00
David Mandelin
1d0c044032
[JAEGER] Bug 587865: demote to int when passing parameters to plugins to preserve old behavior
2010-08-17 18:40:16 -07:00
Bobby Holley
108e3fdc74
Bug 513681 - part 17 - remove imgIDecoder.r=joe,sr=shaver,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
d130c66290
Bug 513681 - part 16 - Move end-of-decode logic into Finish() and cleanup into destructor, abolishing Shutdown().r=joe,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
a8ba41c37a
Bug 513681 - part 15 - Coalesce OnStartFrame/OnStopFrame into superclass.r=joe,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
ec845f918a
Bug 513681 - part 14 - Coalesce size-setting into superclass.r=joe,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
18722046a2
Bug 513681 - part 13 - switch from "HEADERONLY" flag to IsSizeDecode()/SetSizeDecode().r=joe,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
68132bdc6f
Bug 513681 - part 12 - Ensure that IsDecodeFinished() is only called with a non-null decoder.r=joe,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
ffd3ad3887
Bug 513681 - part 11 - make RasterImage carry a pointer to a Decoder.r=joe,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
2288ea1376
Bug 513681 - part 10 - make decoder implementations inherit from Decoder.r=joe,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
6d36a28a66
Bug 513681 - part 9 - Move PNG callbacks into decoder class.r=joe,a=blocker
2010-08-22 22:30:46 -04:00
Bobby Holley
bb57916dc5
Bug 513681 - part 8 - Fold nsJPEGDecoder::Flush() into nsJPEGDecoder::Close().r=joe,a=blocker
2010-08-22 22:30:45 -04:00
Bobby Holley
d530205f84
Bug 513681 - part 7 - rename mImageContainer to mImage in nsGIFDecoder2 for consistency with the rest of the decoders.r=joe,a=blocker
2010-08-22 22:30:45 -04:00
Bobby Holley
a5f3d16c03
Bug 513681 - part 6 - Introduce Decoder.cpp and Decoder.h (with virtual destructor).r=joe,a=blocker
2010-08-22 22:30:45 -04:00
Bobby Holley
277ad1663a
Bug 513681 - part 5 - move the decoders out of their subdirectories.r=joe,a=blocker
...
--HG--
rename : modules/libpr0n/decoders/gif/GIF2.h => modules/libpr0n/decoders/GIF2.h
rename : modules/libpr0n/decoders/jpeg/iccjpeg.c => modules/libpr0n/decoders/iccjpeg.c
rename : modules/libpr0n/decoders/jpeg/iccjpeg.h => modules/libpr0n/decoders/iccjpeg.h
rename : modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp => modules/libpr0n/decoders/nsBMPDecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsBMPDecoder.h => modules/libpr0n/decoders/nsBMPDecoder.h
rename : modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp => modules/libpr0n/decoders/nsGIFDecoder2.cpp
rename : modules/libpr0n/decoders/gif/nsGIFDecoder2.h => modules/libpr0n/decoders/nsGIFDecoder2.h
rename : modules/libpr0n/decoders/bmp/nsICODecoder.cpp => modules/libpr0n/decoders/nsICODecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsICODecoder.h => modules/libpr0n/decoders/nsICODecoder.h
rename : modules/libpr0n/decoders/bmp/nsIconDecoder.cpp => modules/libpr0n/decoders/nsIconDecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsIconDecoder.h => modules/libpr0n/decoders/nsIconDecoder.h
rename : modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp => modules/libpr0n/decoders/nsJPEGDecoder.cpp
rename : modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h => modules/libpr0n/decoders/nsJPEGDecoder.h
rename : modules/libpr0n/decoders/png/nsPNGDecoder.cpp => modules/libpr0n/decoders/nsPNGDecoder.cpp
rename : modules/libpr0n/decoders/png/nsPNGDecoder.h => modules/libpr0n/decoders/nsPNGDecoder.h
2010-08-22 22:30:45 -04:00
Bobby Holley
aafd48c682
Bug 513681 - part 4 - Get rid of CIDs and friends for decoders.r=joe,a=blocker
2010-08-22 22:30:45 -04:00
Bobby Holley
315c1087fb
Bug 513681 - part 3 - instantiate decoders without using COM goop.r=joe,a=blocker
2010-08-22 22:30:45 -04:00
Bobby Holley
8d69ad0207
Bug 513681 - part 2 - remove support for the MOZ_IMG_DECODERS build option.r=joe,khuey.a=blocker
2010-08-22 22:30:45 -04:00
Bobby Holley
404336876f
Bug 513681 - part 1 - fix a few warnings.r=joe,a=blocker
2010-08-22 22:30:44 -04:00
Bobby Holley
daad8d9668
Bug 587371 - Image.h PRUint32 getters shouldn't be COM-y. r=joe,a=blocker
2010-08-22 22:30:44 -04:00
bhsieh@mozilla.com
fba716bbcd
bug 520309, startupcache core r=dwitte sr=bsmedberg a=bsmedberg
2010-08-12 12:37:44 -07:00
Dan Witte
8937bd5738
Bug 589292 - e10s necko: add contentDisposition prop to nsIChannel. r=jduell, sr=biesi, a=beta5+
2010-08-25 17:51:21 -07:00
Dan Witte
f2000be3eb
Merge.
2010-08-23 17:30:33 -07:00
Daniel Holbert
a4aa680184
(no bug) tabs-vs-spaces consistency fix in imagelib Makefile.in. [one-liner whitespace-only] a=NPOTB
2010-08-23 15:45:16 -07:00
Daniel Holbert
1270ce9d8f
Bug 587902, part 3: Add NS_ABORT_IF_FALSE statements in imgStatusTracker for assumptions about mImage. r=joe a=blocking
2010-08-23 15:44:35 -07:00
Daniel Holbert
45d36a247a
Bug 587902, part 2: Instantiate imgRequest::mImage only after we know its mimetype. r=joe a=blocking
2010-08-23 15:44:07 -07:00
Daniel Holbert
2605301c67
Bug 587902, part 1: Allow an imgStatusTracker to be instantiated before its Image. r=joe a=blocking
2010-08-23 15:44:07 -07:00
Daniel Holbert
03b9bef68e
Bug 587800: Move GetCurrentFrameIndex & GetNumFrames from Image to RasterImage. r=bholley a=blocking
2010-08-23 15:44:07 -07:00
Daniel Holbert
3e6fd6e245
Bug 587779: remove unused nsresult return-val from Image::GetCurrentFrameRect. r=bholley a=blocking
2010-08-23 15:44:07 -07:00
Bobby Holley
9b62c35018
Bug 578357 - Use fallible allocation for image frames.r=joe,cjones;a=blocker
2010-08-23 15:42:51 -07:00
Dan Witte
5f4dbe5953
Bug 536324 - e10s HTTP: refactor nsHashPropertyBag. Part 3: contentLength consumers. r=jduell, a=beta5+
2010-08-21 00:31:35 -07:00
Dan Witte
4439f97632
Bug 536324 - e10s HTTP: refactor nsHashPropertyBag. Part 2: contentLength implementors. r=jduell, a=beta5+
2010-08-21 00:31:11 -07:00
Bobby Holley
15d915d341
Bug 563088 - Re-enable image discarding.r=joe,a=blocker
2010-08-20 23:43:46 -04:00
Jonas Sicking
cbc0676504
Backout bugs 586754, 574189, 584611 due to orange. a=backout
2010-08-20 11:08:43 -07:00
Joel Maher
6763342e81
Bug 586754 xpcshell tests should use relativesrcdir instead of $MODULE r=:Mitch a=NPOTB
2010-08-20 09:32:58 -07:00
Joel Maher
978a4a1ad2
Bug 574189 - Fix chrome tests so they can run from a .jar bundle (e10s, android) r=ctalbert a=NPOTB
2010-08-20 09:28:13 -07:00
David Mandelin
9376a78c81
[JAEGER] Merge from Tracemonkey. This picks up Yarr.
2010-08-12 11:42:16 -07:00
Robert Sayre
ff3fd8aeaf
Merge mozilla-central to tracemonkey.
2010-08-12 10:12:04 -07:00
Bobby Holley
f82f638ea9
Bug 583825 - Progressive decoding/display of images no longer works; r=joe a=blocking
...
Since really we want to send OnStartContainer once per-proxy, it doesn't make the most sense to have such handling be done in imgRequest and imgStatusTracker. This patch moves all that into imgRequestProxy, and fixes the bug.
2010-08-12 11:59:37 -04:00
Joe Drew
c52fae20f3
Bug 583028 - Hold on to a runnable while it's outstanding, and add proxies for it to notify when it does get run. This makes us delay onload less. r=bholley a=blocking
2010-08-12 11:59:28 -04:00
Alon Zakai
b04266cca8
Tests for bug 359608 - Animated GIFs are animated even when user navigates to another page.r=joe,a=blocker
2010-09-07 17:34:18 -07:00
Alon Zakai
4606f548ac
Bug 359608 - Animated GIFs are animated even when user navigates to another page.r=bholley,bz;sr=bz;a=blocker
2010-09-07 17:33:02 -07:00
Bobby Holley
5f50423481
Bug 590838 - Combine imgRequestProxy::mLocksHeld and imgRequestProxy::mDeferredLocks.r=joe
2010-08-25 23:21:34 -07:00
Max Stepin
078d2ce3cc
Bug 580182. Make dispose=previous actually work correctly. r=joe, a=joe
2010-09-07 15:10:42 -04:00
Robert Sayre
4aa91b82ce
Merge merge.
2010-08-10 17:00:09 -07:00
David Mandelin
ac09edcf6c
Bug 585501: innerize window before using it as a scope chain in NPN_Evaluate, r=mrbkap
2010-08-10 16:11:32 -07:00
Benedict Hsieh
4be16266ab
Bug 535077 - Fixes hang caused by failure to execute sync launch r=cjones a=blocking2.0
2010-08-10 14:14:10 -07:00
Olli Pettay
545eb51b42
Bug 589431 - Crash when using profile manager [@ mozilla::imagelib::DiscardTracker::ReloadTimeout ], r=bholley, a=blocking
...
--HG--
extra : rebase_source : c5039b467ea61a80ba835767c9dde328db52fb4c
2010-08-22 21:17:25 +03:00
Kyle Huey
c5800700be
Backing out Bug 513681 and Bug 587371 for timeouts.
2010-08-22 10:13:09 -04:00
Bobby Holley
54a728146b
Bug 513681 - part 17 - remove imgIDecoder.r=joe,sr=shaver,a=blocker
2010-08-14 15:48:06 -04:00
Bobby Holley
2679ea50c1
Bug 513681 - part 16 - Move end-of-decode logic into Finish() and cleanup into destructor, abolishing Shutdown().r=joe,a=blocker
2010-08-14 15:40:21 -04:00
Bobby Holley
2cfa69fe88
bug 513681 - part 15 - Coalesce OnStartFrame/OnStopFrame into superclass.r=joe,a=blocker
2010-08-14 13:41:04 -04:00
Bobby Holley
f7ddf62d00
Bug 513681 - part 14 - Coalesce size-setting into superclass.r=joe,a=blocker
2010-08-14 13:06:35 -04:00
Bobby Holley
46533669e3
Bug 513681 - part 13 - switch from "HEADERONLY" flag to IsSizeDecode()/SetSizeDecode().r=joe,a=blocker
2010-08-13 19:10:53 -04:00
Bobby Holley
4fed8a60e8
Bug 513681 - part 12 - Ensure that IsDecodeFinished() is only called with a non-null decoder.r=joe,a=blocker
2010-08-14 11:31:27 -04:00
Bobby Holley
bb217f49d1
Bug 513681 - part 11 - make RasterImage carry a pointer to a Decoder.r=joe,a=blocker
2010-08-13 18:58:54 -04:00
Bobby Holley
250ad09167
Bug 513681 - part 10 - make decoder implementations inherit from Decoder.r=joe,a=blocker
2010-08-12 15:58:25 -04:00
Bobby Holley
428182998f
ug 513681 - part 9 - Move PNG callbacks into decoder class.r=joe,a=blocker
2010-08-12 15:53:31 -04:00
Bobby Holley
5d773a2acf
Bug 513681 - part 8 - Fold nsJPEGDecoder::Flush() into nsJPEGDecoder::Close().r=joe,a=blocker
2010-08-12 14:16:36 -04:00
Bobby Holley
9cbae4f0a2
Bug 513681 - part 7 - rename mImageContainer to mImage in nsGIFDecoder2 for consistency with the rest of the decoders.r=joe,a=blocker
2010-08-12 13:58:44 -04:00
Bobby Holley
4e9dccf71f
Bug 513681 - part 6 - Introduce Decoder.cpp and Decoder.h.r=joe,a=blocker
2010-08-10 20:11:12 -04:00
Bobby Holley
d7bebcd3f1
Bug 513681 - part 5 - move the decoders out of their subdirectories.r=joe,a=blocker
...
--HG--
rename : modules/libpr0n/decoders/gif/GIF2.h => modules/libpr0n/decoders/GIF2.h
rename : modules/libpr0n/decoders/jpeg/iccjpeg.c => modules/libpr0n/decoders/iccjpeg.c
rename : modules/libpr0n/decoders/jpeg/iccjpeg.h => modules/libpr0n/decoders/iccjpeg.h
rename : modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp => modules/libpr0n/decoders/nsBMPDecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsBMPDecoder.h => modules/libpr0n/decoders/nsBMPDecoder.h
rename : modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp => modules/libpr0n/decoders/nsGIFDecoder2.cpp
rename : modules/libpr0n/decoders/gif/nsGIFDecoder2.h => modules/libpr0n/decoders/nsGIFDecoder2.h
rename : modules/libpr0n/decoders/bmp/nsICODecoder.cpp => modules/libpr0n/decoders/nsICODecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsICODecoder.h => modules/libpr0n/decoders/nsICODecoder.h
rename : modules/libpr0n/decoders/bmp/nsIconDecoder.cpp => modules/libpr0n/decoders/nsIconDecoder.cpp
rename : modules/libpr0n/decoders/bmp/nsIconDecoder.h => modules/libpr0n/decoders/nsIconDecoder.h
rename : modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp => modules/libpr0n/decoders/nsJPEGDecoder.cpp
rename : modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h => modules/libpr0n/decoders/nsJPEGDecoder.h
rename : modules/libpr0n/decoders/png/nsPNGDecoder.cpp => modules/libpr0n/decoders/nsPNGDecoder.cpp
rename : modules/libpr0n/decoders/png/nsPNGDecoder.h => modules/libpr0n/decoders/nsPNGDecoder.h
2010-08-12 00:59:59 -04:00
Bobby Holley
6bb6a9c74b
Bug 513681 - part 4 - Get rid of CIDs and friends for decoders.r=joe,a=blocker
2010-08-12 00:31:37 -04:00
Bobby Holley
1d73561460
Bug 513681 - part 3 - instantiate decoders without using COM goop.r=joe,a=blocker
2010-08-11 20:49:50 -04:00
Bobby Holley
9de0c252df
Bug 513681 - part 2 - remove support for the MOZ_IMG_DECODERS build option.r=joe,khuey.a=blocker
2010-08-11 20:12:24 -04:00
Bobby Holley
3ae7b09e52
Bug 513681 - part 1 - fix a few warnings.r=joe,a=blocker
2010-08-13 18:15:20 -04:00
Bobby Holley
4d20b09df3
Bug 587371 - Image.h PRUint32 getters shouldn't be COM-y. r=joe,a=blocker
2010-08-14 18:23:47 -04:00
David Mandelin
acfc0bc281
[JAEGER] Merge from tracemonkey.
2010-08-11 11:30:10 -07:00
David Mandelin
7f2f8cee47
[JAEGER] Bug 585801 trial fix: innerize object passed as scope chain for JS evaluation
...
--HG--
extra : rebase_source : df9b94f7718c1737834ca5516ab3b751d3d0ec65
2010-08-09 18:29:34 -07:00
David Mandelin
df3e6a9e74
[JAEGER] Merge from tracemonkey.
2010-08-09 11:36:39 -07:00
L. David Baron
2d948cf4d9
Mark known random assertion due to bug 585394.
2010-08-07 19:21:44 -07:00
David Mandelin
d7f6c4209b
Merge from Tracemonkey.
2010-08-02 15:55:29 -07:00
Robert Sayre
d580edd975
Merge mozilla-central to tracemonkey.
2010-07-31 14:19:27 -07:00
Bobby Holley
7c0c7249a2
Bug 578591 and bug 579139 - Disable test_bug435296.html and test_bug478398.html due to intermittent orange. r=lumpy
2010-07-31 14:39:06 -04:00
L. David Baron
c06c57f6e6
Fix bustage from bug 570329 with s/windowsWidget/winWidget/g.
2010-07-30 20:50:52 -07:00
L. David Baron
9cc2e9ec05
Switch reftest manifests to new, shorter syntax for widget toolkit tests. (Bug 570329) a2.0=tests
...
This patch was created by running the following sed commands:
s/MOZ_WIDGET_TOOLKIT=="\(gtk2\|cocoa\|qt\|windows\)"/\1Widget/g
s/MOZ_WIDGET_TOOLKIT!="\(gtk2\|cocoa\|qt\|windows\)"/!\1Widget/g
on all *.list files in the tree.
2010-07-30 16:48:57 -07:00
Makoto Kato ext:(%2C%20L.%20David%20Baron%20%3Cdbaron%40dbaron.org%3E)
9438e86b4d
Use a known failure condition that more closely matches when the tests fail (when we use handwritten SSE2 assembly in the JPEG code), so that they don't produce unexpected pass results on 64-bit Windows. (Bug 582850) r=joedrew / dbaron a2.0=tests
2010-08-11 12:32:53 -07:00
L. David Baron
abd263a648
Backed out changeset fef97fa21915 (bug 584582) for causing compilation failures on Windows.
2010-08-11 12:25:55 -07:00
Ted Mielczarek
96fa6e482e
bug 584582 - XP_TTOA not null terminating strings on Linux. r=bsmedberg, a=blocking
...
--HG--
extra : rebase_source : 17a3fc38dc225906301ebb61a24bf3252634af92
2010-08-11 10:57:44 -04:00
David Mandelin
a73ecdeee1
Merge from Tracemonkey.
2010-07-28 11:16:36 -07:00
Justin Lebar
510267fbd6
Backed out changeset d9717604f007
2010-07-30 11:36:18 -07:00
Justin Lebar
111e7ef187
Bug 561076 - Use a hashtable to speed up nsContentUtils::UnregisterPrefCallback. r=bzbarsky a=blocking2.0
...
--HG--
extra : rebase_source : 753885fe23666d392cea378b2d911a754df7ef58
2010-07-30 10:22:57 -07:00
Makoto Kato
2732a9078d
Bug 578588 - Test suite may not work correctly on Win64 because navigator.platform is Win64. r=sayrer, a=Test Only
2010-07-30 17:18:45 +09:00
Josh Aas
ca28c175cb
Bug 583019: Remove unused library management code from the plugin host. r=benwa
2010-07-29 17:53:48 -04:00
Chris Jones
4f403fa196
Bug 582486: Don't read an unused pref when unregistering from the category manager. r=josh
2010-07-29 14:15:13 -05:00
Robert Sayre
073bde8d2b
Merge mozilla-central to tracemonkey.
2010-07-30 21:57:41 -07:00
Vladimir Vukicevic
eb17125496
b=584815; enable WebGL shader validation and remove obsolete texture API; r=bjacob
2010-08-06 22:10:38 -07:00
Shawn Wilsher
e172a0bb3a
Backed out changeset 1302220623fd because it needs to land with 0b3af3fef0fd, which I just backed out on a CLOSED TREE.
2010-08-06 11:19:52 -07:00
Shawn Wilsher
63d60d3263
Bug 580790 - Connection::initialize can access preferences off of the main thread
...
Makes things go boom when preferences are accessed off of the main thread.
r=dwitte
sr=bsmedberg
a=blocking2.0
2010-08-06 10:27:58 -07:00
David Mandelin
3c3566af26
[JAEGER] Merge from tracemonkey.
2010-07-23 18:47:24 -07:00
Michael Wu
9c8e7039fc
Bug 533038 - 6. Add flush-cache-entry to flush specific jars from the cache, r=taras a=blocking-beta6
2010-09-08 20:39:19 -07:00
Michael Wu
ccd55337cc
Bug 533038 - 4. Fully support reading jars inside jars, r=taras a=blocking-beta6
2010-09-08 20:38:34 -07:00
Michael Wu
d08db42494
Bug 533038 - 3. Support reading preferences from arbitrary jars, r=dwitte a=blocking-beta6
2010-09-08 20:38:12 -07:00
Michael Wu
2590a598c0
Bug 533038 - 2. Generalize nsZipArchive and nsZipHandle to read from different sources, r=taras a=blocking-beta6
2010-09-08 20:37:34 -07:00
Michael Wu
4eff31a667
Bug 533038 - 1. Generalize manifest reading code and add api for reading manifests from jars, r=bsmedberg a=blocking-beta6
2010-09-08 20:37:11 -07:00
Sean Stangl
7388a70f72
[JAEGER] Merge from TraceMonkey (which pulled m-c).
2010-07-20 22:24:39 -07:00
Robert Sayre
1b744a7685
Merge mozilla-central to tracemonkey.
2010-07-20 15:07:03 -07:00
David Anderson
cf5a8cf505
[JAEGER] Merge from tracemonkey.
2010-07-19 20:49:26 -07:00
Joe Drew
177c57fe4b
Bug 590335 - Add a pref to unconditionally disable Direct2D. r=bas a=blocking2.0:beta5+
2010-08-27 22:44:37 -04:00
Joe Drew
e20e8fb61d
Bug 590599 - Change the names of layers acceleration prefs, and how they work. r=roc a=blocking2.0:beta6+
2010-08-27 22:44:37 -04:00
Bobby Holley
75637d22a2
Bug 590252 - part 5 - Make RequestDecode() SyncDecode() on images that are small enough.r=joe,a=blocker
2010-08-26 15:54:21 -07:00
Bobby Holley
02d8f53c2f
Bug 590252 - part 4 - Don't do progressive display on redecodes.r=joe,a=blocker
2010-08-25 19:07:01 -04:00
Bobby Holley
f537275f66
Bug 590252 - part 3 - Only flush invalidations when we need to.r=joe,a=blocker
2010-08-25 16:11:09 -04:00
Bobby Holley
de6f4e8b2f
Bug 590252 - part 2 - Make decoder implementations use the Decoder superclass invalidation framework.r=joe,a=blocker
2010-08-24 17:12:04 -04:00
Bobby Holley
6cc5f55cb2
Bug 590252 - part 1 - Add framework to Decoder superclass to handle invalidations.r=joe,a=blocker
2010-08-24 16:40:45 -04:00
Bobby Holley
d0989f8f70
Bug 590260 - Decode more bytes at a time during image redecodes.r=joe,a=blocker
2010-08-25 18:58:27 -04:00
Dan Witte
8de0079a42
Merge e10s -> m-c. a=patches
2010-08-27 08:04:00 -07:00
Dão Gottwald
ff02b582e2
Bug 581008 - Remove support for appending arbitrary data to the User Agent string. r=jst,khuey sr=dveditz
2010-08-27 09:02:10 +02:00
Joel Maher
b61eda4b1d
Bug 586754 Xpcshell tests should use relativesrcdir instead of $MODULE (android prepartion) r=mitchell.field a=NPOTB
2010-08-26 14:47:28 -07:00
Daniel Holbert
104025f246
Bug 591014: Null-check mImage in imgRequestProxy::GetStaticRequest. r=joe a=blocking-beta5
2010-08-26 20:47:20 +00:00
Atul Apte
4a9f8dee1f
Enable basic stereoscopic rendering support for D3D9 layers with 3D Vision. r=bas
2010-08-26 20:44:53 +00:00
Clint Talbert
1afdc1b8df
Backed out changeset 49beef9387a0 due to Xpcshell orange a=backout
...
--HG--
extra : rebase_source : 01307f705ab07b7784401d69a53921b200544978
2010-08-25 14:03:44 -07:00
Joel Maher
51fff79f07
Bug 586754 Change xpcshell to use $relativesrcdir instead of $module for android support a=NPOTB r=mitchell.field
2010-08-25 11:47:39 -07:00
Sid Stamm
287111b0e2
Bug 542302 - turn down CSP debugging information, r=dveditz, a=jst
2010-08-25 08:36:26 -07:00
Benoit Jacob
66c3eb510a
Bug 582053 - Integrate WebGL conformance suite as a mochitest - r=ctalbert,vladimir a=blocking2.0
...
--HG--
rename : content/canvas/test/webgl/test_list.txt => content/canvas/test/webgl/00_testFIXME_list.txt
rename : content/canvas/test/webgl/conformance/00_test_list.txt => content/canvas/test/webgl/conformance/00_testFIXME_list.txt
rename : content/canvas/test/webgl/more/00_test_list.txt => content/canvas/test/webgl/more/00_testFIXME_list.txt
2010-08-25 08:14:12 -04:00
Joel Maher
ce269022ab
Bug 574189 - Fix chrome tests to work from an extension for android and e10s support a=NPOTB r=ctalbert
2010-08-24 10:29:34 -07:00
Igor Bukanov
6eb0fa7807
bug 552266 - - asserting that autorooters are used only under a request. r=mrbkap
2010-07-23 13:33:15 +02:00
David Anderson
64fd3377e9
[JAEGER] Merge from fatval & TM.
2010-07-05 18:07:39 -07:00
Luke Wagner
d119486317
Merge from TM
...
--HG--
rename : js/src/xpconnect/src/wrappers/AccessCheck.cpp => js/src/xpconnect/wrappers/AccessCheck.cpp
2010-07-04 14:49:39 -07:00
Robert Sayre
70fc03b113
Merge mozilla-central to tracemonkey.
2010-07-02 17:25:52 -07:00
Joe Drew
42e42531be
Bug 572520: step 9, test asynchronous notification for regular loads and channel loads on static, animated, and 404 images. r=jrmuizel,bholley
2010-07-28 14:52:59 -07:00
Joe Drew
9ecbf020a6
Bug 572520: step 8, make LoadImage and LoadImageWithChannel scriptable so they are testable from js unit tests. r=jrmuizel sr=vlad
2010-07-28 14:52:50 -07:00
Joe Drew
364a44e4bd
Bug 572520: step 7.1, Add some logging to imgStatusTracker. r=bholley
2010-07-28 14:52:34 -07:00
Joe Drew
e2fa5f1de8
Bug 572520: step 7, delay otherwise-synchronous notifications, and send them asynchronously later. r=jrmuizel,bholley sr=bz
2010-07-28 14:52:14 -07:00
Mitchell Field
eb1e793da7
Remove @status FROZEN and @status UNDER_REVIEW. r=bsmedberg
...
--HG--
extra : rebase_source : 7fab31a6b7898e05ff828482390846cc9ce2854d
2010-07-02 10:27:06 -04:00
Benjamin Smedberg
d6805bcab6
Bug 576492 - Load default preferences from extension defaults, r=Mossop
2010-07-02 12:45:20 -04:00
Luke Wagner
15a253d499
Merge
2010-07-01 23:10:37 -07:00
David Mandelin
df6fc2e4a4
Browser prefs for enabling methodjit
2010-06-29 16:46:10 -07:00
Benjamin Smedberg
0b4de441c4
Bug 568691 - Fix MOZ_OMNIJAR registration, r=mwu
...
--HG--
rename : modules/libjar/nsXPTZipLoader.cpp => modules/libjar/nsManifestZIPLoader.cpp
rename : modules/libjar/nsXPTZipLoader.h => modules/libjar/nsManifestZIPLoader.h
rename : xpcom/reflect/xptinfo/public/nsIXPTLoader.idl => xpcom/components/nsIManifestLoader.idl
2010-07-02 09:53:19 -04:00
Luke Wagner
ab3a0d3ffa
Add 64-bit tracing support
2010-06-28 18:08:28 -07:00
Luke Wagner
549bdba685
fatval tweaks: bump XDR version, remove spurious comment and #defines, realign JSStackFrame
2010-07-15 13:18:12 -07:00
Luke Wagner
99411cc93d
Bug 549143 - fatvals
2010-07-14 23:19:36 -07:00
Robert Sayre
38029f43fa
Merge mozilla-central to tracemonkey.
2010-07-12 20:42:21 -07:00
Josh Aas
f53cb167f3
Fix mStreamListeners incorrectly initialized to nsnull. Also remove a bad comment. b=577982
2010-07-12 16:22:51 -04:00
Robert Sayre
951426beed
Merge mozilla-central to tracemonkey.
2010-07-11 16:23:48 -07:00
timeless@mozdev.org
a2ec57da57
Bug 577229 nsPNGEncoder::mImageBufferReadPoint will be initialized after nsPNGEncoder::mFinished
...
r=jmuizelaar
--HG--
extra : rebase_source : 20c5eb547b819fde0bdd915f7dc1f9a154e9ea57
2010-07-07 12:35:29 +03:00
Makoto Kato
613f3559d8
Bug 574095 - crash loading test plugin on 64-bit win7 tests in /layout/generic/crashtests/505912-1.html , /tests/layout/generic/test/test_plugin_clipping.xhtml [@ _SetWindowLongPtr() | nsPluginNativeWindowWin::SubclassAndAssociateWindow]. r=joshmoz
2010-07-12 13:49:12 +09:00
deadfones@gmail.com
1e52c216e2
Bug 478398 - Don't hard code get_discard_timer_ms, use a pref instead.r=joe
2010-07-11 21:51:52 -04:00
Bobby Holley
b3dbd599a1
Bug 553982 - myvidoop.com login broken on trunk.r=joe
2010-07-11 21:11:03 -04:00
Bobby Holley
0d93ccdb3d
Bug 576621 - clearing cache does NOT clear cached images.r=joe,gavin
2010-07-11 21:01:53 -04:00
Robert Sayre
1ae649adc3
Merge mozilla-central to tracemonkey.
2010-07-06 11:05:39 -07:00
Daniel Holbert
987e1c5c55
Bug 276431 helper-patch: Make args to imgIContainer::Draw const. r=joe
2010-07-05 13:49:05 -07:00
Saint Wesonga
e7a357dcaf
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg
2010-07-05 11:42:18 +02:00
Josh Aas
80c7aced07
Bug 584143 - Crashes when streams are open and a plugin instance is closed at/under nsNPAPIPluginInstance::Stop, r=bsmedberg
2010-08-09 14:38:43 -04:00
Neil Deakin
cd970262b2
Bug 577316, add preference to allow form elements to be focused when clicked, r=smaug
2010-08-09 12:15:47 -04:00
Benjamin Smedberg
ccb16680db
Merge bug 579178 to mozilla-central. reviews by Mossop/khuey/jwalden/ted
2010-08-09 10:04:10 -04:00
Benjamin Smedberg
c622433f07
Merge mozilla-central into single-chrome-manifest.
2010-08-04 14:23:04 -04:00
Benjamin Smedberg
a46c0d7aca
Fix omnijar from bug 579178 - move the manifest ziploader code into xpcom/components, and don't load the same JAR a bunch of times.
...
--HG--
rename : modules/libjar/nsManifestZIPLoader.cpp => xpcom/components/nsManifestZIPLoader.cpp
rename : modules/libjar/nsManifestZIPLoader.h => xpcom/components/nsManifestZIPLoader.h
2010-08-04 14:09:21 -04:00
Benjamin Smedberg
1f62db83d4
Bug 579178 part A - Code changes to add a "manifest" directive to read sub-manifests and read only the root chrome.manifest file, instead of enumerating components/*.manifest and chrome/*.manifest. Review comments by Mossop to be addressed in a followup commit.
2010-07-22 10:31:29 -04:00
Glenn Randers-Pehrson
9def47a86c
Bug 564792 - Update libpng to version 1.4.3. r=joe
2010-07-22 09:00:30 +02:00
Brad Lassey
da3bcb01d0
bug 576997 - Need to upgrade in-tree FreeType to 2.4.0 once it has been released r=bsmedberg b=2.0+
2010-07-21 12:59:38 -04:00
Steven Michaud
a54789cbe5
Bug 577967 - Crash [@ NSAddImage ] on startup on 2.0 branch. r=josh
2010-07-21 11:27:13 -05:00
Dave Townsend
e503e5893d
Disable plugin crash submission tests on all Linux for bug 583591. rs=khuey
2010-08-02 18:02:20 -07:00
Justin Lebar
6544506912
Bug 561076 - Pref callback changes severely slow down reftest and shutdown.
...
--HG--
extra : rebase_source : bf83192c89f953772d8dbfb530e18402e181a139
2010-07-31 10:17:49 -07:00
Josh Aas
76e341467b
Bug 583506: Remove remaining support for blackwood java from plugins module. r/a=jst
2010-08-02 16:31:31 -04:00
Robert O'Callahan
91595e761f
Bug 580160. Test plugin needs to invalidate itself if its size changes. r=josh
2010-08-02 15:07:07 +12:00
Dão Gottwald
9b15b69a1b
Backed out changeset 59ace8d80ce8
2010-07-04 22:01:13 +02:00
Saint Wesonga
8dd5da1024
Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg
2010-07-04 21:39:17 +02:00
Chris Jones
7dc26b1584
Bug 576680: Initialize |rv| so that valgrind doesn't complain (though it's technically unnecessary) and add a helper function to cut some LoC. r=dwitte
2010-07-02 22:03:18 -05:00
Bobby Holley
ccbe5fc67b
Bug 579122 - imgRequestProxy race condition can fire 2 OnStartDecodes in a row.r=joe
2010-08-02 15:44:49 -04:00
Daniel Holbert
c63155e8f1
(no bug, comment-only) Fix typo in comment with the condensed version of imgContainer's CID.
2010-08-05 07:53:43 -07:00
Bjarne
100caa546d
Bug 546606 - Make redirect API async - part 2; r=honzab.moz,cbiesinger,bjarne,jst sr=jst
2010-08-04 22:15:55 -04:00
Josh Aas
8effb77703
Fix a problem in which we fail to load an enabled plugin just because a disabled plugin is a MIME handler for the same MIME type. b=581848 r=jst
2010-08-04 15:16:12 -04:00
Luke Wagner
b7955fe7b7
Browser builds
2010-06-17 23:51:54 -07:00
Jesse Ruderman
14ecbf3e68
Add bug numbers for all remaining asserts() annotations in crashtests and reftests
2010-07-01 19:33:56 -07:00
Robert Sayre
67c4011c63
Backed out changeset 562f69adb6b8
2010-06-30 13:50:26 -07:00
Robert Sayre
77addc3777
try to fix moz_free macro substitution bustage on Windows by reordering includes
2010-06-30 13:26:15 -07:00
Robert Sayre
27b5a3b6fb
Merge mozilla-central to tracemonkey.
...
--HG--
rename : dom/indexedDB/IDBCursorRequest.cpp => dom/indexedDB/IDBCursor.cpp
rename : dom/indexedDB/IDBCursorRequest.h => dom/indexedDB/IDBCursor.h
2010-06-30 11:54:20 -07:00
Ted Mielczarek
1dc201bc7a
bug 574357 followup, don't run the new test on platforms where we don't build crashreporter. Should also fix bug 574118. r=bsmedberg
2010-06-30 11:10:46 -04:00
Ted Mielczarek
17362ddaa6
bug 574357 - Plugin crash reports are submitted with Throttleable=0. r=dolske
...
--HG--
rename : modules/plugin/test/mochitest/test_crash_notify_no_report.xul => modules/plugin/test/mochitest/test_crash_submit.xul
2010-06-30 10:29:05 -04:00
Justin Dolske
157f21c04d
Backed out changeset e112f68bc941 (bug 574357) due to test failures.
2010-06-29 22:45:30 -07:00
Ted Mielczarek
1ff7a5c880
bug 574357 - Plugin crash reports are submitted with Throttleable=0. r=dolske
...
--HG--
rename : modules/plugin/test/mochitest/test_crash_notify_no_report.xul => modules/plugin/test/mochitest/test_crash_submit.xul
2010-06-29 19:34:39 -04:00
Benjamin Smedberg
c71e024222
Bug 574457 - Back out the functional changes from revision 0327e126ea24, bug 569644, because of 100ms (20%) Ts regression on Linux/Mac. This leaves the nsIContentUtils helper function, but restores the plugin host category entry munging.
2010-06-29 16:56:13 -04:00
Robert Sayre
1d56325898
Merge mozilla-central to tracemonkey.
2010-06-24 13:47:08 -07:00
Bobby Holley
d60f7b7849
Bug 573629 - gDiscardable and gDecodeOnDraw should be prefs. r=vlad
2010-06-24 11:33:34 -07:00
Gervase Markham
24a3e6947e
Bug 564214 - Add .<Emarat> to IDN whitelist.
2010-06-24 13:09:05 +01:00
Robert Sayre
0a9fd0ff39
Merge mozilla-central to tracemonkey.
2010-06-23 17:04:20 -07:00
Kyle Huey
1b22082b07
Bug 567426: Make image encoders implement nsIAsyncInputStream. r=joedrew sr=bz
2010-06-23 10:24:56 -07:00
Ginn Chen
afb9960ccd
Bug 572999 Make reftest recognize Solaris r=roc
2010-06-23 17:33:21 +08:00
Robert Sayre
55a8586519
Merge mozilla-central to tracemonkey.
2010-07-27 13:09:04 -07:00
Bobby Holley
3b9b8747c5
Bug 580669 - Mac Menu icon crash with enabled image discarding.r=joe
2010-07-26 16:45:15 -04:00
Kyle Huey
c83653fee9
Bug 508082: Implement a raw video decoder. Based on an earlier patch by Brad Lassey. r=doublec
2010-07-26 12:35:16 -07:00
Glenn Randers-Pehrson
79f2ab05d8
Bug 581192: Sync mozpngconf.h with libpng-1.4.3. (fix obsolete #defines for png_check_sig & png_set_dither) r=joe a=blocking
2010-07-26 12:11:09 -07:00
Luke Wagner
e01cff89da
Change NPAPI not to cast to from NPIdentifier and jsval. Fix silly JSObject::resizeDenseArrayElements bug introduced by earlier commit
2010-06-11 18:09:58 -07:00
Chris Jones
bf91852da6
Bug 572295: Add X11Util.h for X11 toolkits. r=karlt,joedrew
2010-06-21 15:35:49 -05:00
Josh Aas
7c2ba6e19d
Bug 542971, bug 577985: Includes a number of plugin module memory mgmt fixes. Remove/replace nsPluginInstanceTag (instance tags), stop storing the plugin library and function table twice. r=jst
2010-07-19 22:11:26 -04:00
Chris Jones
d37c23f270
Bug 578262: Clean up style in and remove build warnings from new-ishly merged e10s code. r=bsmedberg
...
--HG--
rename : dom/ipc/ContentProcessChild.cpp => dom/ipc/ContentChild.cpp
rename : dom/ipc/ContentProcessChild.h => dom/ipc/ContentChild.h
rename : dom/ipc/ContentProcessParent.cpp => dom/ipc/ContentParent.cpp
rename : dom/ipc/ContentProcessParent.h => dom/ipc/ContentParent.h
rename : dom/ipc/ContentProcessProcess.cpp => dom/ipc/ContentProcess.cpp
rename : dom/ipc/ContentProcessProcess.h => dom/ipc/ContentProcess.h
rename : dom/ipc/PIFrameEmbedding.ipdl => dom/ipc/PBrowser.ipdl
rename : dom/ipc/PContentProcess.ipdl => dom/ipc/PContent.ipdl
2010-07-19 13:33:33 -05:00
Josh Aas
4e23705cc3
Bug 579516: Patch contains a number of fixes to nsPluginStreamListenerPeer memory management. Also moves storage of the stream array for cache lookups to the plugin instance rather than the instance tag. Also stops adding streams to the cached list that shouldn't be there. r=benwa
2010-07-17 19:47:29 -04:00
Josh Aas
106040179d
Improve memory mgmt and reduce COM pointer type usage in plugin stream code. b=578913 r=benwa (re-landing, did not cause Ts Shutdown regression)
2010-07-16 15:55:54 -04:00
Josh Aas
a3aefb5e98
Backed out changeset 764bb4ae886c, bug 578913, it may be at fault for a Ts Shutdown regression.
2010-07-16 13:25:01 -04:00
Josh Aas
41ff002705
Improve memory mgmt and reduce COM pointer type usage in plugin stream code. b=578913 r=benwa
2010-07-15 22:30:07 -04:00
Robert O'Callahan
7f603b4ac1
Bug 564991. Part 37: Add test plugin API to make the plugin invalidate itself during each paint. r=josh
2010-07-16 09:08:11 +12:00
timeless@mozdev.org
8ad4980739
Bug 577230 nsJPEGEncoder::mImageBufferReadPoint will be initialized after nsJPEGEncoder::mFinished
...
r=jmuizelaar
--HG--
extra : rebase_source : 4749619bdf1ffad836353da6d22a9f37377d8080
2010-07-07 12:38:40 +03:00
timeless@mozdev.org
9868ec7503
Bug 577992 warning: unused variable ‘isSentinel’ in imgDiscardTracker::Reset
...
r=bholley
--HG--
extra : rebase_source : 790bb046a21e45ca79c23cfc522cf89430467f8b
2010-07-15 15:55:04 +03:00
Dão Gottwald
844a6ea7d9
remove bogus test for bug 521495
2010-07-15 11:35:33 +02:00
Nils Maier
bc6be3b7e3
Bug 521495 - moz-icon:// protocol does not work with SVG icons. r=joe
...
--HG--
extra : rebase_source : 4db9f6f86c2a2811d2b21dc28a4ede4216f4e705
2010-07-15 10:14:11 +02:00
Vladimir Vukicevic
79bbb0f9ca
b=571172; import and use ANGLE GLSL ES shader validator (disabled by default for now); r=joe
2010-07-14 20:52:34 -07:00
Blake Kaplan
3ca0e8e3e3
Fix bustage from bug 578392 (r=sayrer on the bustage fix).
2010-07-14 17:39:22 -07:00
Blake Kaplan
febd9cf0bc
Bug 578392 - Don't assume things about comparing non-nsISupports pointers. r=bsmedberg
2010-07-14 16:06:17 -07:00
Bobby Holley
1bd914f84a
Added some checks for the random orange in bug 578591.r=joe
2010-07-14 13:53:01 -04:00
Robert Sayre
4ed4f1f76a
merge tracemonkey to mozilla-central.
2010-07-14 06:00:32 -07:00
Josh Aas
74d7a05a98
Move nsPluginStreamListenerPeer to its own files, clean up the plugin host. b=578447 r=benwa
2010-07-13 16:48:00 -04:00
Josh Aas
d581ec02fb
Move nsNPAPIPluginStreamListener implementation to its own file. b=578383 r=jst
2010-07-13 14:42:03 -04:00
Bobby Holley
4fa9fdbc7e
Tests for bug 478398, as well as for a few others, now that we have a discard timer pref.r=joe
2010-07-13 13:30:39 -04:00
Josh Aas
1b1a81fc4a
Remove nsPluginCacheListener, it is unused. b=578285 r=benwa
2010-07-13 02:58:30 -04:00
Robert Sayre
e4f2411102
Merge mozilla-central to tracemonkey.
2010-06-23 10:21:18 -07:00
Robert Sayre
690a859635
Merge mozilla-central to tracemonkey.
2010-06-21 18:01:14 -07:00
Luke Wagner
1bb5128ab0
Merge with TraceMonkey
2010-06-09 21:59:18 -07:00
Luke Wagner
0d5dd30ea8
Firefox builds
2010-06-07 18:21:51 -07:00
Luke Wagner
f032df96b4
Bug 565157 - typed JS_AddRoot (r=igor)
2010-06-07 17:05:02 -07:00