wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge with dholbert's push. a=me

Browse Source
This commit is contained in:
Chris Pearce 2010-12-21 08:01:56 +13:00
commit 6d009cc0b3
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/libpr0n/src/SVGDocumentWrapper.cpp
View File

@ -196,6 +196,11 @@ SVGDocumentWrapper::IsAnimated()
void
SVGDocumentWrapper::StartAnimation()
{
// Can be called for animated images during shutdown, after we've
// already Observe()'d XPCOM shutdown and cleared out our mViewer pointer.
if (!mViewer)
return;
nsIDocument* doc = mViewer->GetDocument();
if (doc) {
#ifdef MOZ_SMIL
@ -208,10 +213,8 @@ SVGDocumentWrapper::StartAnimation()
void
SVGDocumentWrapper::StopAnimation()
{
// This method gets called for animated images during shutdown, after we've
// Can be called for animated images during shutdown, after we've
// already Observe()'d XPCOM shutdown and cleared out our mViewer pointer.
// When that happens, we need to bail out early, or else the
// mViewer->GetDocument() call below will crash on a null pointer.
if (!mViewer)
return;

12
toolkit/components/places/src/nsNavHistory.cpp
View File

@ -5967,18 +5967,6 @@ nsNavHistory::ResultsAsList(mozIStorageStatement* statement,
return NS_OK;
}
static PRInt64
GetAgeInDays(PRTime aNormalizedNow, PRTime aDate)
{
PRTime dateMidnight = NormalizeTimeRelativeToday(aDate);
// if the visit time is in the future
// treat as "today" see bug #385867
if (dateMidnight > aNormalizedNow)
return 0;
else
return ((aNormalizedNow - dateMidnight) / USECS_PER_DAY);
}
const PRInt64 UNDEFINED_URN_VALUE = -1;
// Create a urn (like