Attachment #70019 for bug #91516

Attachment #70019: new patch for bug #91516

View | Details | Raw Unified | Return to bug 91516
Collapse All | Expand All

-      Line
+  Link Here
-       Lines 4276-4289
+  Link Here
   rv = CallCreateInstance(kViewCID, &mView);
   if (NS_FAILED(rv))
     return rv;
+  // if aParentWidget has a view, we'll hook our view manager up to its view tree
+  void* clientData;
+  nsIView* containerView = nsnull;
+  if (NS_SUCCEEDED(aParentWidget->GetClientData(clientData))) {
+    nsISupports* data = (nsISupports*)clientData;
+    if (nsnull != data) {
+      data->QueryInterface(NS_GET_IID(nsIView), (void **)&containerView);
+    }
+  }
+  if (nsnull != containerView) {
+    // see if the containerView has already been hooked into a foreign view manager hierarchy
+    // if it has, then we have to hook into the hierarchy too otherwise bad things will happen.
+    nsCOMPtr<nsIViewManager> containerVM;
+    containerView->GetViewManager(*getter_AddRefs(containerVM));
+    nsCOMPtr<nsIViewManager> checkVM;
+    nsIView* pView = containerView;
+    do {
+      pView->GetParent(pView);
+    } while (pView != nsnull
+             && NS_SUCCEEDED(pView->GetViewManager(*getter_AddRefs(checkVM))) && checkVM == containerVM);
+    if (nsnull == pView) {
+      // OK, so the container is not already hooked up into a foreign view manager hierarchy.
+      // That means we can choose not to hook ourselves up.
+      //
+      // If the parent container is a chrome shell, or a frameset, then we won't hook into its view
+      // tree. This will improve performance a little bit (especially given scrolling/painting perf bugs)
+      // but is really just for peace of mind. This check can be removed if we want to support fancy
+      // chrome effects like transparent controls floating over content, transparent Web browsers, and
+      // things like that, and the perf bugs are fixed.
+      nsCOMPtr<nsIDocShellTreeItem> container(do_QueryInterface(mContainer));
+      nsCOMPtr<nsIDocShellTreeItem> parentContainer;
+      PRInt32 itemType;
+      if (nsnull == container
+          || NS_FAILED(container->GetParent(getter_AddRefs(parentContainer)))
+          || nsnull == parentContainer
+          || NS_FAILED(parentContainer->GetItemType(&itemType))
+          || itemType != nsIDocShellTreeItem::typeContent) {
+        containerView = nsnull;
+      } else {
+        nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(parentContainer));
+        if (nsnull == webShell || IsWebShellAFrameSet(webShell)) {
+          containerView = nsnull;
+        }
+      }
+    }
+  }
+  rv = mView->Init(mViewManager, tbounds, containerView);
   if (NS_FAILED(rv))
     return rv;
   rv = mView->CreateWidget(kWidgetCID, nsnull,
                            aParentWidget->GetNativeData(NS_NATIVE_WIDGET),
                            PR_TRUE, PR_FALSE);
   if (rv != NS_OK)
     return rv;

(-)layout/html/base/src/nsContainerFrame.cpp (-2 / +14 lines)

Line

Link Here

Lines 410-416

Link Here

410

    nsCOMPtr<nsIViewManager> vm;

410

    nsCOMPtr<nsIViewManager> vm;

411

    view->GetViewManager(*getter_AddRefs(vm));

411

    view->GetViewManager(*getter_AddRefs(vm));

412

413

    if (containingView != parentView) {

413

    // it's possible for the parentView to be nonnull but containingView to be

414

    // null, when the parent view doesn't belong to this frame tree but to

415

    // the frame tree of some enclosing document. We do nothing in that case,

416

    // but we have to check that containingView is nonnull or we will crash.

417

    if (nsnull != containingView && containingView != parentView) {

414

      // it is possible for parent view not to have a frame attached to it

418

      // it is possible for parent view not to have a frame attached to it

415

      // kind of an anonymous view. This happens with native scrollbars and

419

      // kind of an anonymous view. This happens with native scrollbars and

416

      // the clip view. To fix this we need to go up and parentView chain

420

      // the clip view. To fix this we need to go up and parentView chain

Lines 546-554

Link Here

546

    // See if the view should be hidden or visible

550

    // See if the view should be hidden or visible

547

    PRBool  viewIsVisible = PR_TRUE;

551

    PRBool  viewIsVisible = PR_TRUE;

548

    PRBool  viewHasTransparentContent =

552

    PRBool  viewHasTransparentContent =

549

        !isCanvas &&

550

        (!hasBG ||

553

        (!hasBG ||

551

         (bg->mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT));

554

         (bg->mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT));

555

    if (isCanvas && viewHasTransparentContent) {

556

      nsIView* rootView;

557

      vm->GetRootView(rootView);

558

      nsIView* rootParent;

559

      rootView->GetParent(rootParent);

560

      if (nsnull == rootParent) {

561

        viewHasTransparentContent = PR_FALSE;

562

563

552

564

553

    if (NS_STYLE_VISIBILITY_COLLAPSE == vis->mVisible) {

565

    if (NS_STYLE_VISIBILITY_COLLAPSE == vis->mVisible) {

554

      viewIsVisible = PR_FALSE;

566

      viewIsVisible = PR_FALSE;





  if (NS_FAILED(rv))
    return rv;

  // nsHTMLFrameInnerFrame is going to create a view for its frame
  // right away, in the call to Init().  If we need a view for the
  // OuterFrame but we wait for the normal view creation path in
  // nsCSSFrameConstructor, then we will lose because the InnerFrame's
  // view's parent will already have been set to some outer view
  // (e.g., the canvas) when it really needs to have the OuterFrame's
  // view as its parent. So, create the OuterFrame's view right away
  // if we need it, and the InnerFrame's view will get it as the parent.
  nsIView* view = nsnull;
  GetView(aPresContext, &view);
  if (!view) {
    nsHTMLContainerFrame::CreateViewForFrame(aPresContext,this,mStyleContext,nsnull,PR_TRUE); 
    GetView(aPresContext, &view);
  }

  const nsStyleDisplay* disp;
  aParent->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)disp));
  if (disp->mDisplay == NS_STYLE_DISPLAY_DECK) {
    nsIView* view = nsnull;
    GetView(aPresContext, &view);

    if (!view) {
      nsHTMLContainerFrame::CreateViewForFrame(aPresContext,this,mStyleContext,nsnull,PR_TRUE); 
      GetView(aPresContext, &view);
    }

    nsCOMPtr<nsIWidget> widget;
    view->GetWidget(*getter_AddRefs(widget));


  nsIView* view;
  nsresult rv = nsComponentManager::CreateInstance(kCViewCID, nsnull, NS_GET_IID(nsIView),
                                        (void **)&view);

  if (NS_OK != rv) {
    NS_ASSERTION(0, "Could not create view for nsHTMLFrame");
    return rv;





  float p2t;
  aPresContext->GetTwipsToPixels(&t2p);
  aPresContext->GetPixelsToTwips(&p2t);

   // Add in frame's offset from it it's containing view
  nsIView *containingView = nsnull;
  nsPoint offset;
  rv = aFrame->GetOffsetFromView(aPresContext, offset, &containingView);

  if (NS_SUCCEEDED(rv) && (nsnull != containingView)) {
    aAbsoluteTwipsRect.x += offset.x;
    aAbsoluteTwipsRect.y += offset.y;

    nsPoint viewOffset;
    containingView->GetPosition(&viewOffset.x, &viewOffset.y);

    nsIView * parent;
    containingView->GetParent(parent);

    // if we don't have a parent view then 
    // check to see if we have a widget and adjust our offset for the widget
    if (parent == nsnull) {
      // account for space above and to the left of the containingView origin.
      // the widget is aligned with containingView's bounds, not its origin
      nsRect bounds;
      containingView->GetBounds(bounds);
      aAbsoluteTwipsRect.x += viewOffset.x - bounds.x;
      aAbsoluteTwipsRect.y += viewOffset.y - bounds.y;

      nsIWidget * widget;
      containingView->GetWidget(widget);
      if (nsnull != widget) {

      }
      rv = NS_OK;
    } else {

      while (nsnull != parent) {
        nsPoint po;
        parent->GetPosition(&po.x, &po.y);

        nsIWidget * widget;
        parent->GetWidget(widget);
        if (nsnull != widget) {
          // account for space above and to the left of the containingView origin.
          // the widget is aligned with containingView's bounds, not its origin
          nsRect bounds;
          parent->GetBounds(bounds);
          aAbsoluteTwipsRect.x += po.x - bounds.x;
          aAbsoluteTwipsRect.y += po.y - bounds.y;

          // Add in the absolute offset of the widget.
          nsRect absBounds;
          nsRect lc;

(-)layout/html/forms/src/nsListControlFrame.cpp (+6 lines)

Line

Link Here

Lines 2275-2280

Link Here

2275

2276

  parent = aView;

2276

  parent = aView;

2277

  while (nsnull != parent) {

2277

  while (nsnull != parent) {

2278

    nsCOMPtr<nsIViewManager> vm;

2279

    parent->GetViewManager(*getter_AddRefs(vm));

2280

    if (vm != aManager) {

2281

      break;

2282

2283

2278

    nscoord x, y;

2284

    nscoord x, y;

2279

    parent->GetPosition(&x, &y);

2285

    parent->GetPosition(&x, &y);

2280

    aPoint.x += x;

2286

    aPoint.x += x;





    return;
  }

  // Ensure that we always paint a color for the root (in case there's
  // no background at all or a partly transparent image).
  nsStyleBackground canvasColor(*color);
  if (canvasColor.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT) {
    canvasColor.mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
    aPresContext->GetDefaultBackgroundColor(&canvasColor.mBackgroundColor);
  }

  nsCOMPtr<nsIPresShell> shell;
  aPresContext->GetShell(getter_AddRefs(shell));
  nsCOMPtr<nsIViewManager> vm;
  shell->GetViewManager(getter_AddRefs(vm));

  if (canvasColor.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT) {
    nsIView* rootView;
    vm->GetRootView(rootView);
    nsIView* rootParent;
    rootView->GetParent(rootParent);
    if (nsnull == rootParent) {
      // Ensure that we always paint a color for the root (in case there's
      // no background at all or a partly transparent image).
      canvasColor.mBackgroundFlags &= ~NS_STYLE_BG_COLOR_TRANSPARENT;
      aPresContext->GetDefaultBackgroundColor(&canvasColor.mBackgroundColor);
    }
  }

  vm->SetDefaultBackgroundColor(canvasColor.mBackgroundColor);

  // Since nsHTMLContainerFrame::CreateViewForFrame might have created

(-)view/public/nsIViewManager.h (-1 / +1 lines)

Line	Link Here

Lines 83-89	Link Here

/**

/**

   * Set the root of the view tree. Does not destroy the current root view.

   * Set the root of the view tree. Does not destroy the current root view.

   * One of following must be true:

   * At least one of following must be true:

   * a) the aWidget parameter is an nsIWidget instance to render into

   * a) the aWidget parameter is an nsIWidget instance to render into

   *    that is not owned by any view and aView has no widget, or

   *    that is not owned by any view and aView has no widget, or

   * b) aView has a nsIWidget instance and aWidget is null, or

   * b) aView has a nsIWidget instance and aWidget is null, or

(-)view/src/nsView.cpp (-10 / +15 lines)

Line	Link Here

Lines 103-109	Link Here

103

104

  while (GetFirstChild() != nsnull)

104

  while (GetFirstChild() != nsnull)

105

106

    GetFirstChild()->Destroy();

106

    nsView* child = GetFirstChild();

107

    if (child->GetViewManager() == mViewManager) {

108

      child->Destroy();

109

    } else {

110

      // just unhook it. Someone else will want to destroy this.

111

      RemoveChild(child);

112

107

113

108

114

109

  if (nsnull != mViewManager)

115

  if (nsnull != mViewManager)

Lines 112-135	Link Here

112

118

113

    if (nsnull != rootView)

119

    if (nsnull != rootView)

114

120

121

      // Root views can have parents!

122

      if (nsnull != mParent)

123

124

        mViewManager->RemoveChild(this);

125

126

115

      if (rootView == this)

127

      if (rootView == this)

116

128

117

        // Inform the view manager that the root view has gone away...

129

        // Inform the view manager that the root view has gone away...

118

        mViewManager->SetRootView(nsnull);

130

        mViewManager->SetRootView(nsnull);

119

131

120

      else

132

121

122

        if (nsnull != mParent)

123

124

          mViewManager->RemoveChild(this);

125

126

127

128

    else if (nsnull != mParent)

133

    else if (nsnull != mParent)

129

134

130

      mParent->RemoveChild(this);

135

      mParent->RemoveChild(this);

131

136

132

137

133

    nsView* grabbingView = mViewManager->GetMouseEventGrabber(); //check to see if we are capturing!!!

138

    nsView* grabbingView = mViewManager->GetMouseEventGrabber(); //check to see if we are capturing!!!

134

    if (grabbingView == this)

139

    if (grabbingView == this)

135

140





   XXX TODO XXX

   DeCOMify newly private methods
   Move event handling into nsViewManager
   Make event handling use CreateDisplayList
   Reverse storage order of views so that LAST view in document order is the LAST child
     of its parent view
   Audit users of nsIView::GetPosition and nsIView::GetBounds, then 
     fix nsContainerFrame::SyncFrameViewAfterReflow to size views to contain
     left-or-above content
   Remove nsIClipView stuff and just use the CLIPCHILDREN flag
   Put in support for hierarchy of viewmanagers (handle nsViewManager::SetRootView
     case where aWidget == null and aView has a non-null parent with a different view
     manager)
   Fix opacity model to conform to SVG (requires backbuffer stack)
   Optimize view storage
*/


  // case b) The aView has a nsIWidget instance
  if (nsnull != mRootView) {
    nsView* parent = mRootView->GetParent();
    if (nsnull != parent) {
      parent->InsertChild(mRootView, nsnull);
    }

    mRootView->SetZIndex(PR_FALSE, 0);

    mRootView->GetWidget(mRootWindow);
    if (nsnull != mRootWindow) {
      return NS_OK;

void nsViewManager::RenderViews(nsView *aRootView, nsIRenderingContext& aRC, const nsRect& aRect, PRBool &aResult)
{
  BuildDisplayList(aRootView, aRect, PR_FALSE, PR_FALSE);

  nsRect fakeClipRect;
  PRInt32 index = 0;
  PRBool anyRendered;

    
  OptimizeDisplayList(aRect, finalTransparentRect);

  // ShowDisplayList(mDisplayListCount);

  if (!finalTransparentRect.IsEmpty()) {
    // There are some bits here that aren't going to be completely painted unless we do it now.
    // XXX Which color should we use for these bits?

  // process pending updates in child view.
  nsView* childView = aView->GetFirstChild();
  while (nsnull != childView)  {
    if (childView->GetViewManager() == this) {
      ProcessPendingUpdates(childView);
    }
    childView = childView->GetNextSibling();
  }


    return NS_OK;
  }

  nsView* realRoot = mRootView;
  while (realRoot->GetParent() != nsnull) {
    realRoot = realRoot->GetParent();
  }

  UpdateAllCoveringWidgets(realRoot, view, damageRect, PR_FALSE);
  Composite();
  return NS_OK;
}

  }

  if (!childCovers && (!isBlittable || (hasWidget && !aRepaintOnlyUnblittableViews))) {
    nsViewManager* vm = aView->GetViewManager();
    ++vm->mUpdateCnt;

    if (!vm->mRefreshEnabled) {
      // accumulate this rectangle in the view's dirty region, so we can process it later.
      vm->AddRectToDirtyRegion(aView, bounds);
      vm->mHasPendingInvalidates = PR_TRUE;
    } else {
      nsView* widgetView = GetWidgetView(aView);
      if (widgetView != nsnull) {
        ViewToWidget(aView, widgetView, bounds);

        nsCOMPtr<nsIWidget> widget;
        vm->GetWidgetForView(widgetView, getter_AddRefs(widget));
        widget->Invalidate(bounds, PR_FALSE);
      }
    }

    damagedRect.x = origin.x;
    damagedRect.y = origin.y;

    nsView* realRoot = mRootView;
    while (realRoot->GetParent() != nsnull) {
      realRoot = realRoot->GetParent();
    }

    UpdateAllCoveringWidgets(realRoot, nsnull, damagedRect, PR_FALSE);
  }

  ++mUpdateCnt;

  // update all children as well.
  nsView* childView = aView->GetFirstChild();
  while (nsnull != childView)  {
    if (childView->GetViewManager() == this) {
      UpdateViews(childView, aUpdateFlags);
    }
    childView = childView->GetNextSibling();
  }
}

            nsView *parent;

            parent = baseView;
            while (mRootView != parent) {
              parent->ConvertToParentCoords(&offset.x, &offset.y);
              parent = parent->GetParent();
            }

            //Subtract back offset from root of view
            parent = view;
            while (mRootView != parent) {
              parent->ConvertFromParentCoords(&offset.x, &offset.y);
              parent = parent->GetParent();
            }

  }

  nsAutoVoidArray targetViews;
  nsAutoVoidArray heldRefCountsToOtherVMs;

  // In fact, we only need to take this expensive path when the event is a mouse event ... riiiight?
  BuildEventTargetList(targetViews, aView, aEvent, aCaptured);

  nsEventStatus status = nsEventStatus_eIgnore;

  // get a death grip on any view managers' view observers (other than this one)
  PRInt32 i;
  for (i = 0; i < targetViews.Count(); i++) {
    DisplayListElement2* element = NS_STATIC_CAST(DisplayListElement2*, targetViews.ElementAt(i));
    nsView* v = element->mView;
    nsViewManager* vVM = v->GetViewManager();
    if (vVM != this) {
      nsIViewObserver* vobs = nsnull;
      vVM->GetViewObserver(vobs);
      if (nsnull != vobs) {
        heldRefCountsToOtherVMs.AppendElement(vobs);
      }
    }
  }

  for (i = 0; i < targetViews.Count(); i++) {
    DisplayListElement2* element = NS_STATIC_CAST(DisplayListElement2*, targetViews.ElementAt(i));
    nsView* v = element->mView;

    if (nsnull != v->GetClientData()) {
      PRBool handled = PR_FALSE;
      nsRect r;
      v->GetDimensions(r);

      aEvent->point.x -= x;
      aEvent->point.y -= y;

      nsViewManager* vVM = v->GetViewManager();
      if (vVM == this) {
        if (nsnull != obs) {
          obs->HandleEvent(v, aEvent, &status, i == targetViews.Count() - 1, handled);
        }
      } else {
        nsIViewObserver* vobs = nsnull;
        vVM->GetViewObserver(vobs);
        if (nsnull != vobs) {
          vobs->HandleEvent(v, aEvent, &status, i == targetViews.Count() - 1, handled);
        }
      }

      aEvent->point.x += x;
      aEvent->point.y += y;

    delete element;
  }

  // release death grips
  for (i = 0; i < heldRefCountsToOtherVMs.Count(); i++) {
    nsIViewObserver* element = NS_STATIC_CAST(nsIViewObserver*, heldRefCountsToOtherVMs.ElementAt(i));
    NS_RELEASE(element);
  }  

  return status;
}



  NS_ASSERTION((view != nsnull), "no view");

  // don't allow the root view's z-index to be changed. It should always be zero.
  // This could be removed and replaced with a style rule, or just removed altogether, with interesting consequences
  if (aView == mRootView) {
    return rv;
  }

  if (aAutoZIndex) {
    aZIndex = 0;
  }

  mRootScrollable = aScrollable;

  //XXX this needs to go away when layout start setting this bit on it's own. MMP
  // We don't set ALWAYS_BLIT if this isn't the root of the view manager tree,
  // because non-roots may not, in fact, always be able to blit
  if (mRootScrollable && mRootView->GetParent() == nsnull)
    mRootScrollable->SetScrollProperties(NS_SCROLL_PROPERTY_ALWAYS_BLIT);

  return NS_OK;


    nest[nestcnt << 1] = 0;

    printf("%snsIView@%p{%d,%d,%d,%d @ %d,%d; p=%p,m=%p z=%d} [x=%d, y=%d, w=%d, h=%d, absX=%d, absY=%d]\n",
           nest, (void*)view,
           dim.x, dim.y, dim.width, dim.height,
           vx, vy,
           (void*)parent, (void*)view->GetViewManager(), zindex,
           rect.x, rect.y, rect.width, rect.height,
           element->mAbsX, element->mAbsY);


}


nsView* nsViewManager::GetWidgetView(nsView *aView)
{
  while (aView != nsnull) {
    PRBool hasWidget;

  nsIScrollableView* scrollingView;
  GetRootScrollableView(&scrollingView);

  if (scrollingView) {   
    // Determine the visible rect in the scrolled view's coordinate space.
    // The size of the visible area is the clip view size
    const nsIView*  clipViewI;


  nsView *child = aView->GetFirstChild();
  while (nsnull != child) {
    if (child->GetViewManager() == this) {
      rv = ProcessWidgetChanges(child);
      if (NS_FAILED(rv))
        return rv;
    }

    child = child->GetNextSibling();
  }

(-)view/src/nsViewManager.h (-1 / +1 lines)

Line	Link Here

Lines 309-315	Link Here

309

   * Returns the nearest parent view with an attached widget. Can be the

309

   * Returns the nearest parent view with an attached widget. Can be the

310

   * same view as passed-in.

310

   * same view as passed-in.

311

*/

311

*/

312

  nsView* GetWidgetView(nsView *aView) const;

312

  static nsView* GetWidgetView(nsView *aView);

313

314

/**

314

/**

315

   * Transforms a rectangle from specified view's coordinate system to

315

   * Transforms a rectangle from specified view's coordinate system to

Return to bug 91516