diff options
Diffstat (limited to 'Source/WebKit/win/WebFrame.h')
| -rw-r--r-- | Source/WebKit/win/WebFrame.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebKit/win/WebFrame.h b/Source/WebKit/win/WebFrame.h index 59c0aec..9158fb3 100644 --- a/Source/WebKit/win/WebFrame.h +++ b/Source/WebKit/win/WebFrame.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,13 +33,11 @@ #include "AccessibleDocument.h" -#pragma warning(push, 0) #include <WebCore/FrameWin.h> #include <WebCore/GraphicsContext.h> #include <WebCore/KURL.h> #include <WebCore/PlatformString.h> #include <WebCore/ResourceHandleClient.h> -#pragma warning(pop) #include <WTF/RefPtr.h> #include <WTF/HashMap.h> @@ -64,7 +62,10 @@ typedef struct OpaqueJSValue* JSObjectRef; #if PLATFORM(CG) typedef struct CGContext PlatformGraphicsContext; #elif PLATFORM(CAIRO) -typedef struct _cairo PlatformGraphicsContext; +namespace WebCore { +class PlatformContextCairo; +} +typedef class WebCore::PlatformContextCairo PlatformGraphicsContext; #endif class WebFrame; @@ -341,7 +342,7 @@ public: virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues); - virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType); + virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages); virtual WTF::String overrideMediaType() const; virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*); |