diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/loader/EmptyClients.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/loader/EmptyClients.h')
| -rw-r--r-- | Source/WebCore/loader/EmptyClients.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/loader/EmptyClients.h b/Source/WebCore/loader/EmptyClients.h index 41a5df7..cabb4ae 100644 --- a/Source/WebCore/loader/EmptyClients.h +++ b/Source/WebCore/loader/EmptyClients.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2006 Eric Seidel (eric@webkit.org) - * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved. + * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). * * Redistribution and use in source and binary forms, with or without @@ -165,7 +165,7 @@ public: virtual void invalidateContentsForSlowScroll(const IntRect&, bool) {}; virtual void scroll(const IntSize&, const IntRect&, const IntRect&) { } #if ENABLE(TILED_BACKING_STORE) - virtual void delegatedScrollRequested(const IntSize&) { } + virtual void delegatedScrollRequested(const IntPoint&) { } #endif #if ENABLE(REQUEST_ANIMATION_FRAME) virtual void scheduleAnimation() { } @@ -374,7 +374,7 @@ public: virtual void showMediaPlayerProxyPlugin(Widget*) { } #endif - virtual ObjectContentType objectContentType(const KURL&, const String&) { return ObjectContentType(); } + virtual ObjectContentType objectContentType(const KURL&, const String&, bool) { return ObjectContentType(); } virtual String overrideMediaType() const { return String(); } virtual void redirectDataToPlugin(Widget*) { } @@ -414,7 +414,7 @@ public: virtual String getAutoCorrectSuggestionForMisspelledWord(const String&) { return String(); } virtual void checkGrammarOfString(const UChar*, int, Vector<GrammarDetail>&, int*, int*) { } -#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) +#if USE(UNIFIED_TEXT_CHECKING) virtual void checkTextOfParagraph(const UChar*, int, uint64_t, Vector<TextCheckingResult>&) { }; #endif @@ -519,9 +519,9 @@ public: TextCheckerClient* textChecker() { return &m_textCheckerClient; } #if SUPPORT_AUTOCORRECTION_PANEL - virtual void showCorrectionPanel(CorrectionPanelInfo::PanelType, const FloatRect&, const String&, const String&, const Vector<String>&, Editor*) { } + virtual void showCorrectionPanel(CorrectionPanelInfo::PanelType, const FloatRect&, const String&, const String&, const Vector<String>&) { } virtual void dismissCorrectionPanel(ReasonForDismissingCorrectionPanel) { } - virtual bool isShowingCorrectionPanel() { return false; } + virtual String dismissCorrectionPanelSoon(ReasonForDismissingCorrectionPanel) { return String(); } virtual void recordAutocorrectionResponse(AutocorrectionResponseType, const String&, const String&) { } #endif virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail&) { } |