Diff
Modified: trunk/Source/WebKit2/ChangeLog (100582 => 100583)
--- trunk/Source/WebKit2/ChangeLog 2011-11-17 09:27:04 UTC (rev 100582)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-17 09:27:43 UTC (rev 100583)
@@ -1,3 +1,21 @@
+2011-11-17 Eunmi Lee <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [WK2] Move gtk/BackingStoreGtk.cpp to cairo/BackingStoreCairo.cpp to share with EFL port.
+ https://bugs.webkit.org/show_bug.cgi?id=62444
+
+ Rename gtk/BackingStoreGtk.cpp to cairo/BackingStoreCairo.cpp to share with EFL port.
+ The gtk/BackingStoreGtk.cpp only has cairo dependency, so it can be shared with other port
+ that uses cairo.
+
+ * GNUmakefile.am:
+ * UIProcess/BackingStore.h:
+ * UIProcess/cairo/BackingStoreCairo.cpp: Renamed from Source/WebKit2/UIProcess/gtk/BackingStoreGtk.cpp.
+ (WebKit::BackingStore::paint):
+ (WebKit::BackingStore::incorporateUpdate):
+ (WebKit::BackingStore::scroll):
+
2011-11-17 Nayan Kumar K <[email protected]>
[WebKit2][gtk] Add few more properties to WebKitSettings
Modified: trunk/Source/WebKit2/GNUmakefile.am (100582 => 100583)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-11-17 09:27:04 UTC (rev 100582)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-11-17 09:27:43 UTC (rev 100583)
@@ -545,7 +545,7 @@
Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h \
Source/WebKit2/UIProcess/GeolocationPermissionRequestProxy.cpp \
Source/WebKit2/UIProcess/GeolocationPermissionRequestProxy.h \
- Source/WebKit2/UIProcess/gtk/BackingStoreGtk.cpp \
+ Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp \
Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp \
Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp \
Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp \
Modified: trunk/Source/WebKit2/UIProcess/BackingStore.h (100582 => 100583)
--- trunk/Source/WebKit2/UIProcess/BackingStore.h 2011-11-17 09:27:04 UTC (rev 100582)
+++ trunk/Source/WebKit2/UIProcess/BackingStore.h 2011-11-17 09:27:43 UTC (rev 100583)
@@ -41,7 +41,7 @@
#include <QtGui/QPixmap>
#endif
-#if PLATFORM(GTK)
+#if USE(CAIRO)
#include <RefPtrCairo.h>
#include <WebCore/WidgetBackingStore.h>
#endif
@@ -72,7 +72,7 @@
typedef HDC PlatformGraphicsContext;
#elif PLATFORM(QT)
typedef QPainter* PlatformGraphicsContext;
-#elif PLATFORM(GTK)
+#elif USE(CAIRO)
typedef cairo_t* PlatformGraphicsContext;
#endif
@@ -98,7 +98,7 @@
OwnPtr<HBITMAP> m_bitmap;
#elif PLATFORM(QT)
QPixmap m_pixmap;
-#elif PLATFORM(GTK)
+#elif USE(CAIRO)
OwnPtr<WebCore::WidgetBackingStore> m_backingStore;
#endif
};
Copied: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (from rev 100581, trunk/Source/WebKit2/UIProcess/gtk/BackingStoreGtk.cpp) (0 => 100583)
--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2011-11-17 09:27:43 UTC (rev 100583)
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "BackingStore.h"
+
+#include "ShareableBitmap.h"
+#include "UpdateInfo.h"
+#include "WebPageProxy.h"
+#include <WebCore/GraphicsContext.h>
+#include <cairo/cairo.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+void BackingStore::paint(cairo_t* context, const IntRect& rect)
+{
+ ASSERT(m_backingStore);
+
+ cairo_set_operator(context, CAIRO_OPERATOR_SOURCE);
+ cairo_set_source_surface(context, m_backingStore->cairoSurface(), 0, 0);
+ cairo_rectangle(context, rect.x(), rect.y(), rect.width(), rect.height());
+ cairo_fill(context);
+}
+
+void BackingStore::incorporateUpdate(ShareableBitmap* bitmap, const UpdateInfo& updateInfo)
+{
+ if (!m_backingStore)
+ m_backingStore = WidgetBackingStore::create(m_webPageProxy->viewWidget(), size());
+
+ scroll(updateInfo.scrollRect, updateInfo.scrollOffset);
+
+ // Paint all update rects.
+ IntPoint updateRectLocation = updateInfo.updateRectBounds.location();
+ RefPtr<cairo_t> context(adoptRef(cairo_create(m_backingStore->cairoSurface())));
+ GraphicsContext graphicsContext(context.get());
+ for (size_t i = 0; i < updateInfo.updateRects.size(); ++i) {
+ IntRect updateRect = updateInfo.updateRects[i];
+ IntRect srcRect = updateRect;
+ srcRect.move(-updateRectLocation.x(), -updateRectLocation.y());
+ bitmap->paint(graphicsContext, updateRect.location(), srcRect);
+ }
+}
+
+void BackingStore::scroll(const IntRect& scrollRect, const IntSize& scrollOffset)
+{
+ if (scrollOffset.isZero())
+ return;
+
+ ASSERT(m_backingStore);
+ m_backingStore->scroll(scrollRect, scrollOffset);
+}
+
+} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/gtk/BackingStoreGtk.cpp (100582 => 100583)
--- trunk/Source/WebKit2/UIProcess/gtk/BackingStoreGtk.cpp 2011-11-17 09:27:04 UTC (rev 100582)
+++ trunk/Source/WebKit2/UIProcess/gtk/BackingStoreGtk.cpp 2011-11-17 09:27:43 UTC (rev 100583)
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- * Copyright (C) 2011 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "BackingStore.h"
-
-#include "ShareableBitmap.h"
-#include "UpdateInfo.h"
-#include "WebPageProxy.h"
-#include <WebCore/GraphicsContext.h>
-#include <cairo/cairo.h>
-#include <gtk/gtk.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void BackingStore::paint(cairo_t* context, const IntRect& rect)
-{
- ASSERT(m_backingStore);
-
- cairo_set_operator(context, CAIRO_OPERATOR_SOURCE);
- cairo_set_source_surface(context, m_backingStore->cairoSurface(), 0, 0);
- cairo_rectangle(context, rect.x(), rect.y(), rect.width(), rect.height());
- cairo_fill(context);
-}
-
-void BackingStore::incorporateUpdate(ShareableBitmap* bitmap, const UpdateInfo& updateInfo)
-{
- if (!m_backingStore)
- m_backingStore = WidgetBackingStore::create(m_webPageProxy->viewWidget(), size());
-
- scroll(updateInfo.scrollRect, updateInfo.scrollOffset);
-
- // Paint all update rects.
- IntPoint updateRectLocation = updateInfo.updateRectBounds.location();
- RefPtr<cairo_t> context(adoptRef(cairo_create(m_backingStore->cairoSurface())));
- GraphicsContext graphicsContext(context.get());
- for (size_t i = 0; i < updateInfo.updateRects.size(); ++i) {
- IntRect updateRect = updateInfo.updateRects[i];
- IntRect srcRect = updateRect;
- srcRect.move(-updateRectLocation.x(), -updateRectLocation.y());
- bitmap->paint(graphicsContext, updateRect.location(), srcRect);
- }
-}
-
-void BackingStore::scroll(const IntRect& scrollRect, const IntSize& scrollOffset)
-{
- if (scrollOffset.isZero())
- return;
-
- ASSERT(m_backingStore);
- m_backingStore->scroll(scrollRect, scrollOffset);
-}
-
-} // namespace WebKit
