Changeset 89133 in webkit


Ignore:
Timestamp:
Jun 17, 2011 4:49:58 AM (13 years ago)
Author:
joone.hur@collabora.co.uk
Message:

2011-06-17 Joone Hur <joone.hur@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] Replace GdkRectangle by cairo_rectangle_int_t
https://bugs.webkit.org/show_bug.cgi?id=60687

Replace GdkRectangle by cairo_rectangle_int_t.

  • configure.ac: Check whether Cairo version is higher than 1.10.

2011-06-17 Joone Hur <joone.hur@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] Replace GdkRectangle by cairo_rectangle_int_t
https://bugs.webkit.org/show_bug.cgi?id=60687

Replace GdkRectangle by cairo_rectangle_int_t.

  • wtf/gobject/GTypedefs.h: Replace GdkRectangle by cairo_rectangle_int_t.

2011-06-17 Joone Hur <joone.hur@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] Replace GdkRectangle by cairo_rectangle_int_t
https://bugs.webkit.org/show_bug.cgi?id=60687

Replace GdkRectangle by cairo_rectangle_int_t.

  • GNUmakefile.list.am: Added IntRectCairo.cpp instead of IntRectGtk.cpp
  • platform/graphics/IntRect.h: IntRect class can be instantiated through the given cairo_rectangle_int_t instead of GdkRectangle.
  • platform/graphics/cairo/IntRectCairo.cpp: Add the constructor and operator for handling cairo_rectangle_int_t. (WebCore::IntRect::IntRect): (WebCore::IntRect::operator cairo_rectangle_int_t):
  • platform/graphics/gtk/IntRectGtk.cpp: Include this file only for Gtk+2.
  • platform/gtk/GtkPluginWidget.cpp: Replace GdkRectangle by cairo_rectangle_int_t. (WebCore::GtkPluginWidget::invalidateRect):

2011-06-17 Joone Hur <joone.hur@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] Replace GdkRectangle by cairo_rectangle_int_t
https://bugs.webkit.org/show_bug.cgi?id=60687

Replace GdkRectangle by cairo_rectangle_int_t.

  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Replace GdkRectangle by cairo_rectangle_int_t. (DumpRenderTreeSupportGtk::firstRectForCharacterRange): (DumpRenderTreeSupportGtk::rectangleForSelection):
  • WebCoreSupport/DumpRenderTreeSupportGtk.h: Ditto.

2011-06-17 Joone Hur <joone.hur@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] Replace GdkRectangle by cairo_rectangle_int_t
https://bugs.webkit.org/show_bug.cgi?id=60687

Replace GdkRectangle by cairo_rectangle_int_t.

  • DumpRenderTree/gtk/PixelDumpSupportGtk.cpp: Replace GdkRectangle by cairo_rectangle_int_t. (createBitmapContextFromWebView):
  • DumpRenderTree/gtk/TextInputController.cpp: Ditto. (firstRectForCharacterRangeCallback):
Location:
trunk
Files:
15 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r89051 r89133  
     12011-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
    1122011-06-16  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    213
  • trunk/Source/JavaScriptCore/ChangeLog

    r89109 r89133  
     12011-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
    1122011-06-16  Gavin Barraclough  <barraclough@apple.com>
    213
  • trunk/Source/JavaScriptCore/wtf/gobject/GTypedefs.h

    r84088 r89133  
    6464#if USE(CAIRO)
    6565typedef struct _cairo_surface cairo_surface_t;
     66typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
    6667#endif
    6768
     
    8889#else
    8990typedef struct _GdkWindow GdkWindow;
    90 typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
    91 typedef cairo_rectangle_int_t GdkRectangle;
    9291typedef struct _GtkStyleContext GtkStyleContext;
    9392#endif
  • trunk/Source/WebCore/ChangeLog

    r89132 r89133  
     12011-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
    1202011-06-17  Alexander Pavlov  <apavlov@chromium.org>
    221
  • trunk/Source/WebCore/GNUmakefile.list.am

    r89039 r89133  
    37563756        Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h \
    37573757        Source/WebCore/platform/graphics/cairo/ImageCairo.cpp \
     3758        Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp \
    37583759        Source/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp \
    37593760        Source/WebCore/platform/graphics/cairo/OwnPtrCairo.h \
  • trunk/Source/WebCore/platform/graphics/IntRect.h

    r88102 r89133  
    5151#ifdef GTK_API_VERSION_2
    5252typedef struct _GdkRectangle GdkRectangle;
    53 #else
    54 typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
    55 typedef cairo_rectangle_int_t GdkRectangle;
    5653#endif
    5754#elif PLATFORM(HAIKU)
     
    5956#elif PLATFORM(EFL)
    6057typedef struct _Eina_Rectangle Eina_Rectangle;
     58#endif
     59
     60#if USE(CAIRO)
     61typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
    6162#endif
    6263
     
    185186    operator QRect() const;
    186187#elif PLATFORM(GTK)
     188#ifdef GTK_API_VERSION_2
    187189    IntRect(const GdkRectangle&);
    188190    operator GdkRectangle() const;
     191#endif
    189192#elif PLATFORM(HAIKU)
    190193    explicit IntRect(const BRect&);
     
    195198#endif
    196199
     200#if USE(CAIRO)
     201    IntRect(const cairo_rectangle_int_t&);
     202    operator cairo_rectangle_int_t() const;
     203#endif
     204
    197205#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    198206    operator CGRect() const;
  • trunk/Source/WebCore/platform/graphics/cairo/IntRectCairo.cpp

    r89132 r89133  
    11/*
    22 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
     3 * Copyright (C) 2011 Collabora Ltd.
    34 *
    45 * This library is free software; you can redistribute it and/or
     
    2122#include "IntRect.h"
    2223
    23 #include <gdk/gdk.h>
     24#include <cairo.h>
    2425
    2526namespace WebCore {
    2627
    27 IntRect::IntRect(const GdkRectangle& r)
     28IntRect::IntRect(const cairo_rectangle_int_t& r)
    2829    : m_location(IntPoint(r.x, r.y))
    2930    , m_size(r.width, r.height)
     
    3132}
    3233
    33 IntRect::operator GdkRectangle() const
     34IntRect::operator cairo_rectangle_int_t() const
    3435{
    35     GdkRectangle r = { x(), y(), width(), height() };
     36    cairo_rectangle_int_t r = { x(), y(), width(), height() };
    3637    return r;
    3738}
    3839
    3940}
    40 
    41 // vim: ts=4 sw=4 et
  • trunk/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp

    r29663 r89133  
    2323#include <gdk/gdk.h>
    2424
     25#ifdef GTK_API_VERSION_2
    2526namespace WebCore {
    2627
     
    3839
    3940}
    40 
    41 // vim: ts=4 sw=4 et
     41#endif
  • trunk/Source/WebCore/platform/gtk/GtkPluginWidget.cpp

    r62329 r89133  
    4242}
    4343
    44 void GtkPluginWidget::invalidateRect(const IntRect& _rect)
     44void GtkPluginWidget::invalidateRect(const IntRect& coreRect)
    4545{
    4646    /* no need to */
     
    5252        return;
    5353
    54     GdkRectangle rect = _rect;
     54    GdkRectangle rect = coreRect;
    5555    gdk_window_invalidate_rect(window, &rect, FALSE);
    5656}
  • trunk/Source/WebKit/gtk/ChangeLog

    r89044 r89133  
     12011-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
    1152011-06-16  Sheriff Bot  <webkit.review.bot@gmail.com>
    216
  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r88498 r89133  
    587587}
    588588
    589 bool DumpRenderTreeSupportGtk::firstRectForCharacterRange(WebKitWebView* webView, int location, int length, GdkRectangle* rect)
     589bool DumpRenderTreeSupportGtk::firstRectForCharacterRange(WebKitWebView* webView, int location, int length, cairo_rectangle_int_t* rect)
    590590{
    591591    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), false);
     
    825825}
    826826
    827 void DumpRenderTreeSupportGtk::rectangleForSelection(WebKitWebFrame* frame, GdkRectangle* rectangle)
     827void DumpRenderTreeSupportGtk::rectangleForSelection(WebKitWebFrame* frame, cairo_rectangle_int_t* rectangle)
    828828{
    829829    Frame* coreFrame = core(frame);
  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

    r88498 r89133  
    100100    static double defaultMinimumTimerInterval(); // Not really tied to WebView
    101101    static void setMinimumTimerInterval(WebKitWebView*, double);
    102     static void rectangleForSelection(WebKitWebFrame*, GdkRectangle*);
     102    static void rectangleForSelection(WebKitWebFrame*, cairo_rectangle_int_t*);
    103103    static void scalePageBy(WebKitWebView*, float, float, float);
    104104    static void setSmartInsertDeleteEnabled(WebKitWebView*, bool);
     
    113113    static bool compositionRange(WebKitWebView*, int* start, int* length);
    114114    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*);
    116116    static bool selectedRange(WebKitWebView*, int* start, int* length);
    117117
  • trunk/Tools/ChangeLog

    r89054 r89133  
     12011-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
    1152011-06-16  Dmitry Lomov  <dslomov@google.com>
    216
  • trunk/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp

    r84221 r89133  
    6161
    6262    if (drawSelectionRect) {
    63         GdkRectangle rectangle;
     63        cairo_rectangle_int_t rectangle;
    6464        DumpRenderTreeSupportGtk::rectangleForSelection(mainFrame, &rectangle);
    6565
  • trunk/Tools/DumpRenderTree/gtk/TextInputController.cpp

    r88498 r89133  
    130130    ASSERT(!exception || !*exception);
    131131
    132     GdkRectangle rect;
     132    cairo_rectangle_int_t rect;
    133133    if (!DumpRenderTreeSupportGtk::firstRectForCharacterRange(view, location, length, &rect))
    134134        return JSValueMakeUndefined(context);
  • trunk/configure.ac

    r89028 r89133  
    256256# minimum base dependencies
    257257LIBSOUP_REQUIRED_VERSION=2.33.6
    258 CAIRO_REQUIRED_VERSION=1.6
     258CAIRO_REQUIRED_VERSION=1.10
    259259FONTCONFIG_REQUIRED_VERSION=2.4
    260260FREETYPE2_REQUIRED_VERSION=9.0
Note: See TracChangeset for help on using the changeset viewer.