wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge mozilla-central to mozilla-inbound

Browse Source
This commit is contained in:
Ed Morley 2012-09-28 16:01:22 +01:00
commit ce41594120
8 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/valgrind/cross-architecture.sup
View File

@ -1,3 +1,5 @@
# Full list is tracked through meta bug 793882
####################
# Intended leaks #
####################

18
build/valgrind/i386-redhat-linux-gnu.sup
View File

@ -1,6 +1,9 @@
# Full list is tracked through meta bug 793882
####################################
# Leaks in third party libraries #
####################################
{
Bug 793537
Memcheck:Leak
@ -8,13 +11,14 @@
obj:/usr/lib/libpango-1.0.so.0.2800.1
...
}
{
Bug 793539 which may be fixed or change when bug 713802 is fixed
Memcheck:Leak
...
obj:/usr/lib/libgnomevfs-2.so.0.2400.2
...
}
#{
# Bug 713802 now seems fixed, commenting out suppression to verify that bug 793539 is also gone
# Bug 793539 which may be fixed or change when bug 713802 is fixed
# Memcheck:Leak
# ...
# obj:/usr/lib/libgnomevfs-2.so.0.2400.2
# ...
#}
{
Bug 793598
Memcheck:Leak

18
build/valgrind/x86_64-redhat-linux-gnu.sup
View File

@ -1,6 +1,9 @@
# Full list is tracked through meta bug 793882
####################################
# Leaks in third party libraries #
####################################
{
Bug 793537
Memcheck:Leak
@ -8,13 +11,14 @@
obj:/usr/lib64/libpango-1.0.so.0.2800.1
...
}
{
Bug 793539 which may be fixed or change when bug 713802 is fixed
Memcheck:Leak
...
obj:/usr/lib64/libgnomevfs-2.so.0.2400.2
...
}
#{
# Bug 713802 now seems fixed, commenting out suppression to verify that bug 793539 is also gone
# Bug 793539 which may be fixed or change when bug 713802 is fixed
# Memcheck:Leak
# ...
# obj:/usr/lib64/libgnomevfs-2.so.0.2400.2
# ...
#}
{
Bug 793598
Memcheck:Leak

3
content/base/src/nsDocument.cpp
View File

@ -6399,7 +6399,8 @@ nsDocument::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
// Load events must not propagate to |window| object, see bug 335251.
if (aVisitor.mEvent->message != NS_LOAD) {
nsGlobalWindow* window = static_cast<nsGlobalWindow*>(GetWindow());
aVisitor.mParentTarget = static_cast<nsIDOMEventTarget*>(window);
aVisitor.mParentTarget =
window ? window->GetTargetForEventTargetChain() : nullptr;
}
return NS_OK;
}

7
content/events/src/nsEventDispatcher.cpp
View File

@ -226,9 +226,9 @@ uint32_t nsEventTargetChainItem::sCurrentEtciCount = 0;
nsEventTargetChainItem::nsEventTargetChainItem(nsIDOMEventTarget* aTarget,
nsEventTargetChainItem* aChild)
: mChild(aChild), mParent(nullptr), mFlags(0), mItemFlags(0)
: mTarget(aTarget), mChild(aChild), mParent(nullptr), mFlags(0), mItemFlags(0)
{
mTarget = aTarget->GetTargetForEventTargetChain();
MOZ_ASSERT(!aTarget || mTarget == aTarget->GetTargetForEventTargetChain());
if (mChild) {
mChild->mParent = this;
}
@ -533,7 +533,8 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
// Create the event target chain item for the event target.
nsEventTargetChainItem* targetEtci =
nsEventTargetChainItem::Create(pool.GetPool(), target);
nsEventTargetChainItem::Create(pool.GetPool(),
target->GetTargetForEventTargetChain());
NS_ENSURE_TRUE(targetEtci, NS_ERROR_OUT_OF_MEMORY);
if (!targetEtci->IsValid()) {
nsEventTargetChainItem::Destroy(pool.GetPool(), targetEtci);

7
js/src/ion/CodeGenerator.cpp
View File

@ -3954,11 +3954,14 @@ CodeGenerator::emitInstanceOf(LInstruction *ins, Register rhs)
masm.loadPtr(Address(lhsTmp, JSObject::offsetOfType()), lhsTmp);
masm.loadPtr(Address(lhsTmp, offsetof(types::TypeObject, proto)), lhsTmp);
masm.test32(lhsTmp, lhsTmp);
// Bail out if we hit a lazy proto
masm.branch32(Assembler::Equal, lhsTmp, Imm32(1), call->entry());
masm.testPtr(lhsTmp, lhsTmp);
masm.j(Assembler::Zero, &done);
// Check lhs is equal to rhsShape
masm.cmp32(lhsTmp, rhsTmp);
masm.cmpPtr(lhsTmp, rhsTmp);
masm.j(Assembler::NotEqual, &loopPrototypeChain);
// return true

10
js/src/jit-test/tests/basic/bug794947.js Normal file
View File

@ -0,0 +1,10 @@
function f(o)
{
print(o instanceof String);
}
var g = newGlobal();
f(new Object());
var o1 = g.eval('new Object()');
var o2 = Object.create(o1);
f(o2);

15
mobile/android/base/BrowserApp.java
View File

@ -51,7 +51,6 @@ abstract public class BrowserApp extends GeckoApp
public static BrowserToolbar mBrowserToolbar;
private AboutHomeContent mAboutHomeContent;
private boolean mAboutHomeShowing;
private static final int ADDON_MENU_OFFSET = 1000;
private class MenuItemInfo {
@ -598,25 +597,17 @@ abstract public class BrowserApp extends GeckoApp
mAboutHomeContent.update(EnumSet.of(AboutHomeContent.UpdateFlags.TOP_SITES));
}
private void showAboutHome() {
if (mAboutHomeShowing)
return;
mAboutHomeShowing = true;
public void showAboutHome() {
Runnable r = new AboutHomeRunnable(true);
mMainHandler.postAtFrontOfQueue(r);
}
private void hideAboutHome() {
if (!mAboutHomeShowing)
return;
mAboutHomeShowing = false;
public void hideAboutHome() {
Runnable r = new AboutHomeRunnable(false);
mMainHandler.postAtFrontOfQueue(r);
}
private class AboutHomeRunnable implements Runnable {
public class AboutHomeRunnable implements Runnable {
boolean mShow;
AboutHomeRunnable(boolean show) {
mShow = show;