← Back to branch summary

~ubuntu-branches/debian/sid/tk-html3/sid

« back to all changes in this revision

Viewing changes to src/htmltcl.c

  • Committer: Package Import Robot
  • Author(s): Ole Streicher
  • Date: 2014-04-14 14:31:32 UTC
  • Revision ID: package-import@ubuntu.com-20140414143132-dmq7eyq9m0ndtdmo
Tags: 3.0~fossil20110109-3
* Push to newest standards (3.9.5) and dh (9) and solve lintian warnings
* Remove some asserts to make it more stable [Stefan Ziegler]

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/htmltcl.c
498
498
        HtmlNodeComputedValues(pTree->pRoot) ||
499
499
        pTree->cb.pRestyle==pTree->pRoot
500
500
    );
 
501
 
 
502
    while( pTree->cb.inProgress ) {
 
503
        usleep( 2000 );
 
504
    }
 
505
 
501
506
    HtmlCheckRestylePoint(pTree);
502
507
 
503
508
    HtmlLog(pTree, "CALLBACK", 
668
673
        (!pTree->cb.inProgress) 
669
674
    ) {
670
675
        ClientData clientData = (ClientData)pTree;
671
 
        assert(!pTree->cb.isForce);
672
 
        pTree->cb.isForce++;
673
 
        callbackHandler(clientData);
674
 
        pTree->cb.isForce--;
675
 
        assert(pTree->cb.isForce >= 0);
676
 
        if (pTree->cb.flags == 0) {
677
 
            Tcl_CancelIdleCall(callbackHandler, clientData);
678
 
        }
 
676
        if( !pTree->cb.isForce )
 
677
        {
 
678
            pTree->cb.isForce++;
 
679
            callbackHandler(clientData);
 
680
            pTree->cb.isForce--;
 
681
            assert(pTree->cb.isForce >= 0);
 
682
 
 
683
            if (pTree->cb.flags == 0) {
 
684
                Tcl_CancelIdleCall(callbackHandler, clientData);
 
685
                }
 
686
        };
679
687
    }
680
688
}
681
689
 
2430
2438
    int objc;                          /* Number of arguments. */
2431
2439
    Tcl_Obj *CONST objv[];             /* Argument strings. */
2432
2440
{
2433
 
    HtmlInitTree((HtmlTree *)clientData);
 
2441
    HtmlInitTreeNodeCmd((HtmlTree *)clientData);
2434
2442
    return HtmlLayoutNode(clientData, interp, objc, objv);
2435
2443
}
2436
2444
static int