Commit 23bce99a authored by Emilio Cobos Álvarez's avatar Emilio Cobos Álvarez
Browse files

Bug 1361051: rename mozilla::FrameType to mozilla::LayoutFrameType. r=xidorn 

This avoids conflicts with mozilla::dom::FrameType.

MozReview-Commit-ID: 7aEMbHRaTFk

--HG--
extra : rebase_source : 2d01321f5ce0ec8c0e3f70984674f82678034b3c
parent b9cc4240

accessible/base/nsAccessibilityService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1142,8 +1142,9 @@ nsAccessibilityService::CreateAccessible(nsINode* aNode, 
    // accessible for it.

    if (!newAcc && aContext->IsXULTabpanels() &&

        content->GetParent() == aContext->GetContent()) {

      FrameType frameType = frame->Type();

      if (frameType == FrameType::Box || frameType == FrameType::Scroll) {

      LayoutFrameType frameType = frame->Type();

      if (frameType == LayoutFrameType::Box ||

          frameType == LayoutFrameType::Scroll) {

        newAcc = new XULTabpanelAccessible(content, document);

      }

    }

accessible/generic/Accessible.cpp

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ Accessible::RelativeBounds(nsIFrame** aBoundingFrame) const 
      nsIFrame* canvasFrame = frame->GetParent();

      if (canvasFrame) {

        canvasFrame = nsLayoutUtils::GetClosestFrameOfType(

          canvasFrame, FrameType::HTMLCanvas);

          canvasFrame, LayoutFrameType::HTMLCanvas);

      }



      // make the canvas the bounding frame

dom/base/Element.cpp

+3 −2
Original line number Diff line number Diff line
@@ -648,8 +648,9 @@ Element::GetScrollFrame(nsIFrame **aStyledFrame, bool aFlushLayout) 


  // menu frames implement GetScrollTargetFrame but we don't want

  // to use it here.  Similar for comboboxes.

  FrameType type = frame->Type();

  if (type != FrameType::Menu && type != FrameType::ComboboxControl) {

  LayoutFrameType type = frame->Type();

  if (type != LayoutFrameType::Menu &&

      type != LayoutFrameType::ComboboxControl) {

    nsIScrollableFrame *scrollFrame = frame->GetScrollTargetFrame();

    if (scrollFrame)

      return scrollFrame;

dom/base/nsFocusManager.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2717,7 +2717,7 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindowOuter* aWindow, 
    // remain outside the popup when it is opened.

    if (frame) {

      popupFrame =

        nsLayoutUtils::GetClosestFrameOfType(frame, FrameType::MenuPopup);

        nsLayoutUtils::GetClosestFrameOfType(frame, LayoutFrameType::MenuPopup);

    }



    if (popupFrame && !forDocumentNavigation) {
@@ -2943,8 +2943,8 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindowOuter* aWindow, 
      // navigation would move outside the popup when tabbing outside the

      // iframe.

      if (!forDocumentNavigation) {

        popupFrame =

          nsLayoutUtils::GetClosestFrameOfType(frame, FrameType::MenuPopup);

        popupFrame = nsLayoutUtils::GetClosestFrameOfType(

          frame, LayoutFrameType::MenuPopup);

        if (popupFrame) {

          rootContent = popupFrame->GetContent();

          NS_ASSERTION(rootContent, "Popup frame doesn't have a content node");

dom/base/nsRange.cpp

+3 −2
Original line number Diff line number Diff line
@@ -3513,8 +3513,9 @@ GetRequiredInnerTextLineBreakCount(nsIFrame* aFrame) 
static bool

IsLastCellOfRow(nsIFrame* aFrame)

{

  FrameType type = aFrame->Type();

  if (type != FrameType::TableCell && type != FrameType::BCTableCell) {

  LayoutFrameType type = aFrame->Type();

  if (type != LayoutFrameType::TableCell &&

      type != LayoutFrameType::BCTableCell) {

    return true;

  }

  for (nsIFrame* c = aFrame; c; c = c->GetNextContinuation()) {