Commit c941c393 authored by Razvan Maries's avatar Razvan Maries
Browse files

Merge mozilla-central to mozilla-inbound. a=merge on a CLOSED TREE

parents bba2f124 299b5e79

.hgtags

+1 −0
Original line number Diff line number Diff line
@@ -156,3 +156,4 @@ c44fbdd5173548c9035256dda8fd3512f67118a8 FIREFOX_NIGHTLY_64_END 
58a0412e15574f063cd380517a0369bfb48b22e0 PRE_TREEWIDE_CLANG_FORMAT

9ad82455dcee2bc1d438e46016b8db00e88758a8 FIREFOX_BETA_65_BASE

3386ff76878d83496bb822d09115c77472808b53 FIREFOX_NIGHTLY_65_END

254bd88c107271f3d1c2ca9969acc0ed507f0a8d FIREFOX_BETA_66_BASE

accessible/windows/msaa/AccessibleWrap.cpp

+12 −4
Original line number Diff line number Diff line
@@ -740,17 +740,25 @@ AccessibleWrap::get_accSelection(VARIANT __RPC_FAR* pvarChildren) { 


  if (IsDefunct()) return CO_E_OBJNOTCONNECTED;



  if (IsSelect()) {

  if (!IsSelect()) {

    return S_OK;

  }



  AutoTArray<Accessible*, 10> selectedItems;

  SelectedItems(&selectedItems);



    // 1) Create and initialize the enumeration

  uint32_t count = selectedItems.Length();

  if (count == 1) {

    pvarChildren->vt = VT_DISPATCH;

    pvarChildren->pdispVal = NativeAccessible(selectedItems[0]);

  } else if (count > 1) {

    RefPtr<AccessibleEnumerator> pEnum =

        new AccessibleEnumerator(selectedItems);

    pvarChildren->vt =

        VT_UNKNOWN;  // this must be VT_UNKNOWN for an IEnumVARIANT

    NS_ADDREF(pvarChildren->punkVal = pEnum);

  }

  // If count == 0, vt is already VT_EMPTY, so there's nothing else to do.



  return S_OK;

}

browser/base/content/browser-contentblocking.js

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ var ContentBlocking = { 
    // they see in the report breakage dialog.

    this.reportURI = gBrowser.currentURI;

    let urlWithoutQuery = this.reportURI.asciiSpec.replace("?" + this.reportURI.query, "");

    this.reportBreakageURL.textContent = urlWithoutQuery;

    this.reportBreakageURL.value = urlWithoutQuery;

    this.identityPopupMultiView.showSubView("identity-popup-breakageReportView");

  },

browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ add_task(async function testReportBreakage() { 
    await viewShown;



    let submitButton = document.getElementById("identity-popup-breakageReportView-submit");

    let reportURL = document.getElementById("identity-popup-breakageReportView-collection-url").textContent;

    let reportURL = document.getElementById("identity-popup-breakageReportView-collection-url").value;



    is(reportURL, TRACKING_PAGE, "Shows the correct URL in the report UI.");

browser/components/controlcenter/content/panel.inc.xul

+3 −3
Original line number Diff line number Diff line
@@ -280,11 +280,11 @@ 
        </vbox>

        <vbox id="identity-popup-breakageReportView-body" class="panel-view-body-unscrollable">

          <vbox class="identity-popup-breakageReportView-collection-section">

            <label class="identity-popup-breakageReportView-collection-label">&contentBlocking.breakageReportView.collection.url.label;</label>

            <label id="identity-popup-breakageReportView-collection-url"/>

            <label>&contentBlocking.breakageReportView.collection.url.label;</label>

            <textbox readonly="true" id="identity-popup-breakageReportView-collection-url"/>

          </vbox>

          <vbox class="identity-popup-breakageReportView-collection-section">

            <label class="identity-popup-breakageReportView-collection-label">&contentBlocking.breakageReportView.collection.comments.label;</label>

            <label>&contentBlocking.breakageReportView.collection.comments.label;</label>

            <textbox multiline="true" id="identity-popup-breakageReportView-collection-comments"/>

          </vbox>

        </vbox>