diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/mathml/MathMLInlineContainerElement.h | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/mathml/MathMLInlineContainerElement.h')
| -rw-r--r-- | WebCore/mathml/MathMLInlineContainerElement.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/mathml/MathMLInlineContainerElement.h b/WebCore/mathml/MathMLInlineContainerElement.h index dc78dc4..4e80e36 100644 --- a/WebCore/mathml/MathMLInlineContainerElement.h +++ b/WebCore/mathml/MathMLInlineContainerElement.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2009 Alex Milowski (alex@milowski.com). All rights reserved. + * Copyright (C) 2010 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,11 +36,11 @@ class MathMLInlineContainerElement : public MathMLElement { public: static PassRefPtr<MathMLInlineContainerElement> create(const QualifiedName& tagName, Document*); - virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); - protected: MathMLInlineContainerElement(const QualifiedName& tagName, Document*); +private: + virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); }; } |