Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Folowup change for js jit hardfp problem, make zoom constraints work …
…correctly, full sync of sync-tab branch
  • Loading branch information
tmeshkova committed Feb 4, 2014
1 parent 7a63920 commit 17bbace
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
23 changes: 12 additions & 11 deletions embedding/embedlite/utils/TabChildHelper.cpp
Expand Up @@ -775,24 +775,25 @@ TabChildHelper::HandlePossibleViewportChange()
if (sDisableViewportHandler) {
return false;
}
nsCOMPtr<nsIDOMDocument> domDoc;
mView->mWebNavigation->GetDocument(getter_AddRefs(domDoc));
nsCOMPtr<nsIDocument> document(do_QueryInterface(domDoc));

nsCOMPtr<nsIDocument> document(GetDocument());
nsCOMPtr<nsIDOMWindowUtils> utils(GetDOMWindowUtils());

nsViewportInfo viewportInfo = nsContentUtils::GetViewportInfo(document, mInnerSize);
uint32_t presShellId = 0;

nsIContent* content = document->GetDocumentElement();
ViewID viewId = 0;
if (APZCCallbackHelper::GetScrollIdentifiers(document->GetDocumentElement(),
&presShellId, &viewId)) {
ZoomConstraints constraints(viewportInfo.IsZoomAllowed(),
viewportInfo.GetMinZoom(),
viewportInfo.GetMaxZoom());
mView->SendUpdateZoomConstraints(presShellId, viewId, /* isRoot = */ true, constraints);
if (content) {
uint32_t presShellId = 0;
viewId = nsLayoutUtils::FindOrCreateIDFor(content);
if (utils && (utils->GetPresShellId(&presShellId) == NS_OK)) {
ZoomConstraints constraints(viewportInfo.IsZoomAllowed(),
viewportInfo.GetMinZoom(),
viewportInfo.GetMaxZoom());
mView->SendUpdateZoomConstraints(presShellId, viewId, /* isRoot = */ true, constraints);
}
}


float screenW = mInnerSize.width;
float screenH = mInnerSize.height;
CSSSize viewport(viewportInfo.GetSize());
Expand Down
6 changes: 6 additions & 0 deletions js/src/jit/arm/MacroAssembler-arm.cpp
Expand Up @@ -3529,6 +3529,12 @@ MacroAssemblerARMCompat::passABIArg(const MoveOperand &from, MoveOp::Type type)
FloatRegister fr;
if (GetFloatArgReg(usedIntSlots_, usedFloatSlots_, &fr)) {
if (from.isFloatReg() && from.floatReg() == fr) {
usedFloatSlots_++;
if (type == MoveOp::FLOAT32)
passedArgTypes_ = (passedArgTypes_ << ArgType_Shift) | ArgType_Float32;
else
passedArgTypes_ = (passedArgTypes_ << ArgType_Shift) | ArgType_Double;
break;
// Nothing to do; the value is in the right register already
return;
}
Expand Down

0 comments on commit 17bbace

Please sign in to comment.