Commit 4ff29d14 authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

merge mozilla-inbound to mozilla-central. r=merge a=merge 

MozReview-Commit-ID: GSDYk9wLOAM

--HG--
rename : browser/base/content/test/general/browser_bug561636.js => browser/modules/test/browser/formValidation/browser_form_validation.js
rename : browser/base/content/test/general/browser_bug595507.js => browser/modules/test/browser/formValidation/browser_validation_iframe.js
rename : browser/modules/test/browser/browser_bug1319078.js => browser/modules/test/browser/formValidation/browser_validation_invisible.js
parents e333168b c74d67c7

accessible/base/TextAttrs.h

+3 −1
Original line number Diff line number Diff line
@@ -399,7 +399,9 @@ protected: 
  class TextDecorValue

  {

  public:

    TextDecorValue() { }

    TextDecorValue() :

      mColor{0}, mLine{NS_STYLE_TEXT_DECORATION_LINE_NONE},

      mStyle{NS_STYLE_TEXT_DECORATION_STYLE_NONE} { }

    explicit TextDecorValue(nsIFrame* aFrame);



    nscolor Color() const { return mColor; }

accessible/base/TextRange.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public: 
  TextRange(HyperTextAccessible* aRoot,

            HyperTextAccessible* aStartContainer, int32_t aStartOffset,

            HyperTextAccessible* aEndContainer, int32_t aEndOffset);

  TextRange() {}

  TextRange() : mStartOffset{0}, mEndOffset{0} {}

  TextRange(TextRange&& aRange) :

    mRoot(mozilla::Move(aRange.mRoot)),

    mStartContainer(mozilla::Move(aRange.mStartContainer)),

accessible/base/nsAccessiblePivot.cpp

+3 −2
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ using namespace mozilla::a11y; 
class RuleCache

{

public:

  explicit RuleCache(nsIAccessibleTraversalRule* aRule) : mRule(aRule),

                                                          mAcceptRoles(nullptr) { }

  explicit RuleCache(nsIAccessibleTraversalRule* aRule) :

    mRule(aRule), mAcceptRoles(nullptr),

    mAcceptRolesLength{0}, mPreFilter{0} { }

  ~RuleCache () {

    if (mAcceptRoles)

      free(mAcceptRoles);

accessible/generic/DocAccessible.cpp

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ DocAccessible:: 
  mDocumentNode(aDocument),

  mScrollPositionChangedTicks(0),

  mLoadState(eTreeConstructionPending), mDocFlags(0), mLoadEventType(0),

  mVirtualCursor(nullptr),

  mARIAAttrOldValue{nullptr}, mVirtualCursor(nullptr),

  mPresShell(aPresShell), mIPCDoc(nullptr)

{

  mGenericTypes |= eDocument;

browser/installer/windows/nsis/installer.nsi

+20 −20
Original line number Diff line number Diff line
@@ -463,9 +463,9 @@ Section "-Application" APP_IDX 
  ; Always add the application's shortcuts to the shortcuts log ini file. The

  ; DeleteShortcuts macro will do the right thing on uninstall if the

  ; shortcuts don't exist.

  ${LogStartMenuShortcut} "${BrandFullName}.lnk"

  ${LogQuickLaunchShortcut} "${BrandFullName}.lnk"

  ${LogDesktopShortcut} "${BrandFullName}.lnk"

  ${LogStartMenuShortcut} "${BrandShortName}.lnk"

  ${LogQuickLaunchShortcut} "${BrandShortName}.lnk"

  ${LogDesktopShortcut} "${BrandShortName}.lnk"



  ; Best effort to update the Win7 taskbar and start menu shortcut app model

  ; id's. The possible contexts are current user / system and the user that
@@ -495,17 +495,17 @@ Section "-Application" APP_IDX 
  ; since this will either add it for the user if unelevated or All Users if

  ; elevated.

  ${If} $AddStartMenuSC == 1

    CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \

    CreateShortCut "$SMPROGRAMS\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandShortName}.lnk" \

                                           "$INSTDIR"

      ${If} ${AtLeastWin7}

      ${AndIf} "$AppUserModelID" != ""

        ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true"

        ApplicationID::Set "$SMPROGRAMS\${BrandShortName}.lnk" "$AppUserModelID" "true"

      ${EndIf}

      ${LogMsg} "Added Shortcut: $SMPROGRAMS\${BrandFullName}.lnk"

      ${LogMsg} "Added Shortcut: $SMPROGRAMS\${BrandShortName}.lnk"

    ${Else}

      ${LogMsg} "** ERROR Adding Shortcut: $SMPROGRAMS\${BrandFullName}.lnk"

      ${LogMsg} "** ERROR Adding Shortcut: $SMPROGRAMS\${BrandShortName}.lnk"

    ${EndIf}

  ${EndIf}
@@ -525,17 +525,17 @@ Section "-Application" APP_IDX 
  ${EndIf}



  ${If} $AddDesktopSC == 1

    CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" \

    CreateShortCut "$DESKTOP\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$DESKTOP\${BrandShortName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandShortName}.lnk" \

                                             "$INSTDIR"

      ${If} ${AtLeastWin7}

      ${AndIf} "$AppUserModelID" != ""

        ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID"  "true"

        ApplicationID::Set "$DESKTOP\${BrandShortName}.lnk" "$AppUserModelID"  "true"

      ${EndIf}

      ${LogMsg} "Added Shortcut: $DESKTOP\${BrandFullName}.lnk"

      ${LogMsg} "Added Shortcut: $DESKTOP\${BrandShortName}.lnk"

    ${Else}

      ${LogMsg} "** ERROR Adding Shortcut: $DESKTOP\${BrandFullName}.lnk"

      ${LogMsg} "** ERROR Adding Shortcut: $DESKTOP\${BrandShortName}.lnk"

    ${EndIf}

  ${EndIf}
@@ -548,12 +548,12 @@ Section "-Application" APP_IDX 
      ${GetOptions} "$0" "/UAC:" $0

      ${If} ${Errors}

        Call AddQuickLaunchShortcut

        ${LogMsg} "Added Shortcut: $QUICKLAUNCH\${BrandFullName}.lnk"

        ${LogMsg} "Added Shortcut: $QUICKLAUNCH\${BrandShortName}.lnk"

      ${Else}

        ; It is not possible to add a log entry from the unelevated process so

        ; add the log entry without the path since there is no simple way to

        ; know the correct full path.

        ${LogMsg} "Added Quick Launch Shortcut: ${BrandFullName}.lnk"

        ${LogMsg} "Added Quick Launch Shortcut: ${BrandShortName}.lnk"

        GetFunctionAddress $0 AddQuickLaunchShortcut

        UAC::ExecCodeSegment $0

      ${EndIf}
@@ -744,9 +744,9 @@ FunctionEnd 
# Helper Functions



Function AddQuickLaunchShortcut

  CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

  ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"

    ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandFullName}.lnk" \

  CreateShortCut "$QUICKLAUNCH\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

  ${If} ${FileExists} "$QUICKLAUNCH\${BrandShortName}.lnk"

    ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandShortName}.lnk" \

                                           "$INSTDIR"

  ${EndIf}

FunctionEnd