Title: [101293] trunk/Source/WebKit2
- Revision
- 101293
- Author
- bfulg...@webkit.org
- Date
- 2011-11-28 15:29:59 -0800 (Mon, 28 Nov 2011)
Log Message
[WinCairo] Unreviewed build corrections.
* UIProcess/BackingStore.h: WinCairo doesn't need the Cairo backing
for widgets.
* win/WebKit2CFLite.def: Update to match WebKit2.def.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (101292 => 101293)
--- trunk/Source/WebKit2/ChangeLog 2011-11-28 23:11:07 UTC (rev 101292)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-28 23:29:59 UTC (rev 101293)
@@ -1,3 +1,11 @@
+2011-11-28 Brent Fulgham <bfulg...@webkit.org>
+
+ [WinCairo] Unreviewed build corrections.
+
+ * UIProcess/BackingStore.h: WinCairo doesn't need the Cairo backing
+ for widgets.
+ * win/WebKit2CFLite.def: Update to match WebKit2.def.
+
2011-11-28 Beth Dakin <bda...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=72551
Modified: trunk/Source/WebKit2/UIProcess/BackingStore.h (101292 => 101293)
--- trunk/Source/WebKit2/UIProcess/BackingStore.h 2011-11-28 23:11:07 UTC (rev 101292)
+++ trunk/Source/WebKit2/UIProcess/BackingStore.h 2011-11-28 23:29:59 UTC (rev 101293)
@@ -32,7 +32,7 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) || PLATFORM(WIN_CAIRO)
#include <wtf/OwnPtr.h>
#endif
@@ -41,7 +41,7 @@
#include <QtGui/QPixmap>
#endif
-#if USE(CAIRO)
+#if USE(CAIRO) && !PLATFORM(WIN_CAIRO)
#include <RefPtrCairo.h>
#include <WebCore/WidgetBackingStore.h>
#endif
@@ -94,7 +94,7 @@
RetainPtr<CGLayerRef> m_cgLayer;
RetainPtr<CGContextRef> m_bitmapContext;
-#elif PLATFORM(WIN)
+#elif PLATFORM(WIN) || PLATFORM(WIN_CAIRO)
OwnPtr<HBITMAP> m_bitmap;
#elif PLATFORM(QT)
QPixmap m_pixmap;
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (101292 => 101293)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2011-11-28 23:11:07 UTC (rev 101292)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2011-11-28 23:29:59 UTC (rev 101293)
@@ -163,7 +163,7 @@
?removeShadowRoot@Element@WebCore@@QAEXXZ
?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
?setDOMException@WebCore@@YAXPAVExecState@JSC@@H@Z
- ?setMockScrollbarsEnabled@Internals@WebCore@@QAEXPAVDocument@2@_NAAH@Z
+ ?setMockScrollbarsEnabled@Settings@WebCore@@SAX_N@Z
?setPagination@Page@WebCore@@QAEXABUPagination@12@@Z
?setResourcesDataSizeLimitsFromInternals@InspectorController@WebCore@@QAEXHH@Z
?setScrollbarsSuppressed@ScrollView@WebCore@@QAEX_N0@Z
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
