corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1264784 - part 1 - call nsIFrame::{GetScreenRect,GetView} instead of their *External counterparts; r=dholbert

Browse Source 
The latter functions just call through to the former functions, and
we're going to remove the latter functions in a separate, subsequent
patch.
This commit is contained in:
Nathan Froyd
2016-04-15 19:37:35 -04:00
parent 6d1d4b5745
commit 3aa2743f4f
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/base/nsCoreUtils.cpp
View File

@@ -113,7 +113,7 @@ nsCoreUtils::DispatchClickEvent(nsITreeBoxObject *aTreeBoxObj,
nsPoint offset; nsPoint offset;
nsIWidget *rootWidget = nsIWidget *rootWidget =
rootFrame->GetViewExternal()->GetNearestWidget(&offset); rootFrame->GetView()->GetNearestWidget(&offset);
RefPtr<nsPresContext> presContext = presShell->GetPresContext(); RefPtr<nsPresContext> presContext = presShell->GetPresContext();

2
accessible/generic/Accessible.cpp
View File

@@ -1616,7 +1616,7 @@ Accessible::RelationByType(RelationType aType)
// above it). // above it).
nsIFrame *frame = GetFrame(); nsIFrame *frame = GetFrame();
if (frame) { if (frame) {
nsView *view = frame->GetViewExternal(); nsView *view = frame->GetView();
if (view) { if (view) {
nsIScrollableFrame *scrollFrame = do_QueryFrame(frame); nsIScrollableFrame *scrollFrame = do_QueryFrame(frame);
if (scrollFrame || view->GetWidget() || !frame->GetParent()) if (scrollFrame || view->GetWidget() || !frame->GetParent())

2
accessible/mac/RootAccessibleWrap.mm
View File

@@ -40,7 +40,7 @@ RootAccessibleWrap::GetNativeWidget(void** aOutView)
{ {
nsIFrame *frame = GetFrame(); nsIFrame *frame = GetFrame();
if (frame) { if (frame) {
nsView *view = frame->GetViewExternal(); nsView *view = frame->GetView();
if (view) { if (view) {
nsIWidget *widget = view->GetWidget(); nsIWidget *widget = view->GetWidget();
if (widget) { if (widget) {

2
dom/events/WheelHandlingHelper.cpp
View File

@@ -235,7 +235,7 @@ WheelTransaction::OnEvent(WidgetEvent* aEvent)
// If the cursor is moving to be outside the frame, // If the cursor is moving to be outside the frame,
// terminate the scrollwheel transaction. // terminate the scrollwheel transaction.
nsIntPoint pt = GetScreenPoint(mouseEvent); nsIntPoint pt = GetScreenPoint(mouseEvent);
nsIntRect r = sTargetFrame->GetScreenRectExternal(); nsIntRect r = sTargetFrame->GetScreenRect();
if (!r.Contains(pt)) { if (!r.Contains(pt)) {
EndTransaction(); EndTransaction();
return; return;

4
widget/nsBaseDragService.cpp
View File

@@ -563,7 +563,7 @@ nsBaseDragService::DrawDrag(nsIDOMNode* aDOMNode,
dragRect = ToAppUnits(dragRect, nsPresContext::AppUnitsPerCSSPixel()). dragRect = ToAppUnits(dragRect, nsPresContext::AppUnitsPerCSSPixel()).
ToOutsidePixels((*aPresContext)->AppUnitsPerDevPixel()); ToOutsidePixels((*aPresContext)->AppUnitsPerDevPixel());
nsIntRect screenRect = rootFrame->GetScreenRectExternal(); nsIntRect screenRect = rootFrame->GetScreenRect();
aScreenDragRect->SetRect(screenRect.x + dragRect.x, screenRect.y + dragRect.y, aScreenDragRect->SetRect(screenRect.x + dragRect.x, screenRect.y + dragRect.y,
dragRect.width, dragRect.height); dragRect.width, dragRect.height);
} }
@@ -574,7 +574,7 @@ nsBaseDragService::DrawDrag(nsIDOMNode* aDOMNode,
nsCOMPtr<nsIContent> content = do_QueryInterface(dragNode); nsCOMPtr<nsIContent> content = do_QueryInterface(dragNode);
nsIFrame* frame = content->GetPrimaryFrame(); nsIFrame* frame = content->GetPrimaryFrame();
if (frame) { if (frame) {
nsIntRect screenRect = frame->GetScreenRectExternal(); nsIntRect screenRect = frame->GetScreenRect();
aScreenDragRect->SetRect(screenRect.x, screenRect.y, aScreenDragRect->SetRect(screenRect.x, screenRect.y,
screenRect.width, screenRect.height); screenRect.width, screenRect.height);
} }