Show
Ignore:
Timestamp:
08/06/08 13:29:36 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35588

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/rendering/RenderVideo.cpp

    r243 r431  
    121121    if (!mediaPlayer) 
    122122        return; 
    123     Document* doc = document(); 
    124     if (doc->inPageCache()) 
    125         return; 
     123    if (mediaElement()->inPageCache()) { 
     124        mediaPlayer->setVisible(false); 
     125        return; 
     126    } 
    126127    int x; 
    127128    int y; 
    …… 
    129130    IntRect videoBounds = videoBox();  
    130131    videoBounds.move(x, y); 
    131     mediaPlayer->setFrameView(doc->view()); 
     132    mediaPlayer->setFrameView(document()->view()); 
    132133    mediaPlayer->setRect(videoBounds); 
    133134    mediaPlayer->setVisible(true);