summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/ShadowElement.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-06 21:36:31 +0000
committerBen Murdoch <benm@google.com>2011-01-07 10:36:05 +0000
commit4a156157940f51b91eadd76f6c86f862ec0a1da0 (patch)
treeee905fa007e14522848f571215c1054734db9269 /WebCore/rendering/ShadowElement.h
parent21d8d81a756ca7e60b5131e5f1006f52799179b0 (diff)
downloadexternal_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.zip
external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.gz
external_webkit-4a156157940f51b91eadd76f6c86f862ec0a1da0.tar.bz2
Merge WebKit at Chromium 9.0.597.55: trivial merge by git
Change-Id: I2c6f2ebc4431d15ac82b5b1a9f08159e1731bc57
Diffstat (limited to 'WebCore/rendering/ShadowElement.h')
-rw-r--r--WebCore/rendering/ShadowElement.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/ShadowElement.h b/WebCore/rendering/ShadowElement.h
index f5668ef..72bc207 100644
--- a/WebCore/rendering/ShadowElement.h
+++ b/WebCore/rendering/ShadowElement.h
@@ -58,11 +58,11 @@ public:
static PassRefPtr<ShadowBlockElement> createForPart(HTMLElement*, PseudoId);
static bool partShouldHaveStyle(const RenderObject* parentRenderer, PseudoId pseudoId);
void layoutAsPart(const IntRect& partRect);
- void updateStyleForPart(PseudoId);
+ virtual void updateStyleForPart(PseudoId);
protected:
ShadowBlockElement(HTMLElement*);
-
+ void initAsPart(PseudoId pasuedId);
private:
static PassRefPtr<RenderStyle> createStyleForPart(RenderObject*, PseudoId);
};