diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 08:15:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 08:15:24 -0700 |
| commit | fa91a01aee5d4a80ca6c80f722116b850f09996c (patch) | |
| tree | f72740e60d3c3d4f0ab144e88c03d1f134944ce3 /Source/WebCore/rendering/RenderImage.h | |
| parent | 96f37d6d1b390f6690858789706ee6ec25bc1677 (diff) | |
| parent | feebf8e7a79ad68b04a1a948e2b8078d6e5f0048 (diff) | |
| download | external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.zip external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.gz external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.bz2 | |
Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f
* changes:
Merge WebKit at r78450: Update ThirdPartyProject.prop
Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
Merge WebKit at r78450: FrameLoader::url() removed
Merge WebKit at r78450: HTMLParserQuirks removed
Merge WebKit at r78450: TextRun::padding() renamed
Merge WebKit at r78450: Use new FontMetrics
Merge WebKit at r78450: GraphicsContext current path removed
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
Merge WebKit at r78450: IntRect::bottom()/right() renamed
Merge WebKit at r78450: Fix remaining conflicts
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
Merge WebKit at r78450: Fix conflicts in media controls
Merge WebKit at r78450: Fix Makefiles
Merge WebKit at r78450: Initial merge by git.
Diffstat (limited to 'Source/WebCore/rendering/RenderImage.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderImage.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderImage.h b/Source/WebCore/rendering/RenderImage.h index 16ae7ec..e3f743c 100644 --- a/Source/WebCore/rendering/RenderImage.h +++ b/Source/WebCore/rendering/RenderImage.h @@ -3,7 +3,7 @@ * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) - * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -30,6 +30,7 @@ namespace WebCore { +class HTMLAreaElement; class HTMLMapElement; class RenderImage : public RenderReplaced { @@ -48,6 +49,7 @@ public: void updateAltText(); HTMLMapElement* imageMap() const; + void areaElementFocusChanged(HTMLAreaElement*); void highQualityRepaintTimerFired(Timer<RenderImage>*); @@ -57,7 +59,6 @@ protected: virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); virtual void paintIntoRect(GraphicsContext*, const IntRect&); - void paintFocusRing(PaintInfo&, const RenderStyle*); virtual void paint(PaintInfo&, int tx, int ty); bool isLogicalWidthSpecified() const; @@ -91,6 +92,8 @@ private: int calcAspectRatioLogicalWidth() const; int calcAspectRatioLogicalHeight() const; + void paintAreaElementFocusRing(PaintInfo&); + // Text to display as long as the image isn't available. String m_altText; OwnPtr<RenderImageResource> m_imageResource; |