diff options
author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebCore/html/HTMLMarqueeElement.cpp | |
parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebCore/html/HTMLMarqueeElement.cpp')
-rw-r--r-- | WebCore/html/HTMLMarqueeElement.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/html/HTMLMarqueeElement.cpp b/WebCore/html/HTMLMarqueeElement.cpp index ada26c1..8128188 100644 --- a/WebCore/html/HTMLMarqueeElement.cpp +++ b/WebCore/html/HTMLMarqueeElement.cpp @@ -132,7 +132,7 @@ bool HTMLMarqueeElement::canSuspend() const return true; } -void HTMLMarqueeElement::suspend() +void HTMLMarqueeElement::suspend(ReasonForSuspension) { if (RenderMarquee* marqueeRenderer = renderMarquee()) marqueeRenderer->suspend(); |