Bug 1021085 - Fix up the Fennec code path as well. r=Cwiiis

This commit is contained in:
Kartikaya Gupta
2014-06-23 08:42:53 -04:00
parent 58083022f8
commit e4121fd891
9 changed files with 44 additions and 76 deletions

View File

@@ -1951,7 +1951,8 @@ AndroidBridge::IsContentDocumentDisplayed()
}
bool
AndroidBridge::ProgressiveUpdateCallback(bool aHasPendingNewThebesContent, const LayerRect& aDisplayPort, float aDisplayResolution, bool aDrawingCritical, ParentLayerRect& aCompositionBounds, CSSToParentLayerScale& aZoom)
AndroidBridge::ProgressiveUpdateCallback(bool aHasPendingNewThebesContent, const LayerRect& aDisplayPort, float aDisplayResolution,
bool aDrawingCritical, ScreenPoint& aScrollOffset, CSSToScreenScale& aZoom)
{
mozilla::widget::android::GeckoLayerClient *client = mLayerClient;
if (!client) {
@@ -1971,10 +1972,8 @@ AndroidBridge::ProgressiveUpdateCallback(bool aHasPendingNewThebesContent, const
ProgressiveUpdateData* progressiveUpdateData = ProgressiveUpdateData::Wrap(progressiveUpdateDataJObj);
aCompositionBounds.x = progressiveUpdateData->getx();
aCompositionBounds.y = progressiveUpdateData->gety();
aCompositionBounds.width = progressiveUpdateData->getwidth();
aCompositionBounds.height = progressiveUpdateData->getheight();
aScrollOffset.x = progressiveUpdateData->getx();
aScrollOffset.y = progressiveUpdateData->gety();
aZoom.scale = progressiveUpdateData->getscale();
bool ret = progressiveUpdateData->getabort();