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 mozilla-central into mozilla-inbound

Browse Source
This commit is contained in:
Ehsan Akhgari 2012-12-21 12:47:56 -05:00
commit 06ec3157b0
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Makefile.in
View File

@ -147,6 +147,8 @@ ifdef MOZ_APP_BASENAME
$(FINAL_TARGET)/application.ini: $(APP_INI_DEPS)
ifdef MOZ_APP_STATIC_INI
DEFINES += -DMOZ_APP_STATIC_INI
application.ini.h: appini_header.py $(FINAL_TARGET)/application.ini
$(PYTHON) $^ > $@
export:: application.ini.h

4
dom/devicestorage/nsDeviceStorage.cpp
View File

@ -1005,7 +1005,7 @@ public:
mFile->CollectFiles(cursor->mFiles, cursor->mSince);
nsCOMPtr<ContinueCursorEvent> event = new ContinueCursorEvent(mRequest);
NS_DispatchToMainThread(event);
event->Continue();
return NS_OK;
}
@ -1143,7 +1143,7 @@ nsDOMDeviceStorageCursor::Continue()
}
nsCOMPtr<ContinueCursorEvent> event = new ContinueCursorEvent(this);
NS_DispatchToMainThread(event);
event->Continue();
mOkToCallContinue = false;
return NS_OK;

23
widget/MetroUIUtils.idl
View File

@ -5,7 +5,7 @@
#include "nsISupports.idl"
[scriptable, uuid(aef0cd6f-27cc-40a4-90dc-764c0aabeb75)]
[scriptable, uuid(9D98A42F-ABAA-48a0-BB53-CE09A29E6876)]
interface nsIMetroUIUtils : nsISupports {
/**
@ -15,10 +15,23 @@ interface nsIMetroUIUtils : nsISupports {
void showPanel(in AString aPanelId);
/**
* Obtains the current page information
* @param aURI The current page URI
* @param aTitle The current page title
* Obtains the current page URI
*/
void getCurrentPageInfo(out AString aURI, out AString aTitle);
attribute AString currentPageURI;
/**
* Obtains the current page title
*/
attribute AString currentPageTitle;
/**
* Determines if the browser has selected content
*/
attribute boolean hasSelectedContent;
/**
* Determines the text that should be shared
*/
attribute AString shareText;
};

6
xpcom/io/nsNativeCharsetUtils.cpp
View File

@ -296,6 +296,12 @@ bool nsNativeCharsetConverter::gIsNativeUTF8 = false;
void
nsNativeCharsetConverter::LazyInit()
{
// LazyInit may be called before NS_StartupNativeCharsetUtils, but
// the setlocale it does has to be called before nl_langinfo. Like in
// NS_StartupNativeCharsetUtils, assume we are called early enough that
// we are the first to care about the locale's charset.
if (!gLock)
setlocale(LC_CTYPE, "");
const char *blank_list[] = { "", NULL };
const char **native_charset_list = blank_list;
const char *native_charset = nl_langinfo(CODESET);