forked from humphd/mozilla-central-old
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixing missed merge issue in nsBaseWidget.cpp and EOL issue in nsIJSE…
…ngineTelemetryStats.idl
- Loading branch information
David Humphrey
committed
Nov 30, 2011
1 parent
8991c31
commit 774aaec
Showing
2 changed files
with
53 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,53 +1,53 @@ | |||
/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */ | /* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */ | ||
/* ***** BEGIN LICENSE BLOCK ***** | /* ***** BEGIN LICENSE BLOCK ***** | ||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1 | * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | ||
* | * | ||
* The contents of this file are subject to the Mozilla Public License Version | * 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 | * 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 | * the License. You may obtain a copy of the License at | ||
* http://www.mozilla.org/MPL/ | * http://www.mozilla.org/MPL/ | ||
* | * | ||
* Software distributed under the License is distributed on an "AS IS" basis, | * Software distributed under the License is distributed on an "AS IS" basis, | ||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | ||
* for the specific language governing rights and limitations under the | * for the specific language governing rights and limitations under the | ||
* License. | * License. | ||
* | * | ||
* The Original Code is Mozilla Firefox. | * The Original Code is Mozilla Firefox. | ||
* | * | ||
* The Initial Developer of the Original Code is | * The Initial Developer of the Original Code is | ||
* the Mozilla Foundation <http://www.mozilla.org>. | * the Mozilla Foundation <http://www.mozilla.org>. | ||
* Portions created by the Initial Developer are Copyright (C) 2011 | * Portions created by the Initial Developer are Copyright (C) 2011 | ||
* the Initial Developer. All Rights Reserved. | * the Initial Developer. All Rights Reserved. | ||
* | * | ||
* Contributor(s): | * Contributor(s): | ||
* | * | ||
* Alternatively, the contents of this file may be used under the terms of | * 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 | * 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"), | * 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 | * 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 | * 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 | * 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 | * 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 | * 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 | * 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 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. | * the terms of any one of the MPL, the GPL or the LGPL. | ||
* | * | ||
* ***** END LICENSE BLOCK ***** */ | * ***** END LICENSE BLOCK ***** */ | ||
|
|
||
#include "nsISupports.idl" | #include "nsISupports.idl" | ||
|
|
||
/** | /** | ||
* Telemetry uses this interface on the @mozilla.org/js/xpc/XPConnect;1 service | * Telemetry uses this interface on the @mozilla.org/js/xpc/XPConnect;1 service | ||
* to extract JS engine stats. | * to extract JS engine stats. | ||
*/ | */ | ||
[scriptable, uuid(5a6ea52b-4e23-402f-93e3-59f29b2f1a88)] | [scriptable, uuid(5a6ea52b-4e23-402f-93e3-59f29b2f1a88)] | ||
interface nsIJSEngineTelemetryStats : nsISupports | interface nsIJSEngineTelemetryStats : nsISupports | ||
{ | { | ||
/** | /** | ||
* The value returned by this attribute is included as the 'js' property of | * The value returned by this attribute is included as the 'js' property of | ||
* the telemetry ping JSON blob. | * the telemetry ping JSON blob. | ||
*/ | */ | ||
[implicit_jscontext] | [implicit_jscontext] | ||
readonly attribute jsval telemetryValue; | readonly attribute jsval telemetryValue; | ||
}; | }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters