Changeset 47144 in webkit


Ignore:
Timestamp:
Aug 12, 2009 1:35:32 PM (15 years ago)
Author:
eric@webkit.org
Message:

2009-08-12 Maxime Simon <Maxime Simon>

Reviewed by Eric Seidel.

[Haiku] Tiny modifications on WebCore files to allow Haiku port.
https://bugs.webkit.org/show_bug.cgi?id=28128

  • bindings/js/ScriptControllerHaiku.cpp: Style cleanup.
  • loader/CachedFont.cpp: Haiku behaves like Qt, Gtk, or Chromium, so many PLATFORM(HAIKU) were added to these functions. (WebCore::CachedFont::~CachedFont): (WebCore::CachedFont::ensureCustomFontData): (WebCore::CachedFont::platformDataFromCustomData): (WebCore::CachedFont::allClientsRemoved):
  • page/EventHandler.cpp: Like the mac and Qt port, Haiku doesn't need the invertSenseOfTabsToLinks() function.
  • page/haiku/DragControllerHaiku.cpp: Style cleanup.
  • platform/image-decoders/ImageDecoder.h: For image decoding Haiku behaves like Cairo or Wx, (not like Skia). (WebCore::RGBA32Buffer::getAddr):
  • platform/text/PlatformString.h: Adding the String(BString&) and BString() methods specific to Haiku.
  • platform/text/UnicodeRange.h: Haiku needs to include stdint.h.
  • platform/text/haiku/TextBreakIteratorInternalICUHaiku.cpp: (WebCore::currentSearchLocaleID): Missing function.
Location:
trunk/WebCore
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r47143 r47144  
     12009-08-12  Maxime Simon  <simon.maxime@gmail.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [Haiku] Tiny modifications on WebCore files to allow Haiku port.
     6        https://bugs.webkit.org/show_bug.cgi?id=28128
     7
     8        * bindings/js/ScriptControllerHaiku.cpp: Style cleanup.
     9        * loader/CachedFont.cpp: Haiku behaves like Qt, Gtk, or Chromium,
     10        so many PLATFORM(HAIKU) were added to these functions.
     11        (WebCore::CachedFont::~CachedFont):
     12        (WebCore::CachedFont::ensureCustomFontData):
     13        (WebCore::CachedFont::platformDataFromCustomData):
     14        (WebCore::CachedFont::allClientsRemoved):
     15        * page/EventHandler.cpp: Like the mac and Qt port, Haiku doesn't need the
     16        invertSenseOfTabsToLinks() function.
     17        * page/haiku/DragControllerHaiku.cpp: Style cleanup.
     18        * platform/image-decoders/ImageDecoder.h: For image decoding Haiku
     19        behaves like Cairo or Wx, (not like Skia).
     20        (WebCore::RGBA32Buffer::getAddr):
     21        * platform/text/PlatformString.h: Adding the String(BString&) and BString()
     22        methods specific to Haiku.
     23        * platform/text/UnicodeRange.h: Haiku needs to include stdint.h.
     24        * platform/text/haiku/TextBreakIteratorInternalICUHaiku.cpp:
     25        (WebCore::currentSearchLocaleID): Missing function.
     26
    1272009-08-12  Maxime Simon  <simon.maxime@gmail.com>
    228
  • trunk/WebCore/bindings/js/ScriptControllerHaiku.cpp

    r46009 r47144  
    2929
    3030#include "PluginView.h"
     31#include "runtime.h"
    3132#include "runtime_root.h"
    32 #include "runtime.h"
    3333
    3434
  • trunk/WebCore/loader/CachedFont.cpp

    r46885 r47144  
    3232#include "DOMImplementation.h"
    3333#include "FontPlatformData.h"
    34 #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX)))
     34#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) || PLATFORM(HAIKU)
    3535#include "FontCustomPlatformData.h"
    3636#endif
     
    6161CachedFont::~CachedFont()
    6262{
    63 #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX)))
     63#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) || PLATFORM(HAIKU)
    6464    delete m_fontData;
    6565#endif
     
    9999bool CachedFont::ensureCustomFontData()
    100100{
    101 #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX)))
     101#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) || PLATFORM(HAIKU)
    102102#if ENABLE(SVG_FONTS)
    103103    ASSERT(!m_isSVGFont);
     
    118118        return FontPlatformData(size, bold, italic);
    119119#endif
    120 #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX)))
     120#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) || PLATFORM(HAIKU)
    121121    ASSERT(m_fontData);
    122122    return m_fontData->fontPlatformData(static_cast<int>(size), bold, italic, renderingMode);
     
    174174void CachedFont::allClientsRemoved()
    175175{
    176 #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX)))
     176#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (PLATFORM(WIN_OS) || PLATFORM(LINUX))) || PLATFORM(HAIKU)
    177177    if (m_fontData) {
    178178        delete m_fontData;
  • trunk/WebCore/page/EventHandler.cpp

    r46815 r47144  
    23212321   
    23222322   
    2323 #if !PLATFORM(MAC) && !PLATFORM(QT)
     2323#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(HAIKU)
    23242324bool EventHandler::invertSenseOfTabsToLinks(KeyboardEvent*) const
    23252325{
  • trunk/WebCore/page/haiku/DragControllerHaiku.cpp

    r46011 r47144  
    3333
    3434
    35 namespace WebCore
    36 {
     35namespace WebCore {
    3736
    38 // FIXME: These values are straight out of DragControllerMac, so probably have 
     37// FIXME: These values are straight out of DragControllerMac, so probably have
    3938// little correlation with Haiku standards...
    4039const int DragController::LinkDragBorderInset = 2;
  • trunk/WebCore/platform/image-decoders/ImageDecoder.h

    r46738 r47144  
    135135        inline PixelData* getAddr(int x, int y)
    136136        {
    137 #if PLATFORM(CAIRO) || PLATFORM(WX)
     137#if PLATFORM(CAIRO) || PLATFORM(WX) || PLATFORM(HAIKU)
    138138            return m_bytes.data() + (y * width()) + x;
    139139#elif PLATFORM(SKIA)
     
    161161        }
    162162
    163 #if PLATFORM(CAIRO) || PLATFORM(WX)
     163#if PLATFORM(CAIRO) || PLATFORM(WX) || PLATFORM(HAIKU)
    164164        Vector<PixelData> m_bytes;
    165165        IntSize m_size;       // The size of the buffer.  This should be the
  • trunk/WebCore/platform/text/PlatformString.h

    r46892 r47144  
    5757#endif
    5858
     59#if PLATFORM(HAIKU)
     60class BString;
     61#endif
     62
    5963namespace WebCore {
    6064
     
    228232    String(const wxString&);
    229233    operator wxString() const;
     234#endif
     235
     236#if PLATFORM(HAIKU)
     237    String(const BString&);
     238    operator BString() const;
    230239#endif
    231240
  • trunk/WebCore/platform/text/UnicodeRange.h

    r29663 r47144  
    3535#ifndef UnicodeRange_H
    3636#define UnicodeRange_H
     37
     38#if PLATFORM(HAIKU)
     39#include "stdint.h"
     40#endif
    3741
    3842#include <wtf/unicode/Unicode.h>
  • trunk/WebCore/platform/text/haiku/TextBreakIteratorInternalICUHaiku.cpp

    r46008 r47144  
    2727namespace WebCore {
    2828
     29const char* currentSearchLocaleID()
     30{
     31    notImplemented();
     32    return "";
     33}
     34
    2935const char* currentTextBreakLocaleID()
    3036{
Note: See TracChangeset for help on using the changeset viewer.