Skip to content

Commit

Permalink
[embedlite] Continue using root frame scroll containers for now.
Browse files Browse the repository at this point in the history
Both android and b2g still use them, only desktop sets the pref to
false. Since with the pref disabled we seem to have multiple problems
when scrolling pages with iframes lets match android/b2g configuration
for now.
  • Loading branch information
tworaz committed Sep 29, 2015
1 parent a250176 commit 2c5e703
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions embedding/embedlite/embedding.js
Expand Up @@ -364,3 +364,6 @@ pref("full-screen-api.content-only", true);
// the window, the window size doesn't change. This pref has no effect when
// running in actual Metro mode, as the widget will already be fullscreen then.
pref("full-screen-api.ignore-widgets", true);

// Match defaults for android and b2g, see: modules/libpref/init/all.js
pref("layout.scroll.root-frame-containers", true);
6 changes: 3 additions & 3 deletions embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp
Expand Up @@ -710,19 +710,19 @@ EmbedLiteViewBaseChild::RecvUpdateFrame(const FrameMetrics& aFrameMetrics)
}

if (mViewResized &&
aFrameMetrics.GetIsRoot() &&
mHelper->mLastRootMetrics.GetPresShellId() == aFrameMetrics.GetPresShellId() &&
mHelper->HandlePossibleViewportChange(mHelper->mInnerSize)) {
mViewResized = false;
}

RelayFrameMetrics(aFrameMetrics);

bool ret = true;
if (sHandleDefaultAZPC.viewport) {
ret = mHelper->RecvUpdateFrame(aFrameMetrics);
return mHelper->RecvUpdateFrame(aFrameMetrics);
}

return ret;
return true;
}

bool
Expand Down

0 comments on commit 2c5e703

Please sign in to comment.