Bug 784739 - Switch from NULL to nullptr in widget/android/; r=ehsan
This commit is contained in:
@@ -188,7 +188,7 @@ nsWindow::~nsWindow()
|
||||
if (mLayerManager == sLayerManager) {
|
||||
// If this window was the one that created the global OMTC layer manager
|
||||
// and compositor, then we should null those out.
|
||||
SetCompositor(NULL, NULL, NULL);
|
||||
SetCompositor(nullptr, nullptr, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1154,9 +1154,9 @@ void *
|
||||
nsWindow::GetNativeData(uint32_t aDataType)
|
||||
{
|
||||
switch (aDataType) {
|
||||
// used by GLContextProviderEGL, NULL is EGL_DEFAULT_DISPLAY
|
||||
// used by GLContextProviderEGL, nullptr is EGL_DEFAULT_DISPLAY
|
||||
case NS_NATIVE_DISPLAY:
|
||||
return NULL;
|
||||
return nullptr;
|
||||
|
||||
case NS_NATIVE_WIDGET:
|
||||
return (void *) this;
|
||||
@@ -1619,7 +1619,7 @@ nsWindow::InitKeyEvent(WidgetKeyboardEvent& event, AndroidGeckoEvent& key,
|
||||
event.isChar = (charCode >= ' ');
|
||||
event.charCode = event.isChar ? charCode : 0;
|
||||
event.keyCode = (event.charCode > 0) ? 0 : domKeyCode;
|
||||
event.pluginEvent = NULL;
|
||||
event.pluginEvent = nullptr;
|
||||
} else {
|
||||
#ifdef DEBUG
|
||||
if (event.message != NS_KEY_DOWN && event.message != NS_KEY_UP) {
|
||||
|
||||
Reference in New Issue
Block a user