Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1088954 - Cleanup print 64-bit integers and remove a stray printf. r=botond

Browse Source
This commit is contained in:
Kartikaya Gupta 2014-10-24 14:45:00 +02:00
parent 99488d1681
commit 48f1a79f43
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ APZCTreeManager::PrepareAPZCForLayer(const LayerMetricsWrapper& aLayer,
apzc = insertResult.first->second;
PrintAPZCInfo(aLayer, apzc);
}
APZCTM_LOG("Found APZC %p for layer %p with identifiers %lld %lld\n", apzc, aLayer.GetLayer(), guid.mLayersId, guid.mScrollId);
APZCTM_LOG("Found APZC %p for layer %p with identifiers %" PRId64 " %" PRId64 "\n", apzc, aLayer.GetLayer(), guid.mLayersId, guid.mScrollId);
// If we haven't encountered a layer already with the same metrics, then we need to
// do the full reuse-or-make-an-APZC algorithm, which is contained inside the block
@ -315,7 +315,7 @@ APZCTreeManager::PrepareAPZCForLayer(const LayerMetricsWrapper& aLayer,
apzc->SetPrevSibling(nullptr);
apzc->SetLastChild(nullptr);
}
APZCTM_LOG("Using APZC %p for layer %p with identifiers %lld %lld\n", apzc, aLayer.GetLayer(), aLayersId, aMetrics.GetScrollId());
APZCTM_LOG("Using APZC %p for layer %p with identifiers %" PRId64 " %" PRId64 "\n", apzc, aLayer.GetLayer(), aLayersId, aMetrics.GetScrollId());
apzc->NotifyLayersUpdated(aMetrics,
aState.mIsFirstPaint && (aLayersId == aState.mOriginatingLayersId));

8
gfx/layers/apz/src/InputQueue.cpp
View File

@ -105,7 +105,7 @@ uint64_t
InputQueue::InjectNewTouchBlock(AsyncPanZoomController* aTarget)
{
TouchBlockState* block = StartNewTouchBlock(aTarget, true);
INPQ_LOG("%p injecting new touch block with id %llu and target %p\n",
INPQ_LOG("%p injecting new touch block with id %" PRIu64 " and target %p\n",
this, block->GetBlockId(), aTarget);
ScheduleContentResponseTimeout(aTarget, block->GetBlockId());
return block->GetBlockId();
@ -162,7 +162,7 @@ void
InputQueue::ContentResponseTimeout(const uint64_t& aInputBlockId) {
AsyncPanZoomController::AssertOnControllerThread();
INPQ_LOG("got a content response timeout; block=%llu\n", aInputBlockId);
INPQ_LOG("got a content response timeout; block=%" PRIu64 "\n", aInputBlockId);
bool success = false;
for (size_t i = 0; i < mTouchBlockQueue.Length(); i++) {
if (mTouchBlockQueue[i]->GetBlockId() == aInputBlockId) {
@ -179,7 +179,7 @@ void
InputQueue::ContentReceivedTouch(uint64_t aInputBlockId, bool aPreventDefault) {
AsyncPanZoomController::AssertOnControllerThread();
INPQ_LOG("got a content response; block=%llu\n", aInputBlockId);
INPQ_LOG("got a content response; block=%" PRIu64 "\n", aInputBlockId);
bool success = false;
for (size_t i = 0; i < mTouchBlockQueue.Length(); i++) {
if (mTouchBlockQueue[i]->GetBlockId() == aInputBlockId) {
@ -196,7 +196,7 @@ void
InputQueue::SetAllowedTouchBehavior(uint64_t aInputBlockId, const nsTArray<TouchBehaviorFlags>& aBehaviors) {
AsyncPanZoomController::AssertOnControllerThread();
INPQ_LOG("got allowed touch behaviours; block=%llu\n", aInputBlockId);
INPQ_LOG("got allowed touch behaviours; block=%" PRIu64 "\n", aInputBlockId);
bool success = false;
for (size_t i = 0; i < mTouchBlockQueue.Length(); i++) {
if (mTouchBlockQueue[i]->GetBlockId() == aInputBlockId) {

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

@ -1521,7 +1521,6 @@ TEST_F(APZCGestureDetectorTester, DoubleTapPreventDefaultBoth) {
int time = 0;
uint64_t blockIds[2];
ApzcDoubleTapAndCheckStatus(apzc, 10, 10, time, &blockIds);
printf_stderr("blockids %llu %llu\n", blockIds[0], blockIds[1]);
// responses to the two touchstarts
apzc->ContentReceivedTouch(blockIds[0], true);