diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 9f328250576f..f91a38adbe09 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -999,9 +999,11 @@ pref("services.sync.prefs.sync.spellchecker.dictionary", true);
pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
#endif
-// Disable the error console and inspector
+// Disable the error console
pref("devtools.errorconsole.enabled", false);
-pref("devtools.inspector.enabled", false);
+
+// Enable the Inspector
+pref("devtools.inspector.enabled", true);
// Enable the Scratchpad tool.
pref("devtools.scratchpad.enabled", true);
@@ -1027,6 +1029,12 @@ pref("devtools.hud.loglimit.cssparser", 200);
pref("devtools.hud.loglimit.exception", 200);
pref("devtools.hud.loglimit.console", 200);
+// The developer tools editor configuration:
+// - tabsize: how many spaces to use when a Tab character is displayed.
+// - expandtab: expand Tab characters to spaces.
+pref("devtools.editor.tabsize", 4);
+pref("devtools.editor.expandtab", true);
+
// Whether the character encoding menu is under the main Firefox button. This
// preference is a string so that localizers can alter it.
pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties");
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 1e95bbe9b41e..5e13fac7baf4 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -242,7 +242,7 @@
-
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 290ae4257a0f..a060456ffadc 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -224,15 +224,6 @@
-
-
+# is dynamically appended as
+# the last child of #tab-view-deck, only when it is needed, for minimal
+# performance impact.
#
diff --git a/browser/base/content/test/browser_inspector_treePanel_output.js b/browser/base/content/test/inspector/browser_inspector_treePanel_output.js
similarity index 89%
rename from browser/base/content/test/browser_inspector_treePanel_output.js
rename to browser/base/content/test/inspector/browser_inspector_treePanel_output.js
index e2b729950d7e..69b80d433547 100644
--- a/browser/base/content/test/browser_inspector_treePanel_output.js
+++ b/browser/base/content/test/inspector/browser_inspector_treePanel_output.js
@@ -42,8 +42,8 @@ let doc = null;
let xhr = null;
let expectedResult = "";
-const TEST_URI = "http://mochi.test:8888/browser/browser/base/content/test/browser_inspector_treePanel_input.html";
-const RESULT_URI = "http://mochi.test:8888/browser/browser/base/content/test/browser_inspector_treePanel_result.html";
+const TEST_URI = "http://mochi.test:8888/browser/browser/base/content/test/inspector/browser_inspector_treePanel_input.html";
+const RESULT_URI = "http://mochi.test:8888/browser/browser/base/content/test/inspector/browser_inspector_treePanel_result.html";
function tabFocused()
{
@@ -63,13 +63,15 @@ function xhr_onReadyStateChange() {
expectedResult = xhr.responseText.replace(/^\s+|\s+$/mg, '');
xhr = null;
- Services.obs.addObserver(inspectorOpened, "inspector-opened", false);
+ Services.obs.addObserver(inspectorOpened,
+ INSPECTOR_NOTIFICATIONS.OPENED, false);
InspectorUI.openInspectorUI();
}
function inspectorOpened()
{
- Services.obs.removeObserver(inspectorOpened, "inspector-opened", false);
+ Services.obs.removeObserver(inspectorOpened,
+ INSPECTOR_NOTIFICATIONS.OPENED, false);
ok(InspectorUI.inspecting, "Inspector is highlighting");
ok(InspectorUI.isTreePanelOpen, "Inspector Tree Panel is open");
@@ -94,13 +96,15 @@ function inspectorOpened()
expectedResult, "treePanelDiv.innerHTML is correct");
expectedResult = null;
- Services.obs.addObserver(inspectorClosed, "inspector-closed", false);
+ Services.obs.addObserver(inspectorClosed,
+ INSPECTOR_NOTIFICATIONS.CLOSED, false);
InspectorUI.closeInspectorUI();
}
function inspectorClosed()
{
- Services.obs.removeObserver(inspectorClosed, "inspector-closed", false);
+ Services.obs.removeObserver(inspectorClosed,
+ INSPECTOR_NOTIFICATIONS.CLOSED, false);
ok(!InspectorUI.inspecting, "Inspector is not highlighting");
ok(!InspectorUI.isTreePanelOpen, "Inspector Tree Panel is not open");
@@ -118,6 +122,6 @@ function test()
doc = content.document;
waitForFocus(tabFocused, content);
}, true);
-
+
content.location = TEST_URI;
}
diff --git a/browser/base/content/test/browser_inspector_treePanel_result.html b/browser/base/content/test/inspector/browser_inspector_treePanel_result.html
similarity index 100%
rename from browser/base/content/test/browser_inspector_treePanel_result.html
rename to browser/base/content/test/inspector/browser_inspector_treePanel_result.html
diff --git a/browser/base/content/test/browser_inspector_treeSelection.js b/browser/base/content/test/inspector/browser_inspector_treeSelection.js
similarity index 85%
rename from browser/base/content/test/browser_inspector_treeSelection.js
rename to browser/base/content/test/inspector/browser_inspector_treeSelection.js
index 9f328d69e29f..ceab34750904 100644
--- a/browser/base/content/test/browser_inspector_treeSelection.js
+++ b/browser/base/content/test/inspector/browser_inspector_treeSelection.js
@@ -59,7 +59,6 @@ function createDocument()
div.appendChild(h1);
div.appendChild(p1);
div.appendChild(p2);
- // doc.body.addEventListener("DOMSubtreeModified", , false);
doc.body.appendChild(div);
setupSelectionTests();
}
@@ -68,31 +67,37 @@ function setupSelectionTests()
{
h1 = doc.querySelectorAll("h1")[0];
ok(h1, "we have the header node");
- Services.obs.addObserver(runSelectionTests, "inspector-opened", false);
+ Services.obs.addObserver(runSelectionTests,
+ INSPECTOR_NOTIFICATIONS.OPENED, false);
InspectorUI.openInspectorUI();
}
function runSelectionTests()
{
- Services.obs.removeObserver(runSelectionTests, "inspector-opened", false);
- InspectorUI.stopInspecting();
- document.addEventListener("popupshown", performTestComparisons, false);
- InspectorUI.inspectNode(h1);
+ Services.obs.removeObserver(runSelectionTests,
+ INSPECTOR_NOTIFICATIONS.OPENED, false);
+ Services.obs.addObserver(performTestComparisons,
+ INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
+ executeSoon(function() {
+ InspectorUI.inspectNode(h1);
+ });
}
function performTestComparisons(evt)
{
- if (evt.target.id != "highlighter-panel")
- return true;
- document.removeEventListener("popupshown", performTestComparisons, false);
+ Services.obs.removeObserver(performTestComparisons,
+ INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
+
is(h1, InspectorUI.selection, "selection matches node");
- ok(InspectorUI.highlighter.isHighlighting, "panel is highlighting");
- is(h1, InspectorUI.highlighter.highlitNode, "highlighter highlighting correct node");
+ ok(InspectorUI.highlighter.isHighlighting, "highlighter is highlighting");
+ is(InspectorUI.highlighter.highlitNode, h1, "highlighter highlighting correct node");
+
finishUp();
}
function finishUp() {
InspectorUI.closeInspectorUI();
+ doc = h1 = null;
gBrowser.removeCurrentTab();
finish();
}
@@ -106,7 +111,7 @@ function test()
doc = content.document;
waitForFocus(createDocument, content);
}, true);
-
+
content.location = "data:text/html,basic tests for inspector";
}
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index ac0f5547e7b6..59646b1c8eec 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -30,6 +30,7 @@ browser.jar:
* content/browser/browser.xul (content/browser.xul)
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml)
+ content/browser/highlighter.xhtml (content/highlighter.xhtml)
* content/browser/inspector.html (content/inspector.html)
* content/browser/scratchpad.xul (content/scratchpad.xul)
* content/browser/scratchpad.js (content/scratchpad.js)
diff --git a/browser/themes/gnomestripe/browser/highlighter.css b/browser/themes/gnomestripe/browser/highlighter.css
new file mode 100644
index 000000000000..6be6bd600bc8
--- /dev/null
+++ b/browser/themes/gnomestripe/browser/highlighter.css
@@ -0,0 +1,104 @@
+/* ***** 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 the Mozilla Inspector Module.
+ *
+ * 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):
+ * Rob Campbell (original author)
+ * Paul Rouget
+ *
+ * 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 ***** */
+
+body {
+ margin: 0;
+ overflow: hidden;
+}
+
+#close-button {
+ background-image: url("KUI-close.png");
+ border: none;
+ padding: 0;
+ width: 24px;
+ height: 24px;
+ position: fixed;
+ top: 12px;
+ right: 12px;
+ z-index: 1;
+ cursor: pointer;
+}
+
+.veil {
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.veil, #veil-middlebox, #veil-transparentbox {
+ -moz-transition: 0.1s;
+ -moz-transition-timing-function: linear;
+}
+
+#veil-container {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+}
+
+#veil {
+ width: 100%;
+ height: 100%;
+ display: -moz-box;
+ -moz-box-orient: vertical;
+}
+
+#veil-topbox, #veil-bottombox {
+ width: 100%;
+}
+
+#veil-bottombox {
+ -moz-box-flex: 1;
+}
+
+#veil-middlebox {
+ display: -moz-box;
+ -moz-box-orient: horizontal;
+}
+
+#veil-leftbox, #veil-rightbox {
+ height: 100%;
+}
+
+#veil-rightbox {
+ -moz-box-flex: 1;
+}
+
+#veil {
+ vertical-align: top;
+}
diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn
index 37586d31bf00..35bcd078467b 100644
--- a/browser/themes/gnomestripe/browser/jar.mn
+++ b/browser/themes/gnomestripe/browser/jar.mn
@@ -17,6 +17,7 @@ browser.jar:
skin/classic/browser/Geolocation-16.png
skin/classic/browser/Geolocation-64.png
skin/classic/browser/Go-arrow.png
+* skin/classic/browser/highlighter.css
skin/classic/browser/identity.png
skin/classic/browser/Info.png
skin/classic/browser/KUI-close.png
diff --git a/browser/themes/pinstripe/browser/highlighter.css b/browser/themes/pinstripe/browser/highlighter.css
new file mode 100644
index 000000000000..6be6bd600bc8
--- /dev/null
+++ b/browser/themes/pinstripe/browser/highlighter.css
@@ -0,0 +1,104 @@
+/* ***** 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 the Mozilla Inspector Module.
+ *
+ * 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):
+ * Rob Campbell (original author)
+ * Paul Rouget
+ *
+ * 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 ***** */
+
+body {
+ margin: 0;
+ overflow: hidden;
+}
+
+#close-button {
+ background-image: url("KUI-close.png");
+ border: none;
+ padding: 0;
+ width: 24px;
+ height: 24px;
+ position: fixed;
+ top: 12px;
+ right: 12px;
+ z-index: 1;
+ cursor: pointer;
+}
+
+.veil {
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.veil, #veil-middlebox, #veil-transparentbox {
+ -moz-transition: 0.1s;
+ -moz-transition-timing-function: linear;
+}
+
+#veil-container {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+}
+
+#veil {
+ width: 100%;
+ height: 100%;
+ display: -moz-box;
+ -moz-box-orient: vertical;
+}
+
+#veil-topbox, #veil-bottombox {
+ width: 100%;
+}
+
+#veil-bottombox {
+ -moz-box-flex: 1;
+}
+
+#veil-middlebox {
+ display: -moz-box;
+ -moz-box-orient: horizontal;
+}
+
+#veil-leftbox, #veil-rightbox {
+ height: 100%;
+}
+
+#veil-rightbox {
+ -moz-box-flex: 1;
+}
+
+#veil {
+ vertical-align: top;
+}
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index c8c6c11d25ee..9be9c1b950f0 100644
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -15,6 +15,7 @@ browser.jar:
skin/classic/browser/Geolocation-16.png
skin/classic/browser/Geolocation-64.png
skin/classic/browser/Go-arrow.png
+* skin/classic/browser/highlighter.css
skin/classic/browser/home.png
skin/classic/browser/hud-style-check-box-checked.png
skin/classic/browser/hud-style-check-box-empty.png
diff --git a/browser/themes/winstripe/browser/highlighter.css b/browser/themes/winstripe/browser/highlighter.css
new file mode 100644
index 000000000000..6a3236b97155
--- /dev/null
+++ b/browser/themes/winstripe/browser/highlighter.css
@@ -0,0 +1,105 @@
+/* ***** 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 the Mozilla Inspector Module.
+ *
+ * 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):
+ * Rob Campbell (original author)
+ * Paul Rouget
+ *
+ * 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 ***** */
+
+body {
+ margin: 0;
+ overflow: hidden;
+}
+
+#close-button {
+ background-image: url("KUI-close.png");
+ border: none;
+ padding: 0;
+ width: 24px;
+ height: 24px;
+ position: fixed;
+ top: 12px;
+ right: 12px;
+ z-index: 1;
+ cursor: pointer;
+}
+
+.veil {
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.veil, #veil-middlebox, #veil-transparentbox {
+ -moz-transition: 0.1s;
+ -moz-transition-timing-function: linear;
+}
+
+#veil-container {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+}
+
+#veil {
+ width: 100%;
+ height: 100%;
+ display: -moz-box;
+ -moz-box-orient: vertical;
+}
+
+#veil-topbox, #veil-bottombox {
+ width: 100%;
+}
+
+#veil-bottombox {
+ -moz-box-flex: 1;
+}
+
+#veil-middlebox {
+ display: -moz-box;
+ -moz-box-orient: horizontal;
+}
+
+#veil-leftbox, #veil-rightbox {
+ height: 100%;
+}
+
+#veil-rightbox {
+ -moz-box-flex: 1;
+}
+
+#veil {
+ vertical-align: top;
+}
+
diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn
index abdbb8876e94..675725a0f673 100644
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -19,6 +19,7 @@ browser.jar:
skin/classic/browser/fullscreen-video.css
skin/classic/browser/Geolocation-16.png
skin/classic/browser/Geolocation-64.png
+* skin/classic/browser/highlighter.css
skin/classic/browser/Info.png (Info.png)
skin/classic/browser/identity.png (identity.png)
skin/classic/browser/keyhole-forward-mask.svg
@@ -133,6 +134,7 @@ browser.jar:
skin/classic/aero/browser/fullscreen-video.css
skin/classic/aero/browser/Geolocation-16.png
skin/classic/aero/browser/Geolocation-64.png
+* skin/classic/aero/browser/highlighter.css
skin/classic/aero/browser/Info.png (Info-aero.png)
skin/classic/aero/browser/identity.png (identity-aero.png)
skin/classic/aero/browser/keyhole-forward-mask.svg
diff --git a/js/src/methodjit/PolyIC.h b/js/src/methodjit/PolyIC.h
index 0c5a0cee5de4..d18ee97e5efd 100644
--- a/js/src/methodjit/PolyIC.h
+++ b/js/src/methodjit/PolyIC.h
@@ -84,6 +84,11 @@ struct BaseIC : public MacroAssemblerTypedefs {
// Slow path stub call.
CodeLocationCall slowPathCall;
+ // Offset from start of stub to jump target of second shape guard as Nitro
+ // asm data location. This is 0 if there is only one shape guard in the
+ // last stub.
+ int32 secondShapeGuard;
+
// Whether or not the callsite has been hit at least once.
bool hit : 1;
bool slowCallPatched : 1;
@@ -91,11 +96,6 @@ struct BaseIC : public MacroAssemblerTypedefs {
// Number of stubs generated.
uint32 stubsGenerated : 5;
- // Offset from start of stub to jump target of second shape guard as Nitro
- // asm data location. This is 0 if there is only one shape guard in the
- // last stub.
- int32 secondShapeGuard : 11;
-
// Opcode this was compiled for.
JSOp op : 9;
diff --git a/layout/generic/TextOverflow.cpp b/layout/generic/TextOverflow.cpp
index 3852e6230de0..243f14ea6d6a 100644
--- a/layout/generic/TextOverflow.cpp
+++ b/layout/generic/TextOverflow.cpp
@@ -179,7 +179,7 @@ IsFrameDescendantOfAny(nsIFrame* aChild,
const TextOverflow::FrameHashtable& aSetOfFrames,
nsIFrame* aCommonAncestor)
{
- for (nsIFrame* f = aChild; f != aCommonAncestor;
+ for (nsIFrame* f = aChild; f && f != aCommonAncestor;
f = nsLayoutUtils::GetCrossDocParentFrame(f)) {
if (aSetOfFrames.GetEntry(f)) {
return true;
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index f2ddc6ecf4f6..1a4ffb6296ac 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -362,3 +362,5 @@ load 650499-1.html
load 660416.html
load text-overflow-form-elements.html
load text-overflow-iframe.html
+load text-overflow-bug666751-1.html
+load text-overflow-bug666751-2.html
diff --git a/layout/generic/crashtests/text-overflow-bug666751-1.html b/layout/generic/crashtests/text-overflow-bug666751-1.html
new file mode 100644
index 000000000000..4bfec4e53be8
--- /dev/null
+++ b/layout/generic/crashtests/text-overflow-bug666751-1.html
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/layout/generic/crashtests/text-overflow-bug666751-2.html b/layout/generic/crashtests/text-overflow-bug666751-2.html
new file mode 100644
index 000000000000..3659f009e2da
--- /dev/null
+++ b/layout/generic/crashtests/text-overflow-bug666751-2.html
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/mobile/chrome/content/bindings/browser.xml b/mobile/chrome/content/bindings/browser.xml
index f51d7d9bde8d..f500a6897eeb 100644
--- a/mobile/chrome/content/bindings/browser.xml
+++ b/mobile/chrome/content/bindings/browser.xml
@@ -530,7 +530,6 @@
+
+
+
+
+
+
+
+
+
+
+