Changeset 89133 in webkit
- Timestamp:
- Jun 17, 2011 4:49:58 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r89051 r89133 1 2011-06-17 Joone Hur <joone.hur@collabora.co.uk> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Replace GdkRectangle by cairo_rectangle_int_t 6 https://bugs.webkit.org/show_bug.cgi?id=60687 7 8 Replace GdkRectangle by cairo_rectangle_int_t. 9 10 * configure.ac: Check whether Cairo version is higher than 1.10. 11 1 12 2011-06-16 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 13 -
trunk/Source/JavaScriptCore/ChangeLog
r89109 r89133 1 2011-06-17 Joone Hur <joone.hur@collabora.co.uk> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Replace GdkRectangle by cairo_rectangle_int_t 6 https://bugs.webkit.org/show_bug.cgi?id=60687 7 8 Replace GdkRectangle by cairo_rectangle_int_t. 9 10 * wtf/gobject/GTypedefs.h: Replace GdkRectangle by cairo_rectangle_int_t. 11 1 12 2011-06-16 Gavin Barraclough <barraclough@apple.com> 2 13 -
trunk/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
r84088 r89133 64 64 #if USE(CAIRO) 65 65 typedef struct _cairo_surface cairo_surface_t; 66 typedef struct _cairo_rectangle_int cairo_rectangle_int_t; 66 67 #endif 67 68 … … 88 89 #else 89 90 typedef struct _GdkWindow GdkWindow; 90 typedef struct _cairo_rectangle_int cairo_rectangle_int_t;91 typedef cairo_rectangle_int_t GdkRectangle;92 91 typedef struct _GtkStyleContext GtkStyleContext; 93 92 #endif -
trunk/Source/WebCore/ChangeLog
r89132 r89133 1 2011-06-17 Joone Hur <joone.hur@collabora.co.uk> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Replace GdkRectangle by cairo_rectangle_int_t 6 https://bugs.webkit.org/show_bug.cgi?id=60687 7 8 Replace GdkRectangle by cairo_rectangle_int_t. 9 10 * GNUmakefile.list.am: Added IntRectCairo.cpp instead of IntRectGtk.cpp 11 * platform/graphics/IntRect.h: IntRect class can be instantiated through the given cairo_rectangle_int_t 12 instead of GdkRectangle. 13 * platform/graphics/cairo/IntRectCairo.cpp: Add the constructor and operator for handling cairo_rectangle_int_t. 14 (WebCore::IntRect::IntRect): 15 (WebCore::IntRect::operator cairo_rectangle_int_t): 16 * platform/graphics/gtk/IntRectGtk.cpp: Include this file only for Gtk+2. 17 * platform/gtk/GtkPluginWidget.cpp: Replace GdkRectangle by cairo_rectangle_int_t. 18 (WebCore::GtkPluginWidget::invalidateRect): 19 1 20 2011-06-17 Alexander Pavlov <apavlov@chromium.org> 2 21 -
trunk/Source/WebCore/GNUmakefile.list.am
r89039 r89133 3756 3756 Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h \ 3757 3757 Source/WebCore/platform/graphics/cairo/ImageCairo.cpp \ 3758 Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp \ 3758 3759 Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp \ 3759 3760 Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h \ -
trunk/Source/WebCore/platform/graphics/IntRect.h
r88102 r89133 51 51 #ifdef GTK_API_VERSION_2 52 52 typedef struct _GdkRectangle GdkRectangle; 53 #else54 typedef struct _cairo_rectangle_int cairo_rectangle_int_t;55 typedef cairo_rectangle_int_t GdkRectangle;56 53 #endif 57 54 #elif PLATFORM(HAIKU) … … 59 56 #elif PLATFORM(EFL) 60 57 typedef struct _Eina_Rectangle Eina_Rectangle; 58 #endif 59 60 #if USE(CAIRO) 61 typedef struct _cairo_rectangle_int cairo_rectangle_int_t; 61 62 #endif 62 63 … … 185 186 operator QRect() const; 186 187 #elif PLATFORM(GTK) 188 #ifdef GTK_API_VERSION_2 187 189 IntRect(const GdkRectangle&); 188 190 operator GdkRectangle() const; 191 #endif 189 192 #elif PLATFORM(HAIKU) 190 193 explicit IntRect(const BRect&); … … 195 198 #endif 196 199 200 #if USE(CAIRO) 201 IntRect(const cairo_rectangle_int_t&); 202 operator cairo_rectangle_int_t() const; 203 #endif 204 197 205 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 198 206 operator CGRect() const; -
trunk/Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp
r89132 r89133 1 1 /* 2 2 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2011 Collabora Ltd. 3 4 * 4 5 * This library is free software; you can redistribute it and/or … … 21 22 #include "IntRect.h" 22 23 23 #include < gdk/gdk.h>24 #include <cairo.h> 24 25 25 26 namespace WebCore { 26 27 27 IntRect::IntRect(const GdkRectangle& r)28 IntRect::IntRect(const cairo_rectangle_int_t& r) 28 29 : m_location(IntPoint(r.x, r.y)) 29 30 , m_size(r.width, r.height) … … 31 32 } 32 33 33 IntRect::operator GdkRectangle() const34 IntRect::operator cairo_rectangle_int_t() const 34 35 { 35 GdkRectangler = { x(), y(), width(), height() };36 cairo_rectangle_int_t r = { x(), y(), width(), height() }; 36 37 return r; 37 38 } 38 39 39 40 } 40 41 // vim: ts=4 sw=4 et -
trunk/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp
r29663 r89133 23 23 #include <gdk/gdk.h> 24 24 25 #ifdef GTK_API_VERSION_2 25 26 namespace WebCore { 26 27 … … 38 39 39 40 } 40 41 // vim: ts=4 sw=4 et 41 #endif -
trunk/Source/WebCore/platform/gtk/GtkPluginWidget.cpp
r62329 r89133 42 42 } 43 43 44 void GtkPluginWidget::invalidateRect(const IntRect& _rect)44 void GtkPluginWidget::invalidateRect(const IntRect& coreRect) 45 45 { 46 46 /* no need to */ … … 52 52 return; 53 53 54 GdkRectangle rect = _rect;54 GdkRectangle rect = coreRect; 55 55 gdk_window_invalidate_rect(window, &rect, FALSE); 56 56 } -
trunk/Source/WebKit/gtk/ChangeLog
r89044 r89133 1 2011-06-17 Joone Hur <joone.hur@collabora.co.uk> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Replace GdkRectangle by cairo_rectangle_int_t 6 https://bugs.webkit.org/show_bug.cgi?id=60687 7 8 Replace GdkRectangle by cairo_rectangle_int_t. 9 10 * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Replace GdkRectangle by cairo_rectangle_int_t. 11 (DumpRenderTreeSupportGtk::firstRectForCharacterRange): 12 (DumpRenderTreeSupportGtk::rectangleForSelection): 13 * WebCoreSupport/DumpRenderTreeSupportGtk.h: Ditto. 14 1 15 2011-06-16 Sheriff Bot <webkit.review.bot@gmail.com> 2 16 -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
r88498 r89133 587 587 } 588 588 589 bool DumpRenderTreeSupportGtk::firstRectForCharacterRange(WebKitWebView* webView, int location, int length, GdkRectangle* rect)589 bool DumpRenderTreeSupportGtk::firstRectForCharacterRange(WebKitWebView* webView, int location, int length, cairo_rectangle_int_t* rect) 590 590 { 591 591 g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), false); … … 825 825 } 826 826 827 void DumpRenderTreeSupportGtk::rectangleForSelection(WebKitWebFrame* frame, GdkRectangle* rectangle)827 void DumpRenderTreeSupportGtk::rectangleForSelection(WebKitWebFrame* frame, cairo_rectangle_int_t* rectangle) 828 828 { 829 829 Frame* coreFrame = core(frame); -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
r88498 r89133 100 100 static double defaultMinimumTimerInterval(); // Not really tied to WebView 101 101 static void setMinimumTimerInterval(WebKitWebView*, double); 102 static void rectangleForSelection(WebKitWebFrame*, GdkRectangle*);102 static void rectangleForSelection(WebKitWebFrame*, cairo_rectangle_int_t*); 103 103 static void scalePageBy(WebKitWebView*, float, float, float); 104 104 static void setSmartInsertDeleteEnabled(WebKitWebView*, bool); … … 113 113 static bool compositionRange(WebKitWebView*, int* start, int* length); 114 114 static void confirmComposition(WebKitWebView*, const char*); 115 static bool firstRectForCharacterRange(WebKitWebView*, int location, int length, GdkRectangle*);115 static bool firstRectForCharacterRange(WebKitWebView*, int location, int length, cairo_rectangle_int_t*); 116 116 static bool selectedRange(WebKitWebView*, int* start, int* length); 117 117 -
trunk/Tools/ChangeLog
r89054 r89133 1 2011-06-17 Joone Hur <joone.hur@collabora.co.uk> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Replace GdkRectangle by cairo_rectangle_int_t 6 https://bugs.webkit.org/show_bug.cgi?id=60687 7 8 Replace GdkRectangle by cairo_rectangle_int_t. 9 10 * DumpRenderTree/gtk/PixelDumpSupportGtk.cpp: Replace GdkRectangle by cairo_rectangle_int_t. 11 (createBitmapContextFromWebView): 12 * DumpRenderTree/gtk/TextInputController.cpp: Ditto. 13 (firstRectForCharacterRangeCallback): 14 1 15 2011-06-16 Dmitry Lomov <dslomov@google.com> 2 16 -
trunk/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp
r84221 r89133 61 61 62 62 if (drawSelectionRect) { 63 GdkRectanglerectangle;63 cairo_rectangle_int_t rectangle; 64 64 DumpRenderTreeSupportGtk::rectangleForSelection(mainFrame, &rectangle); 65 65 -
trunk/Tools/DumpRenderTree/gtk/TextInputController.cpp
r88498 r89133 130 130 ASSERT(!exception || !*exception); 131 131 132 GdkRectanglerect;132 cairo_rectangle_int_t rect; 133 133 if (!DumpRenderTreeSupportGtk::firstRectForCharacterRange(view, location, length, &rect)) 134 134 return JSValueMakeUndefined(context); -
trunk/configure.ac
r89028 r89133 256 256 # minimum base dependencies 257 257 LIBSOUP_REQUIRED_VERSION=2.33.6 258 CAIRO_REQUIRED_VERSION=1. 6258 CAIRO_REQUIRED_VERSION=1.10 259 259 FONTCONFIG_REQUIRED_VERSION=2.4 260 260 FREETYPE2_REQUIRED_VERSION=9.0
Note: See TracChangeset
for help on using the changeset viewer.