From 774aaec6e5f096a87a8b2fdde8dc725b26f18fd6 Mon Sep 17 00:00:00 2001 From: David Humphrey Date: Wed, 30 Nov 2011 11:14:22 -0500 Subject: [PATCH] Fixing missed merge issue in nsBaseWidget.cpp and EOL issue in nsIJSEngineTelemetryStats.idl --- .../idl/nsIJSEngineTelemetryStats.idl | 106 +++++++++--------- widget/src/xpwidgets/nsBaseWidget.cpp | 20 ---- 2 files changed, 53 insertions(+), 73 deletions(-) diff --git a/js/xpconnect/idl/nsIJSEngineTelemetryStats.idl b/js/xpconnect/idl/nsIJSEngineTelemetryStats.idl index 6b5790117382..4e68762634a6 100644 --- a/js/xpconnect/idl/nsIJSEngineTelemetryStats.idl +++ b/js/xpconnect/idl/nsIJSEngineTelemetryStats.idl @@ -1,53 +1,53 @@ -/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Firefox. - * - * The Initial Developer of the Original Code is - * the Mozilla Foundation . - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsISupports.idl" - -/** - * Telemetry uses this interface on the @mozilla.org/js/xpc/XPConnect;1 service - * to extract JS engine stats. - */ -[scriptable, uuid(5a6ea52b-4e23-402f-93e3-59f29b2f1a88)] -interface nsIJSEngineTelemetryStats : nsISupports -{ - /** - * The value returned by this attribute is included as the 'js' property of - * the telemetry ping JSON blob. - */ - [implicit_jscontext] - readonly attribute jsval telemetryValue; -}; +/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla Firefox. + * + * The Initial Developer of the Original Code is + * the Mozilla Foundation . + * Portions created by the Initial Developer are Copyright (C) 2011 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsISupports.idl" + +/** + * Telemetry uses this interface on the @mozilla.org/js/xpc/XPConnect;1 service + * to extract JS engine stats. + */ +[scriptable, uuid(5a6ea52b-4e23-402f-93e3-59f29b2f1a88)] +interface nsIJSEngineTelemetryStats : nsISupports +{ + /** + * The value returned by this attribute is included as the 'js' property of + * the telemetry ping JSON blob. + */ + [implicit_jscontext] + readonly attribute jsval telemetryValue; +}; diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp index 1dfd261b9015..55d00db9dc27 100644 --- a/widget/src/xpwidgets/nsBaseWidget.cpp +++ b/widget/src/xpwidgets/nsBaseWidget.cpp @@ -1182,26 +1182,6 @@ nsBaseWidget::BeginMoveDrag(nsMouseEvent* aEvent) return NS_ERROR_NOT_IMPLEMENTED; } -// For backwards compatibility only -NS_IMETHODIMP -nsBaseWidget::SetIMEEnabled(PRUint32 aState) -{ - IMEContext context; - context.mStatus = aState; - return SetInputMode(context); -} - -NS_IMETHODIMP -nsBaseWidget::GetIMEEnabled(PRUint32* aState) -{ - IMEContext context; - nsresult rv = GetInputMode(context); - NS_ENSURE_SUCCESS(rv, rv); - - *aState = context.mStatus; - return NS_OK; -} - #ifdef DEBUG ////////////////////////////////////////////////////////////// //