Commit Graph

2705 Commits

Author SHA1 Message Date
Olli Pettay
a75ca96a8e Bug 785228 - nsGlobalWindow is described twice during traverse, r=mccr8
--HG--
extra : rebase_source : 3ebb0df0d4d20618d03bd9f7be2fedd54d6ef843
2012-08-23 14:15:39 -07:00
Ben Turner
2e0265c8ef Bug 784726 - 'Remove old IPC::URI'. r=cjones+khuey.
--HG--
rename : ipc/glue/IPCSerializableParams.ipdlh => ipc/glue/InputStreamParams.ipdlh
extra : transplant_source : %A6%BC%8B%8D%3A_%7Df%2B%FE%AA%94%81%AB%CAW%15K%A7%03
2012-08-23 12:33:46 -07:00
Kyle Machulis
8a2582aad8 Backout of f98bea38e654 due to mochi bustage 2012-08-23 12:01:27 -07:00
Kyle Machulis
255406cbe7 Backout of c129811b87ef due to mochi bustage 2012-08-23 12:00:51 -07:00
Kyle Machulis
1485cd59c9 Bug 783426: Patch 2 - Async DOMRequest Firing Tests; r=sicking 2012-08-23 09:52:54 -07:00
Kyle Machulis
87763f254a Bug 783426: Patch 1 - Async DOMRequest Firing; r=sicking 2012-08-23 09:52:29 -07:00
Rafael Ávila de Espíndola
e3ab16964a Bug 784889 - Use nullptr in a function that returns a pointer. r=ms2ger. 2012-08-23 09:56:10 -04:00
Nathan Froyd
4c779437cc Bug 783357 - part 1: add XPIDL_FLAGS to make idl dependencies more explicit; r=khuey 2012-08-24 16:01:30 -04:00
Jan Varga
ed76a52681 Bug 763854 - Check file references (cleanup stored files) only when needed. r=bent 2012-08-24 11:51:33 -07:00
Kyle Huey
0cae034974 Bug 783162: Make mapped attributes hold the image alive. r=bz
The nsCSSValue in nsGenericHTMLElement::MapBackgroundInto is a temporary.  This causes a problem after Bug 697230 landed, because the nsCSSValue::Image we put into that value is destroyed once we're done doing style stuff.  Previously the nsImageLoader would grab the request off the nsCSSValue::Image and hold it alive.  Bug 697230 changed the behavior here; now when the nsCSSValue::Image is destroyed it tells the image loader to drop the request.  The result is that all the references to the request are dropped and the frame is never told it has a background.

The solution is to keep the nsCSSValue::Image alive longer.  This patch adds two new types of nsAttrValue.  The first is an nsCSSValue::URL.  A ParseBackgroundAttribute method is added on nsGenericHTMLElement that the relevant elements (body/td/th/table/tr/tbody/thead/tfoot) call that parses background into an nsCSSValue::URL.  The second is an nsCSSValue::Image.  nsGenericHTMLElement::MapBackgroundInto attempts to convert the nsCSSValue::URL into an nsCSSValue::Image by kicking off the image load.  The result is that image loads are only started when the element is actually visible.  This also mirrors the way background-image works.  This also allows us to fix two longstanding bugs in this code.  Since MapBackgroundInto doesn't have a pointer to the actual element, it relied on grabbing the principal of the document.  Now we can grab the principal of the node in ParseBackgroundAttribute.  MapBackgroundInto also has no way to get at the element's base URI (to honor xml:base), which is now possible in ParseBackgroundAttribute.

nsCSSValue::[Image|URL] have also been moved to be mozilla::css::[Image|URL]Value.  nsAttrValue.h is included in external linkage code, so it can't include nsCSSValue.h to get the declarations of nsCSSValue::[Image|URL], and nested classes can't be forward declared.  Moving the classes to a namespace solves the problem.

Finally some old inoperative quirks mode code was removed.  This code has done nothing since Bug 273078 was landed in 2004.
2012-08-24 10:50:49 -07:00
Andrew McCreight
0d31841b85 Bug 750570, part 4 - Switch most native CC classes to use the purple buffer. r=smaug
This patch actually converts over most of the existing native CC classes
to use the participant. This is done by converting them to use
the newly generalized nsCycleCollectingAutoRefCnt instead of their usual
ref count.

This is mostly a matter of defining new macros defining AddRef() and Release()
for native CC classes with the CC ref count.

nsTimeout is left as a legacy native CC class because it is a weird class,
but hopefully eventually it too can be converted over.  See bug 774874.
2012-08-24 09:50:06 -07:00
Matt Brubeck
424ea88da6 Back out 670c8a2695b3 (bug 771354), 134557d57e6e 4ad52e488977 (bug 774607), and...
036eb8c2a08a d4d36e3b948f 35334e820632 6bd07fd5147d d49e7c0d762c 407f19deb14c d84551808abb (bug 774633)
on a CLOSED TREE
2012-08-23 21:34:27 -07:00
Luke Wagner
ce71e55555 Bug 625199 - s/JSAutoEnterCompartment/JSAutoCompartment/ and make it infallible (r=bholley)
--HG--
extra : rebase_source : 12acf2288285f5caefd7fecea8207de3a47eab5b
2012-08-21 18:42:53 -07:00
Luke Wagner
48412c861d Bug 625199 - kill dummy frames (r=mrbkap)
--HG--
extra : rebase_source : df4e3bddabf20cdc5b9122370fa62b40e64177c7
2012-08-17 18:05:06 -07:00
Bobby Holley
60eca7f85c Bug 771354 - Don't special-case principal assignment for chrome windows in nsGlobalWindow.cpp. r=bz 2012-08-23 16:44:53 -07:00
Bobby Holley
63dfef11f8 Bug 774607 - Remove use of JS_{Is,Make}SystemObject from Gecko. r=bz
We currently set this for system globals and anything whose parent
chain leads to a system global. Maybe this was relevant before, but
with CPG this is just equivalent to asking whether the object is in
a system compartment. And the only place where we _check_ this bit
is immediately after checking for a system compartment, in
WrapperFactory. So AFAICT this can go away entirely.
2012-08-23 16:44:53 -07:00
Bobby Holley
b27acb570c Bug 774633 - Assert against switching origins on a compartment. r=jst 2012-08-23 16:44:53 -07:00
Bobby Holley
4e701ac456 Bug 774633 - Remove "is chrome window" condition for inner window reuse. r=jst
WouldReuseInnerWindow also returns true if the new window is same-origin with
the old one about:blank document.

This condition exists in order to handle some sloppiness with respect to the
principals on initial about:blank documents. Chrome callers sometimes parent
chrome windows (with XUL document) to content windows. But this parenting causes
us to push the cx of the content window during window creation, meaning that
the subsequent load of chrome://foo.xul blows away the old inner window and any
expandos on it. We can handle this case more precisely by skipping the cx push
for type="chrome" windows.

Furthermore, this was also necessary to prevent the inner window from being
blown away in the call to SetOpenerScriptPrincipal once nsWindowWatcher gets
the window back from the window creator (and after it's already told consumers
about the window via "domwindowcreated"). But we fixed this nastiness in the
previous patches.

So we can remove this case. By doing so, we can prevent inner windows from ever
changing origins, which is very important for compartment security invariants.
2012-08-23 16:44:53 -07:00
Bobby Holley
0bf2885067 Bug 774633 - Fold SetOpenerScriptPrincipal into SetInitialPrincipalToSubject, and make it indempotent and callable without an existing document. r=jst
There's no reason it has to fail if there's no mDoc, since any document is promptly
blown away with the new about:blank document.

The indempotence is important because we want to be able to call this method
unconditionally in OpenJSWindowInternal (since we may not have gone through
RegisterTopLevelWindow) without worrying about whether we've called it already.
2012-08-23 16:44:52 -07:00
Bobby Holley
875a633f4f Bug 774633 - Remove dead mOpenerScriptPrincipal. r=jst
This value is initialized to null and never set, so we can get rid of it.
2012-08-23 16:44:52 -07:00
Bobby Holley
efd432c75a Bug 774633 - Wean SetInitialPrincipalToSubject off some parameters and clean it up. r=jst
We can remove the fallback to the principal of aParent because we already push the
cx for aParent (callerContextGuard) whenever we're concerned about using its principal.
2012-08-23 16:44:52 -07:00
Bobby Holley
6e122ec16c Bug 774633 - Factor nsWindowWatcher call to SetOpenerScriptPrincipal into a method on nsGlobalWindow. r=jst
This doesn't change any functionality in the code. Note that the name is currently
a bit of a misnomer, but we change that in the next patch when we rip out the
arguments.
2012-08-23 16:44:52 -07:00
Kyle Machulis
684686bee5 Bug 779378: B2G Voicemail: Hook up to permissions manager; r=gwagner 2012-08-23 16:31:02 -07:00
Peter Van der Beken
854457d901 Fix for bug 768692 (Move DOM list binding generation to the new DOM binding codegen). r=bzbarsky.
--HG--
extra : rebase_source : 651a0fac4c9a87ef1c0a9cd91588c6421fd050c4
2012-05-22 15:46:20 +02:00
Justin Lebar
44c2b316f2 Bug 784436 - Part 2: Use new infallible nsIDocShell methods. r=bz 2012-08-22 18:27:04 -07:00
Kyle Machulis
7eb2fcd355 Backout be6da7f8989c due to bustage 2012-08-22 18:11:52 -07:00
Kyle Machulis
854a04a0f2 Backout 81fc1a3fc920 due to bustage 2012-08-22 18:11:24 -07:00
Kyle Machulis
b836bcf93f Bug 783426: Patch 2 - Tests for Async DOMRequest Firing; r=sicking 2012-08-22 18:04:01 -07:00
Kyle Machulis
5357f4784c Bug 783426: Patch 1 - Async DOMRequest Firing; r=sicking 2012-08-22 18:03:43 -07:00
Kyle Machulis
7751fd98d3 Backing out df43ad6d04c1 due to incorrect commit messages 2012-08-22 18:02:36 -07:00
Kyle Machulis
b29f5f6001 Backing out 542abbd15139 due to incorrect commit messages 2012-08-22 18:00:57 -07:00
Kyle Machulis
428ec0171b Bug 783426: Patch 2 - Tests for Async DOMRequest Firing 2012-08-22 17:58:05 -07:00
Kyle Machulis
2b37cadee3 Bug 783426: Patch 1 - Async DOMRequest Firing 2012-08-22 17:57:50 -07:00
Brian Hackett
3a886a65cd Allow purging analysis-temporary while retaining jitcode, bug 778724. r=luke 2012-08-22 12:28:34 -06:00
Vicamo Yang
be454322bf Bug 707659 - Part 1: DOM implementation, r=jlebar 2012-08-23 01:30:27 +08:00
Ehsan Akhgari
a8a14f9163 Merge the landing of bug 579517 to mozilla-inbound 2012-08-22 12:12:15 -04:00
Ed Morley
25981862a2 Backout d62929fa4325 for talos crashes 2012-08-22 14:53:11 +01:00
Brian Hackett
0bfe9633b5 Allow purging analysis-temporary while retaining jitcode, bug 778724. r=luke 2012-08-22 06:27:18 -06:00
Eric Chou
5ea354700f Bug 783520 - [b2g-bluetooth] follow-up to bug 730992, r=qdot 2012-08-22 18:37:08 +08:00
Doug Sherk
b289e024ad Bug 780397: Convert FrameMetrics.mViewportScrollOffset from nsIntPoint to gfx::Point r=roc 2012-08-21 21:37:15 -07:00
Gina Yeh
2326b507ac Bug 783454 - v1: Create devicefound event with event generator, r=qdot 2012-08-21 10:54:28 +08:00
Ryan VanderMeulen
f1e04816ea Merge m-c to inbound. 2012-08-20 20:21:35 -04:00
Olli Pettay
e1b92aea91 Bug 783856 - Autogen PopupBlockedEvent, r=jst 2012-08-20 11:26:34 -07:00
Fabrice Desré
13d2c286fb Bug 783825 - Fix b2g breakage after bug 553102 - Part 1 : fix mozChromeEvent events and system message manager [r=gal] 2012-08-19 12:00:19 -07:00
Ehsan Akhgari
8c296bbcd4 Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
2012-08-22 11:56:38 -04:00
Phil Ringnalda
a08361ddc1 Back out a9f462ea67f9 (bug 783825) for mochitest-chrome bustage 2012-08-18 21:08:40 -07:00
Fabrice Desré
26a7a25700 Bug 783825 - Fix b2g breakage after bug 553102 [r=cjones] 2012-08-18 19:50:44 -07:00
Masatoshi Kimura
db1897a657 Bug 783532 - Remove DOMError::CreateForDOMExceptionCode. r=sicking 2012-08-18 08:25:49 -04:00
Bill McCloskey
dde823bad5 Bug 783416 - Stop saving the prototype in WindowStateHolder (r=mrbkap) 2012-08-17 10:09:01 -07:00
Eric Chou
987b293c10 Bug 730992 - Patch 1: The DOM boilerplate for BluetoothPairingEvent, r=qdot, sr=mrbkap
---
 dom/base/nsDOMClassInfo.cpp                   |    9 +++
 dom/base/nsDOMClassInfoClasses.h              |    1 +
 dom/bluetooth/BluetoothPairingEvent.cpp       |   78 +++++++++++++++++++++++++
 dom/bluetooth/BluetoothPairingEvent.h         |   70 ++++++++++++++++++++++
 dom/bluetooth/Makefile.in                     |    2 +
 dom/bluetooth/nsIDOMBluetoothPairingEvent.idl |   15 +++++
 6 files changed, 175 insertions(+), 0 deletions(-)
 create mode 100644 dom/bluetooth/BluetoothPairingEvent.cpp
 create mode 100644 dom/bluetooth/BluetoothPairingEvent.h
 create mode 100644 dom/bluetooth/nsIDOMBluetoothPairingEvent.idl
2012-08-17 18:35:59 +08:00
Gregor Wagner
4eedb8cc10 Bug 779379 - B2G MobileConnection: Hook up to permissions manager. r=jlebar 2012-08-16 17:42:26 -07:00
Neil Deakin
0413e44a55 Bug 743975 - use a widget listener interface instead of the remaining events that don't need an event, r=tn,jmathies,netzen,smichaud,karlt,blassey,chrisjones 2012-08-15 14:52:42 -04:00
Aryeh Gregor
3304e571cb Bug 782252 - Cast NS_ENUMERATOR_FALSE to nsresult; r=ehsan 2012-08-07 17:54:44 +03:00
Ehsan Akhgari
b457a9ddf0 Merge removal of nsnull 2012-08-14 11:29:00 -04:00
Ehsan Akhgari
3c916ab848 Bug 626472 - Remove on last nsnull! 2012-08-14 11:28:45 -04:00
Justin Lebar
adfc4e45ba Bug 769254 - Part 2: Modify nsPIWindowWatcher::OpenWindowJS (renamed to OpenWindow2) so we can pass in the URL for target=_blank links without navigating the opened window to that URL. r=bz 2012-08-14 10:58:00 -04:00
Jim Mathies
94824b0433 Bug 781977 - Add optional pressure and source parameters to nsIDOMWindowUtils's sendMouse methods, r=roc+smaug. 2012-08-14 09:27:39 -05:00
Aryeh Gregor
e2dd9c2028 Bug 626472 part 3 - Remove nsnull for good; r=ehsan 2012-08-12 13:43:47 +03:00
Alexander Boldyrev
f61c980db5 Bug 738866 - Implement WEBGL_depth_texture extension - r=jgilbert 2012-08-13 18:17:55 -07:00
Neil Deakin
1a89394d0d Bug 391834, don't allow prompts in beforeunload, unload and pagehide events,r=smaug,patch mostly by gavin 2012-08-13 15:05:34 -04:00
Neil Deakin
afbbe47319 Bug 391834, rearrange some popup dialog code to be simpler,r=smaug,patch mostly by gavin 2012-08-13 15:03:59 -04:00
Justin Lebar
446f9d033a Bug 777135 - Part 3: Remove nsDOMWindowUtils::GetIsApp and friends. r=mounir
--HG--
extra : rebase_source : ac3db88b7eb03397c4ae514624e1f3021947c396
2012-08-13 12:58:38 -04:00
Justin Lebar
8ae5fcb7ff Bug 777135 - Part 2: Stop using nsDOMWindowUtils::GetIsApp and friends, and instead use the relevant methods on the principal. r=mounir
--HG--
extra : rebase_source : fa8a153a1edc8f64b230b67f121ba5eaaf1098e6
2012-08-13 12:58:38 -04:00
Phil Ringnalda
be4c3892b1 Bug 782167 - Downgrade MOZ_ASSERT(win->IsClosedOrClosing()) to an NS_ASSERTION until it stops happening so often, r=khuey
--HG--
extra : rebase_source : 774096aa4cfa058d1aa1a32596ae65e464e1baf9
2012-08-12 20:52:21 -07:00
Robert O'Callahan
f982af7739 Bug 383026. Centralize code that converts DOM scroll offsets to/from layout scroll positions. r=dbaron
--HG--
extra : rebase_source : a6118e0eeea749a601e055741e35cdcd15d81e57
2012-08-10 23:17:06 +12:00
Kan-Ru Chen (陳侃如)
b72b615e48 Bug 781353 - Hook up "power" to Permission Manager. r=jlebar 2012-08-11 19:40:43 +08:00
David Keeler
37763d23ef Bug 741130 - Attach XBL bindings for html:objects in nsElementSH::PostCreate. r=bz, r=jwein 2012-08-10 09:19:24 -07:00
Ryan VanderMeulen
212cdce23a Merge inbound to m-c. 2012-08-11 22:33:42 -04:00
Masayuki Nakano
29aa654039 Bug 719320 part.9 Implement nsIDOMWindowUtils::sendWheelEvent() for tests r=smaug, sr=jst 2012-08-12 10:42:36 +09:00
Masayuki Nakano
acbe3bbdd7 Bug 719320 part.1 Add DOM3 WheelEvent r=smaug, sr=jst 2012-08-12 10:42:34 +09:00
Ms2ger
8bdc098996 Backout changeset c77acb256aec for failing to work. 2012-08-11 18:12:54 +02:00
Honza Bambas
5fe7a22e2c Bug 215450: Allow uploading of files greater than 2gb in size. Involves making input streams 64-bit capable. Significant work done by Makoto Kato, finished by Honza Bambas. r=hbambas,bsmedberg,jdrew,sicking 2012-08-10 22:44:11 -04:00
Phil Ringnalda
0e2c168546 Backout dcb9d2f694eb (bug 769254) for Windows test_resize_move_windows.html M3 failures 2012-08-10 18:51:29 -07:00
Bill McCloskey
6ab20bd37d Bug 762580 - Fix bogus pageload responsiveness regression (r=mccr8) 2012-08-10 14:16:05 -07:00
Justin Lebar
14763a6a22 Bug 769254 - Part 2: Modify nsPIWindowWatcher::OpenWindowJS (renamed to OpenWindow2) so we can pass in the URL for target=_blank links without navigating the opened window to that URL. r=bz
--HG--
rename : layout/reftests/svg/pattern-scale-01c.svg => layout/reftests/svg/pattern-scale-01a.svg
extra : rebase_source : 1e934ffb7a561255430bea738aa204afcaf92c79
2012-08-10 11:42:28 -04:00
Ed Morley
a0bb24f111 Backout 5d77941eba28 (bug 772726), df597d36bcbb (bug 383026), c9c7e1b9aed9 (bug 779399) for failures in meter-native-style.html 2012-08-10 14:50:43 +01:00
Robert O'Callahan
16b8fe6939 Bug 383026. Centralize code that converts DOM scroll offsets to/from layout scroll positions. r=dbaron
--HG--
extra : rebase_source : eceb07d8d35e0dd5dd31d065cb04eec12d69a283
2012-08-10 23:17:06 +12:00
Aryeh Gregor
982100775b Bug 780618 - Move all error codes to nsError.h; r=ehsan 2012-07-27 17:03:27 +03:00
Doug Turner
84dd794e39 Bug 777088 - device Storage - file stat API. r=bent 2012-07-31 12:28:23 -07:00
Ed Morley
991653b152 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-08-09 12:46:05 +01:00
Ms2ger
c2bbcc10c0 Bug 781058 - Part c: Fix -Werror=int-to-pointer-cast in nsDOMClassInfo; r=mounir 2012-08-09 09:20:29 +02:00
Ms2ger
c1ce519fa3 Bug 780146 - Part e: Move all standard classes resolution code into the !ObjectIsNativeWrapper() branch; r=jst 2012-08-09 09:19:53 +02:00
Ms2ger
0df17d5667 Bug 780146 - Part c: Don't define constructors by contract ID; r=jst 2012-08-09 09:19:48 +02:00
Ms2ger
a7f199e451 Bug 780146 - Part b: Inline nsDOMClassInfo::RegisterClassName; r=jst 2012-08-09 09:19:42 +02:00
Ms2ger
198f4a2ae7 Bug 780146 - Part a: Move window._content into IDL; r=jst 2012-08-09 09:16:09 +02:00
Ms2ger
b3d4060c1a Bug 780993 - Reinstate support for setting indexed properties on HTMLSelectElement to null; r=bz 2012-08-09 09:10:21 +02:00
Ms2ger
8fcd7f8f16 Bug 780387 - Part d: Stop using PRFloat64; r=bsmedberg 2012-08-09 09:09:42 +02:00
William Chen
16866a115c Bug 775377 - Modify nsIContentPermissionRequest to use nsIPrincipal instead of nsIURI. r=dougt+cjones 2012-07-30 10:58:26 -04:00
Boris Zbarsky
3d616ae6f5 Bug 703855. Don't update performance timing or navigation timing state during document.open. r=jst 2012-08-08 23:47:04 -04:00
Chris Jones
7804d3c78b Revert e3e9040a6eb9 for M2 failures 2012-08-08 21:58:23 -07:00
Boris Zbarsky
f82e20d150 Bug 703855. Don't update performance timing or navigation timing state during document.open. r=jst 2012-08-08 23:47:04 -04:00
Wes Johnston
7d6f48a80c backout c030a8af8abd and dd0c287660e9 CLOSED TREE 2012-08-08 14:07:39 -07:00
Wes Johnston
77f0fb11d6 Bug 780718 - Return false from DOMRequestService is preventDefault was called on events. r=sicking 2012-08-08 12:35:15 -07:00
Ian Melven
7b1c3d5d1b Bug 341604 - iframe sandbox - block indexedDB if sandboxed without allow-same-origin, add tests for indexedDB r=jst 2012-08-20 11:34:34 -07:00
Ian Melven
915cb4516e Bug 341604 - Implement HTML5 sandbox attribute for IFRAMEs r=smaug r=jst 2012-08-20 11:34:32 -07:00
Eric Faust
d4a732fc86 Bug 775788 - Modify JSFunctionSpec to accept JSJitInfos. (r=luke) 2012-08-07 22:26:19 -07:00
Boris Zbarsky
42210976c4 Bug 747287 - Part 3: Add callback interface to allow JIT to interrogate DOM. (r=peterv) 2012-08-07 22:26:18 -07:00
Phil Ringnalda
2400fbd6d1 Backout 5439489dc320, 983f76488e59, 7a92558a8dec (Bug 714358) for debug build assertions and leaks 2012-08-07 22:18:27 -07:00
Steven Lee
dd1279bf1b Bug 714358: Time manager implementation. r=jlebar 2012-08-07 19:11:00 -04:00
Benjamin Peterson
1597f0648d Bug 774706 - Ensure script to be serialized is not gray. r=mccr8 2012-08-07 13:24:44 -07:00