Skip to content

Commit

Permalink
import changes from `dev' branch of rmottola/Arctic-Fox:
Browse files Browse the repository at this point in the history
- Bug 1244883 - Add Nightly-/Aurora-only crash for AsyncTransactionWaiter timeouts - r=nical (132b2ceff9)
- Bug 1148978 - Trigger paints when moving plugin windows around on the browser main thread. r=mattwoodrow (c75ce5ec09)
- Dedent some functions. (bug 1254899 part 1, r=jrmuizel) (c84fb419c7)
- Refactor acceleration pref initialization. (bug 1254899 part 2, r=jrmuizel) (29a164c70e)
- Remove NS_NATIVE_GRAPHIC on Windows. (bug 1266536, r=jimm) (84011349d1)
- Bug 1267253 - Delete gfxWindowsPlatform::RenderMode and replace it with a check against the default backend. r=bas (93cb6e503e)
- Introduce gfxConfig, a manager for graphics feature settings. (bug 1254899 part 3, r=milan) (97498ca46a)
- Bug 1262187: Allow D3D9 if D3D11 failed, behind the pref, but on by default. r=bas (8163e28b26)
- Bug 1178376 - Optionally fade in new progressively painted tiles r=nical (777bf1799d)
- Bug 1178376 - Allow progressive painting when low-precision tiles are disabled r=BenWa (3b8d84e19c)
- Bug 1178376 - Put progressive paint status in tile updates r=nical (935d3b46ed)
- Bug 1251778: Attempt to avoid presenting when the window is still resizing. r=jrmuizel (32b194a6f7)
- Hoist mWidget into the Compositor base class. (bug 1264545 part 1, r=nical) (aca26ec343)
- Lift compositor-accessed methods from nsIWidget into CompositorWidgetProxy. (bug 1264545 part 2, r=jimm) (609a23157a)
- Rename FeatureStatus::Crashed to CrashedInHandler. (bug 1254899 part 4, r=milan) (0eae23a3fd)
- Move DeviceInitData from gfxWindowsPlatform to gfxPlatforn. (bug 1254899 part 5, r=milan) (e31540ba18)
- Merge gfxWindowsPlatform::mAcceleration into gfxConfig. (bug 1254899 part 6, r=milan) (9d45cc8b87)
- Add another feature state for blacklisting and environment decisions. (bug 1254899 part 7, r=milan) (e7eee53cfb)
- Give FeatureState a public interface. (bug 1254899 part 8, r=milan) (52d8e7f355)
- Replace gfxWindowsPlatform::mD3D11Status with gfxConfig. (bug 1254899 part 9, r=jrmuizel) (90dc658b53)
- Replace gfxWindowsPlatform::mD2D1Status with gfxConfig. (bug 1254899 part 10, r=milan) (eb9474f309)
- Fix assertion failure in gfxConfig. (bug 1269565, r=milan) (0eb738ce66)
- Add gfxConfig to nsIGfxInfo, for about:support access. (bug 1254899 part 11, r=jrmuizel) (e770240152)
- Change Compositor::GetWidget to return a CompositorWidgetProxy. (bug 1264545 part 3, r=jimm) (fdf1d96255)
- Bug 1251778 - Followup: Remove unreferenced local variable. r=bustage (27579f5542)
- Use CompositorWidgetProxy in place of nsIWidget in the compositor. (bug 1264545 part 4, r=jimm) (80def1c2eb)
- Use CompositorWidgetProxy in place of nsIWidget in CompositorBridgeParent. (bug 1264545 part 5, r=jimm,kats) (67d0e1ef7d)
- Move CompositorWidgetProxy inheritance out of nsIWidget. (bug 1264545 part 6, r=jimm) (61075722c5)
- Bug 1251894 - In CompositorD3D11::CreateTexture, copy as much as the render target allows. r=bas (bf5fc6baa2)
- Bug 1266444: It is OK for us not to have texture sharing. r=jrmuizel (0b1885f89d)
- Bug 1266396 - Make TextureClient more robust against racy shutdown situations. r=Bas (b1d7f54643)
- Fix test bustage due to platform line-endings. Bug 1222624 (10b8cf3592)
- More test bustage from bug 1222624 (763c4c0bb9)
- Backed out 4 changesets (bug 1222624) to fix bug 1249572 (7ba3d433d0)
- Bug 1268230 - RunTime.cpp and ScriptLoader do not have to use MainThreadStopSyncLoopRunnable, r=khuey (88499a3982)
- Bug 1037725 - Add warning message in the console when worker spawn over limit. r=khuey (8af94dbc1d)
- Bug 1047663 - Disabling the cache in a tab should also disable it for all workers in that tab;r=khuey (5411d81682)
- Bug 1253793 Update ScriptLoader assertion to handle cancelation case. r=khuey (18c78d5651)
- Bug 1245768 - Implement a test for the correct error management when worker imports 3rd party scripts, r=bz (c1d3f290a9)
- Bug 1249673. Muted errors should be turned into NetworkError DOMExceptions when returning from importScripts on workers, instead of becoming NS_ERROR_FAILURE. r=baku (0358282cbe)
- Bug 1265405 - Add a dictionary to specify how PeriodicWave should be normalized (or not); r=smaug …normalized (or not); r=smaugu (201213146c)
- Bug 1251082. Restore comments in PageTransitionEvent.webidl that got lost when nsIDOMPageTransitionEvent.idl was migrated to webidl. r=bz The mentioned migration happened in http://hg.mozilla.org/mozilla-central/rev/e6377ca32f3d from bug 1031051. (2dfa309056)
- Bug 1266178 Make ServiceWorkerClient not assert if the document doesn't have an outer window. r=ehsan (eafb169c91)
- Bug 1259164 - Set ServiceWorkerMessageEvent.origin correctly when calling ServiceWorkerClient.postMessage(); r=bkelly (caeb65d10e)
- Bug 1246319 P1 Dedupe service worker registrar entries. r=baku (b76deef941)
- Bug 1246319 P2 Verify entries are deduped from the ServiceWorkerRegistrar. r=baku (8a4e348d6e)
- Bug 1246319 P3 Fix service worker registry value update. r=bz (14abf6b6ce)
- Bug 1247970 - Remove principal spec from service worker registrar file. r=baku (3c30130700)
- Bug 1249438 P1 Move guts of RegisterServiceWorker() into a protected method that can be tested in gtest. r=baku (488243196d)
- Bug 1249438 P2 Modify existing gtest to use RegisterServiceWorkerInternal. r=baku (e86c66891d)
- Bug 1249438 P3 Add a gtest that registers duplicate service worker registrations. r=baku (35e269f9af)
- Bug 1226443 P6 Ignore update() called during top level service worker script evaluation. r=ehsan (dcb9d02553)
- Bug 1241725 - about:serviceworkers "Active Cache Name" UUID should not contain null bytes, r=bkelly (4cddea6a67)
- Bug 1221852 - SharedWorker.port should be always not null, r=smaug (a9800274dc)
- Bug 1261428: Clean up a bit more. r=bz (4977e3d7a5)
- Bug 890284. Stop splitting textnodes in the XML content sink. r=peterv (a46dfca1cf)
- Bug 1211708 Allow themes to specify XBL bindings even in unprivileged documents r=sicking (82cf1a4023)
- Bug 915962 - Part 1: Allow pressing space to scroll the document if an editable element or form control is not focused; r=roc (cdb934af03)
- Bug 915962 - Part 2: Add a test case for pressing space when a tabindex=-1 and a button element is focused; r=roc (17dcf5cfd0)
- Bug 915962 - Part 3: Do not crash when pressing the space bar without having an element focused; r=roc (2161e62bc3)
- Bug 1180761, cancel the event earlier so that space doesn't trigger checkbox change and scroll, r=neil (2425cb76ad)
- Bug 1259182 - Shrink keyCodeData. r=bz. (737204af84)
- Bug 1193567 - Check result of ReadID in nsXBLPrototypeBinding::Read(). r=wchen (c9b1c35bf3)
- Bug 1173344 - Remove an intermediary root from nsXBLProtoImplField's FieldGetterImpl; r=jandem (5f42dd2e48)
- Bug 1207494 - Part 14: Remove use of expression closure from dom/xbl/. r=bz (21c7d3825f)
- align tests (fe34b613d3)
- Bug 1223702 - Fix some errors about wifi direct. r=hchang (568d86054a)
- Bug 1166274 - Part 1: Handle the callback and IPC message of setStaticIpMode correctly. r=vchang (8fb8d7f3b7)
- Bug 1133665 - [Flame][Wifi] The SSID that has set to be binded with MAC address is not hightlighted when user taps it. r=hchang (3165471d13)
- Bug 1207494 - Part 13: Remove use of expression closure from dom/wifi/. r=henry (dd9ad23a8a)
- Bug 1251856 - Disable U2F in all releases (fix for 1231681). r=baku (24ada10566)
- align tests (dae9ecd0ee)
- var-let (11a3cb0878)
- Bug 1184822 - Use classId to get provider. r=fabrice (1288eccd06)
- Bug 1247410 - "test for _nomap ids does not work correctly". r=dougt (f736a04f08)
- Bug 1035097 - Changed the type from 'radio' to 'radioType'. r=jdm (f9a0079152)
- Bug 1177871 - Add a timeout to XHR request of WifiGeoPositionProvider. r=jdm (2f6aa87c20)
- align code to 978593 with POST and location structure (d8ba75a759)
- Bug 1230685 - Replace function declarations with add_task statements in test_storage_value_array.js and test_unicode.js. r=mak (9822bf2215)
- Bug 1230683 - Replace try/catch with Assert.throws in test_storage_connection.js. r=mak (1c993fc37e)
- Bug 655722 - Rewrite _buildGUIDMap in the sync bookmark engine to use PlacesUtils.promiseBookmarksTree. r=mak (3795d26af0)
- Bug 1251057 - enable debug logging for rest.js requests and responses. r=adw (1062bcd113)
- Bug 503515 - Try and ensure exported certificates include an extension by default. r=keeler (505967ab7f)
- Bug 1017616 - Filter out some more unnecessary characters when exporting certs. r=keeler (e95838e362)
- Bug 1241614 - don't overflow:auto the container, use em to size the dialog to avoid hidpi visibility issues, r=dolske,ttaubert (8bd6c2b35b)
- Bug 1266851. Make <xmp> and <listing> use HTMLPreElement as their primary interface, per <whatwg/html#1015>.  r=peterv (6be7f9d6e9)
- Bug 1262184 - Block embed content loading when child of media element; r=bz (a297eeb378)
- Bug 1263696 - Block embed content loading when ancestor of object element with content; r=bz (89c143cbfe)
- Bug 1266077. Fix <base> href getter to follow the spec; it should be using the fallback base URI to resolve against, not the document URI. r=bkelly (e757b23a14)
- Bug 1168079 nsTextEditRules::CollapseSelectionToTrailingBRIfNeeded() should ensure that there is a selection before calling nsEditor::GetStartNodeAndOffset() r=ehsan (6c283bf3a7)
- Bug 898321 - Return success from nsTableEditor::GetCellAt if frame not found; r=ehsan (0d09143b95)
- Bug 387687 - wrap quotes in plain text replies to window. r=masayuki (ca51437018)
- Bug 1247483 - Only replace nodes in nsHTMLEditor::ReplaceOrphanedStructure if all nodes in node list are descendants of replacement node. r=ehsan (8416037da2)
- bug 1266496 - fire some selection events for proxied accessibles r=davidb (8806de7dd9)
- bug 1266518 - add a new event message for AccSelChangeEvents r=davidb (46af183cab)
- Bug 953265: Adjust Opus bitrate in WebRTC to pass >8KHz audio, and comment r=bwc (b0be6a326e)
- Bug 1221473: Do not treat answer as authoritative wrt payload types. r=drno (d27409209e)
- Bug 1241321 - No RTCP stats for audio streams. r=rjesup (ec0222694e)
- bug 1250492 - use tl::Max instead of std::max to get rid of a static constructor r=jesup (3cebbc8969)
- Bug 1254187: Fix maxBitrate to respect simulcast. r=jesup (e569e54b57)
- Bug 1158931 - Fix static assertion compilation error; r=snorp (eb27881746)
- No bug, fix WebrtcMediaCodecVP8VideoCodec.cpp warnings (a983544581)
- Bug 1252737 - use size_t instead of uint32_t for InitEncode(). r=jesup (57c3abc9fa)
- Bug 1208371 - Never send more than one disabled frame in a row to the WebRTC encoder. r=jesup (ec0c28822b)
- Bug 1208371 - Do image format conversion async in MediaPipeline. r=jesup (032efec783)
- Bug 1266685 - Don't pass too many frames to the MediaPipelineTransmit VideoFrameConverter. r=jesup (21774a8d25)
- Bug 1266644 - Rename StreamBuffer to StreamTracks. r=jesup r=pehrsons (21906fe1f7)
- Bug 1208371 - Don't treat audio chunks as mutable in MediaPipeline. r=padenot (3878ef4332)
- Bug 1246310 - Let MediaPipelineReceive tracks start at 0. r=jesup (b468ff8d48)
- Bug 1266644 - Rename DOMMediaStream:: CreateXXXStream to DOMMediaStream:: CreateXXXStreamAsInput. r=jesup r=pehrsons (fe4b6d70bc)
- Bug 1234578: Add an assertion. r=drno, a=abillings (f1a2c8d841)
- bug 1250492 - include sstream in SdpMediaSection.h instead of iostream r=jesup (110b5c2eca)
- Bug 1264470 - a=identity is a long attribute, r=bwc (5848194fe9)
- Bug 1256750: Remove unnecessary sscanf_s parameter on windows, and fix format string everywhere else. r=jesup (371c0db476)
- Bug 1204082 - try strtoull instead. r=mt (a0313aa87c)
- Bug 1113443 - reject each media type with approriate default. r=bwc (a72ff312d1)
- Bug 1095793 - use mid if provided to place candidate in msection. r=bwc (2c29b21fac)
- Bug 1252699 - Set WEBRTC_DETECT_ARM_NEON when optional neon is requested. r=jesup (722e2043a5)
- Bug 1229475 - webrtc: Call opus tonality_analysis_init. r=jesup (1cf8cc2cd7)
- Bug 1254876: assert windows recording is shut down r=pkerr (1f2cb69073)
- Bug 1227481 - added a memset on aec. r=jesup (532026ce20)
- Bug 1254507 - Fix leak in WebRTC DesktopApplication class. r=jesup (54da72aeb4)
- Bug 1196542 - share only windows with non-zero area. r=pkerr (94595ec463)
- Bug 1202087 - Filter out non-shareable application for win8 or greater. r=jesup (d989956802)
- Bug 1216529 - WebRTC: Request camera permission before accessing camera APIs. r=gcp (24b6699226)
- Bug 1237630 - Part 1: Video freeze from WebRTC sender. r=rjesup (02daa8b5b7)
- Bug 1237630 - Part 2: remove LOG statement generating a now defunct error condition. r=rjesup (c6002ef12f)
- Bug 1248335: avoid using SvcInternal structure entirely, as system-vpx may not have it r=pkerr (ef9b21f20c)
- Bug 1234571: unregister encoded-frame callback when releasing codec databases r=pkerr (321bd5166b)
- Bug 820972 - Comment out colorTable[] because we don't need it. r=jesup. (60b10803d5)
- cleanup and missing test stuff (e2be0331d9)
- Merge remote-tracking branch 'upstream/dev' into winbuild (3a3bb0b315)
- layout/media: fix export symbol list, fix build bustage (f9f5bfe14c)
  • Loading branch information
roytam1 committed Sep 10, 2024
1 parent fb49d72 commit 21c9879
Show file tree
Hide file tree
Showing 314 changed files with 9,282 additions and 2,943 deletions.
11 changes: 11 additions & 0 deletions accessible/atk/AccessibleWrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,10 @@ a11y::ProxyEvent(ProxyAccessible* aTarget, uint32_t aEventType)
case nsIAccessibleEvent::EVENT_VALUE_CHANGE:
g_object_notify((GObject*)wrapper, "accessible-value");
break;
case nsIAccessibleEvent::EVENT_TEXT_SELECTION_CHANGED:
case nsIAccessibleEvent::EVENT_SELECTION_WITHIN:
g_signal_emit_by_name(wrapper, "selection_changed");
break;
}
}

Expand Down Expand Up @@ -1610,6 +1614,13 @@ MaiAtkObject::FireAtkShowHideEvent(AtkObject* aParent, bool aIsAdded,
g_signal_emit_by_name(aParent, signal_name, indexInParent, this, nullptr);
}

void
a11y::ProxySelectionEvent(ProxyAccessible*, ProxyAccessible* aWidget, uint32_t)
{
MaiAtkObject* obj = MAI_ATK_OBJECT(GetWrapperFor(aWidget));
g_signal_emit_by_name(obj, "selection_changed");
}

// static
void
AccessibleWrap::GetKeyBinding(Accessible* aAccessible, nsAString& aResult)
Expand Down
2 changes: 2 additions & 0 deletions accessible/base/Platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ void ProxyTextChangeEvent(ProxyAccessible* aTarget, const nsString& aStr,
bool aFromUser);
void ProxyShowHideEvent(ProxyAccessible* aTarget, ProxyAccessible* aParent,
bool aInsert, bool aFromUser);
void ProxySelectionEvent(ProxyAccessible* aTarget, ProxyAccessible* aWidget,
uint32_t aType);
} // namespace a11y
} // namespace mozilla

9 changes: 9 additions & 0 deletions accessible/generic/Accessible.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,15 @@ Accessible::HandleAccEvent(AccEvent* aEvent)
event->IsFromUserInput());
break;
}
case nsIAccessibleEvent::EVENT_SELECTION:
case nsIAccessibleEvent::EVENT_SELECTION_ADD:
case nsIAccessibleEvent::EVENT_SELECTION_REMOVE: {
AccSelChangeEvent* selEvent = downcast_accEvent(aEvent);
uint64_t widgetID = selEvent->Widget()->IsDoc() ? 0 :
reinterpret_cast<uintptr_t>(selEvent->Widget());
ipcDoc->SendSelectionEvent(id, widgetID, aEvent->GetEventType());
break;
}
default:
ipcDoc->SendEvent(id, aEvent->GetEventType());
}
Expand Down
25 changes: 25 additions & 0 deletions accessible/ipc/DocAccessibleParent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,31 @@ DocAccessibleParent::RecvTextChangeEvent(const uint64_t& aID,
return true;
}

bool
DocAccessibleParent::RecvSelectionEvent(const uint64_t& aID,
const uint64_t& aWidgetID,
const uint32_t& aType)
{
ProxyAccessible* target = GetAccessible(aID);
ProxyAccessible* widget = GetAccessible(aWidgetID);
if (!target || !widget) {
NS_ERROR("invalid id in selection event");
return true;
}

ProxySelectionEvent(target, widget, aType);
if (!nsCoreUtils::AccEventObserversExist()) {
return true;
}
xpcAccessibleGeneric* xpcTarget = GetXPCAccessible(target);
xpcAccessibleDocument* xpcDoc = GetAccService()->GetXPCDocument(this);
RefPtr<xpcAccEvent> event = new xpcAccEvent(aType, xpcTarget, xpcDoc,
nullptr, false);
nsCoreUtils::DispatchAccEvent(Move(event));

return true;
}

bool
DocAccessibleParent::RecvBindChildDoc(PDocAccessibleParent* aChildDoc, const uint64_t& aID)
{
Expand Down
4 changes: 4 additions & 0 deletions accessible/ipc/DocAccessibleParent.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ class DocAccessibleParent : public ProxyAccessible,
const bool& aIsInsert,
const bool& aFromUser) override;

virtual bool RecvSelectionEvent(const uint64_t& aID,
const uint64_t& aWidgetID,
const uint32_t& aType) override;

virtual bool RecvBindChildDoc(PDocAccessibleParent* aChildDoc, const uint64_t& aID) override;
void Unbind()
{
Expand Down
1 change: 1 addition & 0 deletions accessible/ipc/PDocAccessible.ipdl
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ parent:
async CaretMoveEvent(uint64_t aID, int32_t aOffset);
async TextChangeEvent(uint64_t aID, nsString aStr, int32_t aStart, uint32_t aLen,
bool aIsInsert, bool aFromUser);
async SelectionEvent(uint64_t aID, uint64_t aWidgetID, uint32_t aType);

/*
* Tell the parent document to bind the existing document as a new child
Expand Down
5 changes: 5 additions & 0 deletions accessible/mac/Platform.mm
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@
ProxyShowHideEvent(ProxyAccessible*, ProxyAccessible*, bool, bool)
{
}

void
ProxySelectionEvent(ProxyAccessible*, ProxyAccessible*, uint32_t)
{
}
} // namespace a11y
} // namespace mozilla

Expand Down
5 changes: 5 additions & 0 deletions accessible/other/Platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,8 @@ void
a11y::ProxyShowHideEvent(ProxyAccessible*, ProxyAccessible*, bool, bool)
{
}

void
a11y::ProxySelectionEvent(ProxyAccessible*, ProxyAccessible*, uint32_t)
{
}
7 changes: 7 additions & 0 deletions accessible/windows/msaa/Platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,10 @@ a11y::ProxyShowHideEvent(ProxyAccessible* aTarget, ProxyAccessible*, bool aInser
AccessibleWrap* wrapper = WrapperFor(aTarget);
AccessibleWrap::FireWinEvent(wrapper, event);
}

void
a11y::ProxySelectionEvent(ProxyAccessible* aTarget, ProxyAccessible*, uint32_t aType)
{
AccessibleWrap* wrapper = WrapperFor(aTarget);
AccessibleWrap::FireWinEvent(wrapper, aType);
}
24 changes: 18 additions & 6 deletions dom/base/nsObjectLoadingContent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
#include "mozilla/EventStates.h"
#include "mozilla/Telemetry.h"
#include "mozilla/dom/HTMLObjectElementBinding.h"
#include "mozilla/dom/HTMLSharedObjectElement.h"

#ifdef XP_WIN
// Thanks so much, Microsoft! :(
Expand Down Expand Up @@ -2969,24 +2970,35 @@ nsObjectLoadingContent::LoadFallback(FallbackType aType, bool aNotify) {
aType = eFallbackAlternate;
}

// We'll set this to null no matter what now, doing it here means we'll load
// child embeds as we find them in the upcoming loop.
mType = eType_Null;

// Do a breadth-first traverse of node tree with the current element as root,
// looking for the first embed we can find.
nsTArray<nsINodeList*> childNodes;
if ((thisContent->IsHTMLElement(nsGkAtoms::object) ||
thisContent->IsHTMLElement(nsGkAtoms::applet)) &&
(aType == eFallbackUnsupported ||
aType == eFallbackDisabled ||
aType == eFallbackBlocklisted))
{
// Show alternate content instead, if it exists
for (nsIContent* child = thisContent->GetFirstChild();
child; child = child->GetNextSibling()) {
if (!child->IsHTMLElement(nsGkAtoms::param) &&
for (nsIContent* child = thisContent->GetFirstChild(); child;
child = child->GetNextNode(thisContent)) {
if (aType != eFallbackAlternate &&
!child->IsHTMLElement(nsGkAtoms::param) &&
nsStyleUtil::IsSignificantChild(child, true, false)) {
aType = eFallbackAlternate;
break;
}
if (child->IsHTMLElement(nsGkAtoms::embed)) {
HTMLSharedObjectElement* object = static_cast<HTMLSharedObjectElement*>(child);
if (object) {
object->StartObjectLoad(true, true);
}
}
}
}

mType = eType_Null;
mFallbackType = aType;

// Notify
Expand Down
12 changes: 12 additions & 0 deletions dom/base/test/file_bug1263696_frame_fail.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/REC-html401-19991224/strict.dtd">
<html>
<head>
<title>Bug 1263696 - iframe that should not be loaded</title>
</head>
<body>
<script>
parent.SimpleTest.ok(false, "this iframe should not load");
</script>
</body>
</html>
13 changes: 13 additions & 0 deletions dom/base/test/file_bug1263696_frame_pass.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/REC-html401-19991224/strict.dtd">
<html>
<head>
<title>Bug 1263696 - iframe that should be loaded</title>
</head>
<body>
<script>
parent.index = parent.index + 1;
parent.SimpleTest.ok(true, "this iframe should load");
</script>
</body>
</html>
3 changes: 3 additions & 0 deletions dom/base/test/mochitest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ support-files =
file_bug902350_frame.html
file_bug907892.html
file_bug945152.jar
file_bug1263696_frame_pass.html
file_bug1263696_frame_fail.html
file_general_document.html
file_html_in_xhr.html
file_html_in_xhr.sjs
Expand Down Expand Up @@ -854,3 +856,4 @@ skip-if = buildapp == 'b2g' #no ssl support
[test_document_register.html]
[test_bug962251.html]
[test_bug1259588.html]
[test_bug1263696.html]
53 changes: 53 additions & 0 deletions dom/base/test/test_bug1263696.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<!DOCTYPE html>
<html>
<head>
<meta><charset="utf-8"/>
<title>Test Embed/Object Node Conflicts</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="plugin-utils.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript">
SimpleTest.waitForExplicitFinish();
var index = 0;
function startTest() {
is(index, 12, "Should have loaded all passing frames.");
SimpleTest.finish();
}
</script>
</head>
<body onload="startTest()">
<object data="file_bug1263696_frame_pass.html" style="width: 100px; height: 100px">
<embed type="text/html" src="file_bug1263696_frame_fail.html" />
</object>
<object style="width: 100px; height: 100px" data="data:application/x-does-not-exist,test">
<embed type="text/html" src="file_bug1263696_frame_pass.html" />
</object>
<object style="width: 100px; height: 100px" data="data:application/x-does-not-exist,test">
<div></div>
<embed type="text/html" src="file_bug1263696_frame_pass.html" />
</object>
<object style="width: 100px; height: 100px" data="data:application/x-does-not-exist,test">
<div>
<embed type="text/html" src="file_bug1263696_frame_pass.html" />
</div>
</object>
<object style="width: 100px; height: 100px" data="data:application/x-does-not-exist,test">
<embed type="text/html" src="file_bug1263696_frame_pass.html" />
<embed type="text/html" src="file_bug1263696_frame_pass.html" />
<object data="file_bug1263696_frame_pass.html">
<embed type="text/html" src="file_bug1263696_frame_fail.html" />
</object>
<object data="data:application/x-does-not-exist,test">
<embed type="text/html" src="file_bug1263696_frame_pass.html" />
</object>
</object>
<div>
<object data="file_bug1263696_frame_pass.html" style="width: 100px; height: 100px"></object>
<embed type="text/html" src="file_bug1263696_frame_pass.html" />
</div>
<div>
<embed type="text/html" src="file_bug1263696_frame_pass.html" />
<object data="file_bug1263696_frame_pass.html" style="width: 100px; height: 100px"></object>
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion dom/html/HTMLMediaElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2008,7 +2008,7 @@ HTMLMediaElement::CaptureStreamInternal(bool aFinishWhenEnded,

OutputMediaStream* out = mOutputStreams.AppendElement();
MediaStreamTrackSourceGetter* getter = new CaptureStreamTrackSourceGetter(this);
out->mStream = DOMMediaStream::CreateTrackUnionStream(window, aGraph, getter);
out->mStream = DOMMediaStream::CreateTrackUnionStreamAsInput(window, aGraph, getter);
out->mFinishWhenEnded = aFinishWhenEnded;

mAudioCaptured = true;
Expand Down
1 change: 1 addition & 0 deletions dom/html/HTMLObjectElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class HTMLObjectElement final : public nsGenericHTMLFormElement
// nsISupports
NS_DECL_ISUPPORTS_INHERITED

NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLObjectElement, object)
virtual int32_t TabIndexDefault() override;

#ifdef XP_MACOSX
Expand Down
8 changes: 8 additions & 0 deletions dom/html/HTMLPreElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ HTMLPreElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
NS_IMETHODIMP_(bool)
HTMLPreElement::IsAttributeMapped(const nsIAtom* aAttribute) const
{
if (!mNodeInfo->Equals(nsGkAtoms::pre)) {
return nsGenericHTMLElement::IsAttributeMapped(aAttribute);
}

static const MappedAttributeEntry attributes[] = {
{ &nsGkAtoms::wrap },
{ nullptr },
Expand All @@ -80,6 +84,10 @@ HTMLPreElement::IsAttributeMapped(const nsIAtom* aAttribute) const
nsMapRuleToAttributesFunc
HTMLPreElement::GetAttributeMappingFunction() const
{
if (!mNodeInfo->Equals(nsGkAtoms::pre)) {
return nsGenericHTMLElement::GetAttributeMappingFunction();
}

return &MapAttributesIntoRule;
}

Expand Down
4 changes: 3 additions & 1 deletion dom/html/HTMLSharedElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,15 @@ NS_IMPL_STRING_ATTR(HTMLSharedElement, Target, target)
NS_IMETHODIMP
HTMLSharedElement::GetHref(nsAString& aValue)
{
MOZ_ASSERT(mNodeInfo->Equals(nsGkAtoms::base),
"This should only get called for <base> elements");
nsAutoString href;
GetAttr(kNameSpaceID_None, nsGkAtoms::href, href);

nsCOMPtr<nsIURI> uri;
nsIDocument* doc = OwnerDoc();
nsContentUtils::NewURIWithDocumentCharset(
getter_AddRefs(uri), href, doc, doc->GetDocumentURI());
getter_AddRefs(uri), href, doc, doc->GetFallbackBaseURI());

if (!uri) {
aValue = href;
Expand Down
Loading

0 comments on commit 21c9879

Please sign in to comment.