wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out 2 csets for bug 1163832 for emulator crashtest failures. r=me

Browse Source 
CLOSED TREE
This commit is contained in:
Kartikaya Gupta 2015-05-22 07:51:55 -04:00
parent 4bde946bd4
commit 7aa49999e1
25 changed files with 6 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/base/nsDOMWindowUtils.cpp
View File

@ -24,7 +24,6 @@
#include "nsIObjectLoadingContent.h"
#include "nsFrame.h"
#include "mozilla/layers/ShadowLayers.h"
#include "mozilla/layers/APZCCallbackHelper.h"
#include "ClientLayerManager.h"
#include "nsQueryObject.h"
#ifdef MOZ_FMP4
@ -2456,35 +2455,6 @@ nsDOMWindowUtils::SetAsyncScrollOffset(nsIDOMNode* aNode,
return NS_OK;
}
NS_IMETHODIMP
nsDOMWindowUtils::FlushApzRepaints(bool* aOutResult)
{
nsIWidget* widget = GetWidget();
if (!widget) {
*aOutResult = false;
return NS_OK;
}
// If APZ is not enabled, this function is a no-op. After bug 1162064 this
// should be a widget->IsAsyncPanZoomEnabled() check.
if (!gfxPrefs::AsyncPanZoomEnabled()) {
*aOutResult = false;
return NS_OK;
}
LayerManager* manager = widget->GetLayerManager();
if (!manager) {
*aOutResult = false;
return NS_OK;
}
ShadowLayerForwarder* forwarder = manager->AsShadowForwarder();
if (!forwarder || !forwarder->HasShadowManager()) {
*aOutResult = false;
return NS_OK;
}
forwarder->GetShadowManager()->SendFlushApzRepaints();
*aOutResult = true;
return NS_OK;
}
NS_IMETHODIMP
nsDOMWindowUtils::ComputeAnimationDistance(nsIDOMElement* aElement,
const nsAString& aProperty,

12
dom/interfaces/base/nsIDOMWindowUtils.idl
View File

@ -49,7 +49,7 @@ interface nsIJSRAIIHelper;
interface nsIContentPermissionRequest;
interface nsIObserver;
[scriptable, uuid(663e4d9a-c963-4949-b68e-3a6f71c0414f)]
[scriptable, uuid(0ce789cc-3fb6-48b8-a58e-32deefc337b4)]
interface nsIDOMWindowUtils : nsISupports {
/**
@ -1428,16 +1428,6 @@ interface nsIDOMWindowUtils : nsISupports {
*/
void setAsyncScrollOffset(in nsIDOMNode aNode, in int32_t aX, in int32_t aY);
/**
* Do a round-trip to the compositor to ensure any pending APZ repaint requests
* get flushed to the main thread. If the function returns true, the flush was
* triggered and an "apz-repaints-flushed" notification will be dispatched via
* the observer service once the flush is complete. If the function returns
* false, an error occurred or a flush is not needed, and the notification
* will not fire. This is intended to be used by test code only!
*/
bool flushApzRepaints();
/**
* Method for testing StyleAnimationValue::ComputeDistance.
*

1
dom/ipc/PBrowser.ipdl
View File

@ -589,7 +589,6 @@ child:
HandleSingleTap(CSSPoint aPoint, Modifiers aModifiers, ScrollableLayerGuid aGuid);
HandleLongTap(CSSPoint point, Modifiers aModifiers, ScrollableLayerGuid aGuid, uint64_t aInputBlockId);
NotifyAPZStateChange(ViewID aViewId, APZStateChange aChange, int aArg);
NotifyFlushComplete();
/**

7
dom/ipc/TabChild.cpp
View File

@ -2138,13 +2138,6 @@ TabChild::RecvNotifyAPZStateChange(const ViewID& aViewId,
return true;
}
bool
TabChild::RecvNotifyFlushComplete()
{
APZCCallbackHelper::NotifyFlushComplete();
return true;
}
bool
TabChild::RecvActivate()
{

1
dom/ipc/TabChild.h
View File

@ -342,7 +342,6 @@ public:
virtual bool RecvNotifyAPZStateChange(const ViewID& aViewId,
const APZStateChange& aChange,
const int& aArg) override;
virtual bool RecvNotifyFlushComplete() override;
virtual bool RecvActivate() override;
virtual bool RecvDeactivate() override;
virtual bool RecvMouseEvent(const nsString& aType,

8
dom/ipc/TabParent.cpp
View File

@ -1069,14 +1069,6 @@ TabParent::NotifyMouseScrollTestEvent(const ViewID& aScrollId, const nsString& a
}
}
void
TabParent::NotifyFlushComplete()
{
if (!mIsDestroyed) {
unused << SendNotifyFlushComplete();
}
}
void
TabParent::Activate()
{

1
dom/ipc/TabParent.h
View File

@ -274,7 +274,6 @@ public:
APZStateChange aChange,
int aArg);
void NotifyMouseScrollTestEvent(const ViewID& aScrollId, const nsString& aEvent);
void NotifyFlushComplete();
void Activate();
void Deactivate();

5
gfx/layers/apz/public/GeckoContentController.h
View File

@ -158,11 +158,6 @@ public:
virtual void NotifyMozMouseScrollEvent(const FrameMetrics::ViewID& aScrollId, const nsString& aEvent)
{}
/**
* Notify content that the repaint requests have been flushed.
*/
virtual void NotifyFlushComplete() = 0;
GeckoContentController() {}
virtual void Destroy() {}

30
gfx/layers/apz/src/APZCTreeManager.cpp
View File

@ -554,19 +554,6 @@ APZCTreeManager::UpdateHitTestingTree(TreeBuildingState& aState,
return node;
}
void
APZCTreeManager::FlushApzRepaints(uint64_t aLayersId)
{
{ // scope lock
MonitorAutoLock lock(mTreeLock);
FlushPendingRepaintRecursively(mRootNode, aLayersId);
}
const CompositorParent::LayerTreeState* state = CompositorParent::GetIndirectShadowTree(aLayersId);
MOZ_ASSERT(state && state->mController);
NS_DispatchToMainThread(NS_NewRunnableMethod(
state->mController.get(), &GeckoContentController::NotifyFlushComplete));
}
nsEventStatus
APZCTreeManager::ReceiveInputEvent(InputData& aEvent,
ScrollableLayerGuid* aOutTargetGuid,
@ -1084,23 +1071,6 @@ APZCTreeManager::FlushRepaintsRecursively(HitTestingTreeNode* aNode)
}
}
void
APZCTreeManager::FlushPendingRepaintRecursively(HitTestingTreeNode* aNode, uint64_t aLayersId)
{
mTreeLock.AssertCurrentThreadOwns();
for (HitTestingTreeNode* node = aNode; node; node = node->GetPrevSibling()) {
if (node->IsPrimaryHolder()) {
AsyncPanZoomController* apzc = node->GetApzc();
MOZ_ASSERT(apzc);
if (apzc->GetGuid().mLayersId == aLayersId) {
apzc->FlushRepaintIfPending();
}
}
FlushPendingRepaintRecursively(node->GetLastChild(), aLayersId);
}
}
void
APZCTreeManager::CancelAnimation(const ScrollableLayerGuid &aGuid)
{

8
gfx/layers/apz/src/APZCTreeManager.h
View File

@ -130,13 +130,6 @@ public:
uint64_t aOriginatingLayersId,
uint32_t aPaintSequenceNumber);
/**
* Walk the tree of APZCs and flushes the repaint requests for all the APZCS
* corresponding to the given layers id. Finally, sends a flush complete
* notification to the GeckoContentController for the layers id.
*/
void FlushApzRepaints(uint64_t aLayersId);
/**
* General handler for incoming input events. Manipulates the frame metrics
* based on what type of input it is. For example, a PinchGestureEvent will
@ -437,7 +430,6 @@ private:
void UpdateZoomConstraintsRecursively(HitTestingTreeNode* aNode,
const ZoomConstraints& aConstraints);
void FlushRepaintsRecursively(HitTestingTreeNode* aNode);
void FlushPendingRepaintRecursively(HitTestingTreeNode* aNode, uint64_t aLayersId);
already_AddRefed<HitTestingTreeNode> RecycleOrCreateNode(TreeBuildingState& aState,
AsyncPanZoomController* aApzc);

7
gfx/layers/apz/src/AsyncPanZoomController.cpp
View File

@ -2446,13 +2446,6 @@ void AsyncPanZoomController::FlushRepaintForNewInputBlock() {
UpdateSharedCompositorFrameMetrics();
}
void AsyncPanZoomController::FlushRepaintIfPending() {
// Just tell the paint throttler to send the pending repaint request if
// there is one.
ReentrantMonitorAutoEnter lock(mMonitor);
mPaintThrottler.TaskComplete(GetFrameTime());
}
bool AsyncPanZoomController::SnapBackIfOverscrolled() {
ReentrantMonitorAutoEnter lock(mMonitor);
// It's possible that we're already in the middle of an overscroll

5
gfx/layers/apz/src/AsyncPanZoomController.h
View File

@ -183,11 +183,6 @@ public:
*/
void NotifyLayersUpdated(const FrameMetrics& aLayerMetrics, bool aIsFirstPaint);
/**
* Flush any pending repaint request.
*/
void FlushRepaintIfPending();
/**
* The platform implementation must set the compositor parent so that we can
* request composites.

9
gfx/layers/apz/util/APZCCallbackHelper.cpp
View File

@ -710,15 +710,6 @@ APZCCallbackHelper::NotifyMozMouseScrollEvent(const FrameMetrics::ViewID& aScrol
true, true);
}
void
APZCCallbackHelper::NotifyFlushComplete()
{
MOZ_ASSERT(NS_IsMainThread());
nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
MOZ_ASSERT(observerService);
observerService->NotifyObservers(nullptr, "apz-repaints-flushed", nullptr);
}
}
}

3
gfx/layers/apz/util/APZCCallbackHelper.h
View File

@ -161,9 +161,6 @@ public:
/* Notify content of a mouse scroll testing event. */
static void NotifyMozMouseScrollEvent(const FrameMetrics::ViewID& aScrollId, const nsString& aEvent);
/* Notify content that the repaint flush is complete. */
static void NotifyFlushComplete();
};
}

7
gfx/layers/apz/util/ChromeProcessController.cpp
View File

@ -213,10 +213,3 @@ ChromeProcessController::NotifyMozMouseScrollEvent(const FrameMetrics::ViewID& a
APZCCallbackHelper::NotifyMozMouseScrollEvent(aScrollId, aEvent);
}
void
ChromeProcessController::NotifyFlushComplete()
{
MOZ_ASSERT(NS_IsMainThread());
APZCCallbackHelper::NotifyFlushComplete();
}

1
gfx/layers/apz/util/ChromeProcessController.h
View File

@ -56,7 +56,6 @@ public:
int aArg) override;
virtual void NotifyMozMouseScrollEvent(const FrameMetrics::ViewID& aScrollId,
const nsString& aEvent) override;
virtual void NotifyFlushComplete() override;
private:
nsCOMPtr<nsIWidget> mWidget;
nsRefPtr<APZEventState> mAPZEventState;

23
gfx/layers/ipc/CompositorParent.cpp
View File

@ -1326,13 +1326,6 @@ CompositorParent::RecvRequestOverfill()
return true;
}
void
CompositorParent::FlushApzRepaints(const LayerTransactionParent* aLayerTree)
{
MOZ_ASSERT(mApzcTreeManager);
mApzcTreeManager->FlushApzRepaints(aLayerTree->GetId());
}
void
CompositorParent::GetAPZTestData(const LayerTransactionParent* aLayerTree,
APZTestData* aOutData)
@ -1741,7 +1734,6 @@ public:
virtual void LeaveTestMode(LayerTransactionParent* aLayerTree) override;
virtual void ApplyAsyncProperties(LayerTransactionParent* aLayerTree)
override;
virtual void FlushApzRepaints(const LayerTransactionParent* aLayerTree) override;
virtual void GetAPZTestData(const LayerTransactionParent* aLayerTree,
APZTestData* aOutData) override;
virtual void SetConfirmedTargetAPZC(const LayerTransactionParent* aLayerTree,
@ -2154,21 +2146,6 @@ CrossProcessCompositorParent::ApplyAsyncProperties(
state->mParent->ApplyAsyncProperties(aLayerTree);
}
void
CrossProcessCompositorParent::FlushApzRepaints(const LayerTransactionParent* aLayerTree)
{
uint64_t id = aLayerTree->GetId();
MOZ_ASSERT(id != 0);
const CompositorParent::LayerTreeState* state =
CompositorParent::GetIndirectShadowTree(id);
if (!state) {
return;
}
MOZ_ASSERT(state->mParent);
state->mParent->FlushApzRepaints(aLayerTree);
}
void
CrossProcessCompositorParent::GetAPZTestData(const LayerTransactionParent* aLayerTree,
APZTestData* aOutData)

1
gfx/layers/ipc/CompositorParent.h
View File

@ -268,7 +268,6 @@ public:
virtual void LeaveTestMode(LayerTransactionParent* aLayerTree) override;
virtual void ApplyAsyncProperties(LayerTransactionParent* aLayerTree)
override;
virtual void FlushApzRepaints(const LayerTransactionParent* aLayerTree) override;
virtual void GetAPZTestData(const LayerTransactionParent* aLayerTree,
APZTestData* aOutData) override;
virtual void SetConfirmedTargetAPZC(const LayerTransactionParent* aLayerTree,

7
gfx/layers/ipc/LayerTransactionParent.cpp
View File

@ -783,13 +783,6 @@ LayerTransactionParent::RecvSetAsyncScrollOffset(const FrameMetrics::ViewID& aSc
return true;
}
bool
LayerTransactionParent::RecvFlushApzRepaints()
{
mShadowLayersManager->FlushApzRepaints(this);
return true;
}
bool
LayerTransactionParent::RecvGetAPZTestData(APZTestData* aOutData)
{

1
gfx/layers/ipc/LayerTransactionParent.h
View File

@ -133,7 +133,6 @@ protected:
override;
virtual bool RecvSetAsyncScrollOffset(const FrameMetrics::ViewID& aId,
const int32_t& aX, const int32_t& aY) override;
virtual bool RecvFlushApzRepaints() override;
virtual bool RecvGetAPZTestData(APZTestData* aOutData) override;
virtual bool RecvRequestProperty(const nsString& aProperty, float* aValue) override;
virtual bool RecvSetConfirmedTargetAPZC(const uint64_t& aBlockId,

3
gfx/layers/ipc/PLayerTransaction.ipdl
View File

@ -89,9 +89,6 @@ parent:
// Useful for testing rendering of async scrolling.
sync SetAsyncScrollOffset(ViewID id, int32_t x, int32_t y);
// Flush any pending APZ repaints to the main thread.
async FlushApzRepaints();
// Drop any front buffers that might be retained on the compositor
// side.
async ClearCachedResources();

1
gfx/layers/ipc/ShadowLayersManager.h
View File

@ -36,7 +36,6 @@ public:
const TimeStamp& aTime) { return true; }
virtual void LeaveTestMode(LayerTransactionParent* aLayerTree) { }
virtual void ApplyAsyncProperties(LayerTransactionParent* aLayerTree) = 0;
virtual void FlushApzRepaints(const LayerTransactionParent* aLayerTree) = 0;
virtual void GetAPZTestData(const LayerTransactionParent* aLayerTree,
APZTestData* aOutData) { }
virtual void SetConfirmedTargetAPZC(const LayerTransactionParent* aLayerTree,

1
gfx/tests/gtest/TestAsyncPanZoomController.cpp
View File

@ -70,7 +70,6 @@ public:
MOCK_METHOD3(SendAsyncScrollDOMEvent, void(bool aIsRoot, const CSSRect &aContentRect, const CSSSize &aScrollableSize));
MOCK_METHOD2(PostDelayedTask, void(Task* aTask, int aDelayMs));
MOCK_METHOD3(NotifyAPZStateChange, void(const ScrollableLayerGuid& aGuid, APZStateChange aChange, int aArg));
MOCK_METHOD0(NotifyFlushComplete, void());
};
class MockContentControllerDelayed : public MockContentController {

8
layout/ipc/RenderFrameParent.cpp
View File

@ -270,14 +270,6 @@ public:
}
}
void NotifyFlushComplete() override {
MOZ_ASSERT(NS_IsMainThread());
if (mRenderFrame) {
TabParent* browser = TabParent::GetFrom(mRenderFrame->Manager());
browser->NotifyFlushComplete();
}
}
// Methods used by RenderFrameParent to set fields stored here.
void SaveZoomConstraints(const ZoomConstraints& aConstraints)

36
layout/tools/reftest/reftest-content.js
View File

@ -14,7 +14,6 @@ const XHTML_NS = "http://www.w3.org/1999/xhtml";
const DEBUG_CONTRACTID = "@mozilla.org/xpcom/debug;1";
const PRINTSETTINGS_CONTRACTID = "@mozilla.org/gfx/printsettings-service;1";
const ENVIRONMENT_CONTRACTID = "@mozilla.org/process/environment;1";
const NS_OBSERVER_SERVICE_CONTRACTID = "@mozilla.org/observer-service;1";
// "<!--CLEAR-->"
const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
@ -364,13 +363,10 @@ const STATE_WAITING_FOR_REFTEST_WAIT_REMOVAL = 1;
// When spell checking is done on all spell-checked elements, we can move to the
// next state.
const STATE_WAITING_FOR_SPELL_CHECKS = 2;
// When any pending compositor-side repaint requests have been flushed, we can
// move to the next state.
const STATE_WAITING_FOR_APZ_FLUSH = 3;
// When all MozAfterPaint events and all explicit paint waits are flushed, we're
// done and can move to the COMPLETED state.
const STATE_WAITING_TO_FINISH = 4;
const STATE_COMPLETED = 5;
const STATE_WAITING_TO_FINISH = 3;
const STATE_COMPLETED = 4;
function FlushRendering() {
var anyPendingPaintsGeneratedInDescendants = false;
@ -536,31 +532,9 @@ function WaitForTestEnd(contentRootElement, inPrintMode, spellCheckedElements) {
return;
}
state = STATE_WAITING_FOR_APZ_FLUSH;
LogInfo("MakeProgress: STATE_WAITING_FOR_APZ_FLUSH");
gFailureReason = "timed out waiting for APZ flush to complete";
var os = CC[NS_OBSERVER_SERVICE_CONTRACTID].getService(CI.nsIObserverService);
var flushWaiter = function(aSubject, aTopic, aData) {
if (aTopic) LogInfo("MakeProgress: apz-repaints-flushed fired");
os.removeObserver(flushWaiter, "apz-repaints-flushed");
state = STATE_WAITING_TO_FINISH;
MakeProgress();
};
os.addObserver(flushWaiter, "apz-repaints-flushed", false);
if (windowUtils().flushApzRepaints()) {
LogInfo("MakeProgress: done requesting APZ flush");
} else {
LogInfo("MakeProgress: APZ flush not required");
flushWaiter(null, null, null);
}
return;
case STATE_WAITING_FOR_APZ_FLUSH:
LogInfo("MakeProgress: STATE_WAITING_FOR_APZ_FLUSH");
// Nothing to do here; once we get the apz-repaints-flushed event
// we will go to STATE_WAITING_TO_FINISH
state = STATE_WAITING_TO_FINISH;
// Try next state
MakeProgress();
return;
case STATE_WAITING_TO_FINISH: