mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge latest green inbound changeset to mozilla-central

This commit is contained in:
Ed Morley 2013-02-14 10:44:41 +00:00
Родитель 4096b41b31 c6439a29cf
Коммит 601b6ce42a
7 изменённых файлов: 55 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
config/expandlibs_exec.py
Просмотреть файл

@ -129,7 +129,7 @@ class ExpandArgsMore(ExpandArgs):
for l in stderr.split('\n'):
quoted = l.split("'")
if len(quoted) > 5 and quoted[1] != quoted[5]:
result[quoted[1]] = quoted[5]
result[quoted[1]] = [quoted[5]]
if quoted[5] in result:
result[quoted[5]].append(quoted[1])
else:

4
config/tests/unit-expandlibs.py
Просмотреть файл

@ -365,7 +365,7 @@ class TestSymbolOrder(unittest.TestCase):
subprocess.Popen = SubprocessPopen(self)
config.LD_PRINT_ICF_SECTIONS = '-Wl,--print-icf-sections'
args = ExpandArgsMore(['foo', '-bar', 'bar.o', 'foo.o'])
self.assertEqual(args._getFoldedSections(), {'.text.hello': '.text.hi', '.text.hi': ['.text.hello']})
self.assertEqual(args._getFoldedSections(), {'.text.hello': ['.text.hi'], '.text.hi': ['.text.hello']})
subprocess.Popen = subprocess_popen
def test_getOrderedSectionsWithICF(self):
@ -378,7 +378,7 @@ class TestSymbolOrder(unittest.TestCase):
config.LIB_SUFFIX = '.a'
config.LD_PRINT_ICF_SECTIONS = '-Wl,--print-icf-sections'
args = ExpandArgsMore(['foo', '-bar', 'bar.o', 'foo.o'])
self.assertEqual(args._getOrderedSections(['hello', '_Z6barbazv']), ['.text.hi', '.text.hello', '.text.hot._Z6barbazv'])
self.assertEqual(args._getOrderedSections(['hello', '_Z6barbazv']), ['.text.hello', '.text.hi', '.text.hot._Z6barbazv'])
self.assertEqual(args._getOrderedSections(['_ZThn4_6foobarv', 'hi', '_Z6barbazv']), ['.text._Z6foobarv', '.text._ZThn4_6foobarv', '.text.hi', '.text.hello', '.text.hot._Z6barbazv'])
subprocess.Popen = subprocess_popen

2
js/src/config/expandlibs_exec.py
Просмотреть файл

@ -129,7 +129,7 @@ class ExpandArgsMore(ExpandArgs):
for l in stderr.split('\n'):
quoted = l.split("'")
if len(quoted) > 5 and quoted[1] != quoted[5]:
result[quoted[1]] = quoted[5]
result[quoted[1]] = [quoted[5]]
if quoted[5] in result:
result[quoted[5]].append(quoted[1])
else:

2
layout/reftests/forms/reftest.list
Просмотреть файл

@ -30,7 +30,7 @@ skip-if(B2G) fails-if(Android) != textarea-ltr.html textarea-rtl.html
skip-if(B2G) fails-if(Android) != textarea-ltr-scrollbar.html textarea-rtl-scrollbar.html
skip-if(B2G) fails-if(Android) != textarea-in-ltr-doc-scrollbar.html textarea-in-rtl-doc-scrollbar.html
skip-if(B2G) fails-if(Android) != textarea-ltr.html textarea-no-resize.html
skip-if(B2G) fails-if(Android) != textarea-rtl.html textarea-no-resize.html
skip-if(B2G) fails-if(Android) random-if(gtk2Widget) != textarea-rtl.html textarea-no-resize.html # bug 834724
== textarea-rtl.html textarea-rtl-dynamic-attr.html
== textarea-rtl.html textarea-rtl-dynamic-style.html
== textarea-rtl.html textarea-in-dynamic-rtl-doc.html

33
layout/reftests/forms/textarea-resize-background-ref.html
Просмотреть файл

@ -1,5 +1,30 @@
<html><body>
<div style="width: 200px; height: 200px; margin: 0; background: lightgreen; border: none;">
<img style="position: relative; left: 185px; top: 185px;" src="chrome://global/skin/icons/resizer.png" width="15" height="15">
<html>
<script>
function sizeResizer() {
// reference resizer
var img = document.getElementsByTagName("img")[0];
// hidden textarea
var textarea = document.getElementsByTagName("textarea")[0];
var width = 200 - textarea.clientWidth;
var height = 200 - textarea.clientHeight;
// (Leave test failing if a scrollbar is missing)
if (width != 0 && height != 0) {
img.style.width = width + "px";
img.style.left = textarea.clientWidth + "px";
img.style.height = height + "px";
img.style.top = textarea.clientHeight + "px";
}
}
</script>
<body onload="sizeResizer()">
<textarea style="width: 200px; height: 200px; margin: 0; border: none;
background: red; font-size: 400px;">
M
</textarea>
<div style="position: relative; top: -200px;
width: 200px; height: 200px; margin: 0; border: none;
background: lightgreen">
<img style="position: relative;" src="chrome://global/skin/icons/resizer.png">
</div>
</body></html>
</body>
</html>

7
testing/testsuite-targets.mk
Просмотреть файл

@ -365,6 +365,13 @@ cppunittests-remote:
jetpack-tests:
$(PYTHON) $(topsrcdir)/addon-sdk/source/bin/cfx -b $(browser_path) --parseable testpkgs
# -- -register
# -- --trace-malloc malloc.log --shutdown-leaks=sdleak.log
leaktest:
$(PYTHON) _leaktest/leaktest.py $(LEAKTEST_ARGS)
# Package up the tests and test harnesses
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk

25
toolkit/mozapps/installer/l10n-repack.py
Просмотреть файл

@ -110,13 +110,15 @@ def repack(source, l10n, non_resources=[]):
l10n_paths[mozpack.path.basedir(e.path, bases)][e.name])
for e in entries if isinstance(e, ManifestEntryWithRelPath))
for path in NON_CHROME:
left = set(p for p, f in finder.find(path))
right = set(p for p, f in l10n_finder.find(path))
for p in right:
paths[p] = p
for p in left - right:
paths[p] = None
for pattern in NON_CHROME:
for base in bases:
path = mozpack.path.join(base, pattern)
left = set(p for p, f in finder.find(path))
right = set(p for p, f in l10n_finder.find(path))
for p in right:
paths[p] = p
for p in left - right:
paths[p] = None
# Create a new package, with non localized bits coming from the original
# package, and localized bits coming from the langpack.
@ -170,10 +172,11 @@ def repack(source, l10n, non_resources=[]):
packager.close()
# Add any remaining non chrome files.
for base in NON_CHROME:
for p, f in l10n_finder.find(base):
if not formatter.contains(p):
formatter.add(p, f)
for pattern in NON_CHROME:
for base in bases:
for p, f in l10n_finder.find(mozpack.path.join(base, pattern)):
if not formatter.contains(p):
formatter.add(p, f)
# Transplant jar preloading information.
for path, log in finder.jarlogs.iteritems():