← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/loader/ImageDocument.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-02-04 19:30:57 UTC
  • mfrom: (1.2.8 upstream) (4.3.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100204193057-d3018lm1fipb0703
* New upstream release
* debian/copyright:
- Updated with changes since 1.1.19.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/loader/ImageDocument.cpp
33
33
#include "EventNames.h"
34
34
#include "Frame.h"
35
35
#include "FrameLoader.h"
 
36
#include "FrameLoaderClient.h"
36
37
#include "FrameView.h"
37
38
#include "HTMLImageElement.h"
38
39
#include "HTMLNames.h"
115
116
 
116
117
bool ImageTokenizer::writeRawData(const char*, int)
117
118
{
 
119
    Frame* frame = m_doc->frame();
 
120
    Settings* settings = frame->settings();
 
121
    if (!frame->loader()->client()->allowImages(!settings || settings->areImagesEnabled()))
 
122
        return false;
 
123
    
118
124
    CachedImage* cachedImage = m_doc->cachedImage();
119
 
    cachedImage->data(m_doc->frame()->loader()->documentLoader()->mainResourceData(), false);
 
125
    cachedImage->data(frame->loader()->documentLoader()->mainResourceData(), false);
120
126
 
121
127
    m_doc->imageChanged();
122
128