Source/core/rendering/RenderImage.cpp - Issue 349013002: Include Page.h in fewer headers

Side by Side Diff: Source/core/rendering/RenderImage.cpp

Issue 349013002: Include Page.h in fewer headers (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/inspector/InspectorInstrumentation.cpp ('k') | Source/core/rendering/compositing/CompositedLayerMapping.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 1999 Antti Koivisto (koivisto@kde.org)	3 * (C) 1999 Antti Koivisto (koivisto@kde.org)

4 * (C) 2000 Dirk Mueller (mueller@kde.org)	4 * (C) 2000 Dirk Mueller (mueller@kde.org)

5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)	5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)

6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com)	6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com)

7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.	7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.

8 * Copyright (C) 2010 Google Inc. All rights reserved.	8 * Copyright (C) 2010 Google Inc. All rights reserved.

9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.	9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.

10 *	10 *

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 #include "core/rendering/PaintInfo.h"	44 #include "core/rendering/PaintInfo.h"

45 #include "core/rendering/RenderView.h"	45 #include "core/rendering/RenderView.h"

46 #include "core/svg/graphics/SVGImage.h"	46 #include "core/svg/graphics/SVGImage.h"

47 #include "platform/fonts/Font.h"	47 #include "platform/fonts/Font.h"

48 #include "platform/fonts/FontCache.h"	48 #include "platform/fonts/FontCache.h"

49 #include "platform/graphics/GraphicsContext.h"	49 #include "platform/graphics/GraphicsContext.h"

50 #include "platform/graphics/GraphicsContextStateSaver.h"	50 #include "platform/graphics/GraphicsContextStateSaver.h"

51	51

52 namespace WebCore {	52 namespace WebCore {

53	53

	54 float deviceScaleFactor(LocalFrame*);

	55

54 using namespace HTMLNames;	56 using namespace HTMLNames;

55	57

56 RenderImage::RenderImage(Element* element)	58 RenderImage::RenderImage(Element* element)

57 : RenderReplaced(element, IntSize())	59 : RenderReplaced(element, IntSize())

58 , m_didIncrementVisuallyNonEmptyPixelCount(false)	60 , m_didIncrementVisuallyNonEmptyPixelCount(false)

59 , m_isGeneratedContent(false)	61 , m_isGeneratedContent(false)

60 , m_imageDevicePixelRatio(1.0f)	62 , m_imageDevicePixelRatio(1.0f)

61 {	63 {

62 updateAltText();	64 updateAltText();

63 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRenderObj ect(this);	65 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRenderObj ect(this);

(...skipping 556 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
620 return 0;	622 return 0;

621	623

622 ImageResource* cachedImage = m_imageResource->cachedImage();	624 ImageResource* cachedImage = m_imageResource->cachedImage();

623 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))	625 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( ))

624 return toSVGImage(cachedImage->image())->embeddedContentBox();	626 return toSVGImage(cachedImage->image())->embeddedContentBox();

625	627

626 return 0;	628 return 0;

627 }	629 }

628	630

629 } // namespace WebCore	631 } // namespace WebCore

OLD	NEW