diff options
Diffstat (limited to 'WebCore/platform/win')
-rw-r--r-- | WebCore/platform/win/BString.h | 4 | ||||
-rw-r--r-- | WebCore/platform/win/ClipboardUtilitiesWin.h | 2 | ||||
-rw-r--r-- | WebCore/platform/win/SearchPopupMenuWin.cpp | 13 | ||||
-rw-r--r-- | WebCore/platform/win/WCDataObject.h | 3 | ||||
-rw-r--r-- | WebCore/platform/win/WebCoreTextRenderer.h | 3 |
5 files changed, 19 insertions, 6 deletions
diff --git a/WebCore/platform/win/BString.h b/WebCore/platform/win/BString.h index c32a49d..bdbf189 100644 --- a/WebCore/platform/win/BString.h +++ b/WebCore/platform/win/BString.h @@ -26,6 +26,8 @@ #ifndef BString_h #define BString_h +#include <wtf/Forward.h> + #if PLATFORM(CF) typedef const struct __CFString * CFStringRef; #endif @@ -38,9 +40,7 @@ namespace JSC { namespace WebCore { - class AtomicString; class KURL; - class String; class BString { public: diff --git a/WebCore/platform/win/ClipboardUtilitiesWin.h b/WebCore/platform/win/ClipboardUtilitiesWin.h index fe01499..1a29e7e 100644 --- a/WebCore/platform/win/ClipboardUtilitiesWin.h +++ b/WebCore/platform/win/ClipboardUtilitiesWin.h @@ -28,12 +28,12 @@ #include "DragData.h" #include <windows.h> +#include <wtf/Forward.h> namespace WebCore { class Document; class KURL; -class String; HGLOBAL createGlobalData(const String&); HGLOBAL createGlobalData(const Vector<char>&); diff --git a/WebCore/platform/win/SearchPopupMenuWin.cpp b/WebCore/platform/win/SearchPopupMenuWin.cpp index e1bbe68..6655b1b 100644 --- a/WebCore/platform/win/SearchPopupMenuWin.cpp +++ b/WebCore/platform/win/SearchPopupMenuWin.cpp @@ -22,7 +22,10 @@ #include "SearchPopupMenuWin.h" #include "AtomicString.h" + +#if PLATFORM(CF) #include <wtf/RetainPtr.h> +#endif namespace WebCore { @@ -38,20 +41,27 @@ PopupMenu* SearchPopupMenuWin::popupMenu() bool SearchPopupMenuWin::enabled() { +#if PLATFORM(CF) return true; +#else + return false; +#endif } +#if PLATFORM(CF) static RetainPtr<CFStringRef> autosaveKey(const String& name) { String key = "com.apple.WebKit.searchField:" + name; return RetainPtr<CFStringRef>(AdoptCF, key.createCFString()); } +#endif void SearchPopupMenuWin::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) { if (name.isEmpty()) return; +#if PLATFORM(CF) RetainPtr<CFMutableArrayRef> items; size_t size = searchItems.size(); @@ -65,6 +75,7 @@ void SearchPopupMenuWin::saveRecentSearches(const AtomicString& name, const Vect CFPreferencesSetAppValue(autosaveKey(name).get(), items.get(), kCFPreferencesCurrentApplication); CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication); +#endif } void SearchPopupMenuWin::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) @@ -72,6 +83,7 @@ void SearchPopupMenuWin::loadRecentSearches(const AtomicString& name, Vector<Str if (name.isEmpty()) return; +#if PLATFORM(CF) searchItems.clear(); RetainPtr<CFArrayRef> items(AdoptCF, reinterpret_cast<CFArrayRef>(CFPreferencesCopyAppValue(autosaveKey(name).get(), kCFPreferencesCurrentApplication))); @@ -84,6 +96,7 @@ void SearchPopupMenuWin::loadRecentSearches(const AtomicString& name, Vector<Str if (CFGetTypeID(item) == CFStringGetTypeID()) searchItems.append(item); } +#endif } } diff --git a/WebCore/platform/win/WCDataObject.h b/WebCore/platform/win/WCDataObject.h index bdfb013..133115d 100644 --- a/WebCore/platform/win/WCDataObject.h +++ b/WebCore/platform/win/WCDataObject.h @@ -26,14 +26,13 @@ #ifndef WCDataObject_h #define WCDataObject_h +#include <wtf/Forward.h> #include <wtf/Vector.h> #include <ShlObj.h> #include <objidl.h> namespace WebCore { -class String; - class WCDataObject : public IDataObject { public: void CopyMedium(STGMEDIUM* pMedDest, STGMEDIUM* pMedSrc, FORMATETC* pFmtSrc); diff --git a/WebCore/platform/win/WebCoreTextRenderer.h b/WebCore/platform/win/WebCoreTextRenderer.h index 7b72946..7efc1f3 100644 --- a/WebCore/platform/win/WebCoreTextRenderer.h +++ b/WebCore/platform/win/WebCoreTextRenderer.h @@ -23,13 +23,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <wtf/Forward.h> + namespace WebCore { class Color; class Font; class GraphicsContext; class IntPoint; - class String; void WebCoreDrawTextAtPoint(GraphicsContext&, const String&, const IntPoint&, const Font&, const Color&, int underlinedIndex = -1); void WebCoreDrawDoubledTextAtPoint(GraphicsContext&, const String&, const IntPoint&, const Font&, const Color& topColor, const Color& bottomColor, int underlinedIndex = -1); |