Changeset 156567 in webkit


Ignore:
Timestamp:
Sep 27, 2013 1:25:56 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[Nix] Updating Nix trunk files
​https://bugs.webkit.org/show_bug.cgi?id=121752

Patch by Thiago de Barros Lacerda <​thiago.lacerda@openbossa.org> on 2013-09-27
Reviewed by Benjamin Poulain.

Source/WebCore:

No new tests needed.

  • page/nix/EventHandlerNix.cpp:

(WebCore::EventHandler::focusDocumentView):
(WebCore::EventHandler::passWheelEventToWidget):
(WebCore::EventHandler::passMousePressEventToSubframe):
(WebCore::EventHandler::passMouseMoveEventToSubframe):
(WebCore::EventHandler::passMouseReleaseEventToSubframe):

  • platform/DragImage.h:
  • platform/graphics/GraphicsContext3D.h:
  • platform/nix/DragImageNix.cpp:

(WebCore::createDragImageFromImage):

  • platform/nix/GamepadsNix.cpp:

(WebCore::sampleGamepads):

  • platform/nix/LanguageNix.cpp:

(WebCore::platformLanguage):

  • platform/nix/LocalizedStringsNix.cpp:

(WebCore::unacceptableTLSCertificate):

  • platform/nix/PasteboardNix.cpp:

(WebCore::Pasteboard::types):

  • platform/nix/RenderThemeNix.cpp:

(WebCore::toColor):
(WebCore::themeEngine):
(WebCore::webCanvas):
(WebCore::getWebThemeState):
(WebCore::RenderThemeNix::paintButton):
(WebCore::RenderThemeNix::paintTextField):
(WebCore::RenderThemeNix::paintCheckbox):
(WebCore::RenderThemeNix::paintRadio):
(WebCore::RenderThemeNix::paintMenuList):
(WebCore::RenderThemeNix::paintProgressBar):
(WebCore::RenderThemeNix::paintInnerSpinButton):
(WebCore::RenderThemeNix::paintMeter):

Source/WTF:

  • wtf/nix/FeatureDefinesNix.h:
Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r156546 r156567  
     12013-09-27  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [Nix] Updating Nix trunk files
     4        https://bugs.webkit.org/show_bug.cgi?id=121752
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * wtf/nix/FeatureDefinesNix.h:
     9
    1102013-09-06  Jer Noble  <jer.noble@apple.com>
    211

  • trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h

    r155360 r156567  
    3939#endif
    4040
     41#if !defined(ENABLE_BATTERY_STATUS)
     42#define ENABLE_BATTERY_STATUS 1
     43#endif
     44
    4145#if !defined(ENABLE_BLOB)
    4246#define ENABLE_BLOB 1
    … …  
    5963#endif
    6064
     65#if !defined(ENABLE_CSS_DEVICE_ADAPTATION)
     66#define ENABLE_CSS_DEVICE_ADAPTATION 1
     67#endif
     68
    6169#if !defined(ENABLE_CSS_EXCLUSIONS)
    6270#define ENABLE_CSS_EXCLUSIONS 1
    … …  
    123131#endif
    124132
     133#if !defined(ENABLE_GEOLOCATION)
     134#define ENABLE_GEOLOCATION 1
     135#endif
     136
    125137#if !defined(ENABLE_GESTURE_EVENTS)
    126138#define ENABLE_GESTURE_EVENTS 1
    … …  
    155167#endif
    156168
    157 #if !defined(ENABLE_LEGACY_VENDOR_PREFIXES)
    158 #define ENABLE_LEGACY_VENDOR_PREFIXES 0
    159 #endif
    160 
    161169#if !defined(ENABLE_LEGACY_VIEWPORT_ADAPTION)
    162170#define ENABLE_LEGACY_VIEWPORT_ADAPTION 1
    … …  
    179187#endif
    180188
    181 #if !defined(ENABLE_MICRODATA)
    182 #define ENABLE_MICRODATA 1
    183 #endif
    184 
    185189#if !defined(ENABLE_NAVIGATOR_CONTENT_UTILS)
    186190#define ENABLE_NAVIGATOR_CONTENT_UTILS 1
    … …  
    195199#endif
    196200
     201#if !defined(ENABLE_PAGE_VISIBILITY_API)
     202#define ENABLE_PAGE_VISIBILITY_API 1
     203#endif
     204
    197205#if !defined(ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH)
    198206#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
    … …  
    207215#endif
    208216
     217#if !defined(ENABLE_PROMISES)
     218#define ENABLE_PROMISES 1
     219#endif
     220
    209221#if !defined(ENABLE_REQUEST_ANIMATION_FRAME)
    210222#define ENABLE_REQUEST_ANIMATION_FRAME 1
    … …  
    243255#endif
    244256
     257#if !defined(ENABLE_VIBRATION)
     258#define ENABLE_VIBRATION 1
     259#endif
     260
    245261#if !defined(ENABLE_VIDEO)
    246262#define ENABLE_VIDEO 0

  • trunk/Source/WebCore/ChangeLog

    r156560 r156567  
     12013-09-27  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [Nix] Updating Nix trunk files
     4        https://bugs.webkit.org/show_bug.cgi?id=121752
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        No new tests needed.
     9
     10        * page/nix/EventHandlerNix.cpp:
     11        (WebCore::EventHandler::focusDocumentView):
     12        (WebCore::EventHandler::passWheelEventToWidget):
     13        (WebCore::EventHandler::passMousePressEventToSubframe):
     14        (WebCore::EventHandler::passMouseMoveEventToSubframe):
     15        (WebCore::EventHandler::passMouseReleaseEventToSubframe):
     16        * platform/DragImage.h:
     17        * platform/graphics/GraphicsContext3D.h:
     18        * platform/nix/DragImageNix.cpp:
     19        (WebCore::createDragImageFromImage):
     20        * platform/nix/GamepadsNix.cpp:
     21        (WebCore::sampleGamepads):
     22        * platform/nix/LanguageNix.cpp:
     23        (WebCore::platformLanguage):
     24        * platform/nix/LocalizedStringsNix.cpp:
     25        (WebCore::unacceptableTLSCertificate):
     26        * platform/nix/PasteboardNix.cpp:
     27        (WebCore::Pasteboard::types):
     28        * platform/nix/RenderThemeNix.cpp:
     29        (WebCore::toColor):
     30        (WebCore::themeEngine):
     31        (WebCore::webCanvas):
     32        (WebCore::getWebThemeState):
     33        (WebCore::RenderThemeNix::paintButton):
     34        (WebCore::RenderThemeNix::paintTextField):
     35        (WebCore::RenderThemeNix::paintCheckbox):
     36        (WebCore::RenderThemeNix::paintRadio):
     37        (WebCore::RenderThemeNix::paintMenuList):
     38        (WebCore::RenderThemeNix::paintProgressBar):
     39        (WebCore::RenderThemeNix::paintInnerSpinButton):
     40        (WebCore::RenderThemeNix::paintMeter):
     41
    1422013-09-27  Anders Carlsson  <andersca@apple.com>
    243

  • trunk/Source/WebCore/page/nix/EventHandlerNix.cpp

    r155360 r156567  
    5959void EventHandler::focusDocumentView()
    6060{
    61     if (Page* page = m_frame->page())
    62         page->focusController()->setFocusedFrame(m_frame);
     61    if (Page* page = m_frame.page())
     62        page->focusController().setFocusedFrame(&m_frame);
    6363}
    6464
    … …  
    9696        return false;
    9797
    98     return static_cast<FrameView*>(widget)->frame()->eventHandler()->handleWheelEvent(event);
     98    return static_cast<FrameView*>(widget)->frame().eventHandler().handleWheelEvent(event);
    9999}
    100100
    … …  
    108108bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
    109109{
    110     subframe->eventHandler()->handleMousePressEvent(mev.event());
     110    subframe->eventHandler().handleMousePressEvent(mev.event());
    111111    return true;
    112112}
    … …  
    114114bool EventHandler::passMouseMoveEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe, HitTestResult* hoveredNode)
    115115{
    116     subframe->eventHandler()->handleMouseMoveEvent(mev.event(), hoveredNode);
     116    subframe->eventHandler().handleMouseMoveEvent(mev.event(), hoveredNode);
    117117    return true;
    118118}
    … …  
    120120bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
    121121{
    122     subframe->eventHandler()->handleMouseReleaseEvent(mev.event());
     122    subframe->eventHandler().handleMouseReleaseEvent(mev.event());
    123123    return true;
    124124}

  • trunk/Source/WebCore/platform/DragImage.h

    r156550 r156567  
    4242#elif PLATFORM(WIN)
    4343typedef struct HBITMAP__* HBITMAP;
    44 #elif PLATFORM(GTK)
     44#elif PLATFORM(GTK) || PLATFORM(NIX)
    4545typedef struct _cairo_surface cairo_surface_t;
    4646#endif
    … …  
    6060#elif PLATFORM(WIN)
    6161    typedef HBITMAP DragImageRef;
    62 #elif PLATFORM(GTK)
     62#elif PLATFORM(GTK) || PLATFORM(NIX)
    6363    typedef cairo_surface_t* DragImageRef;
    64 #elif PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(NIX)
     64#elif PLATFORM(EFL) || PLATFORM(BLACKBERRY)
    6565    typedef void* DragImageRef;
    6666#endif

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

    r156352 r156567  
    10311031#endif
    10321032
    1033 #if PLATFORM(BLACKBERRY) || (PLATFORM(QT) && defined(QT_OPENGL_ES_2)) || ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)) && USE(OPENGL_ES_2))
     1033#if PLATFORM(BLACKBERRY) || (PLATFORM(QT) && defined(QT_OPENGL_ES_2)) || ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(NIX)) && USE(OPENGL_ES_2))
    10341034    friend class Extensions3DOpenGLES;
    10351035    OwnPtr<Extensions3DOpenGLES> m_extensions;

  • trunk/Source/WebCore/platform/nix/DragImageNix.cpp

    r155360 r156567  
    5656}
    5757
    58 DragImageRef createDragImageFromImage(Image*, RespectImageOrientationEnum)
     58DragImageRef createDragImageFromImage(Image*, ImageOrientationDescription)
    5959{
    6060    notImplemented();

  • trunk/Source/WebCore/platform/nix/GamepadsNix.cpp

    r155360 r156567  
    3838void sampleGamepads(GamepadList* into)
    3939{
    40     WebKit::WebGamepads gamepads;
     40    Nix::Gamepads gamepads;
    4141
    42     WebKit::Platform::current()->sampleGamepads(gamepads);
     42    Nix::Platform::current()->sampleGamepads(gamepads);
    4343
    44     for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) {
    45         WebKit::WebGamepad& webGamepad = gamepads.items[i];
    46         if (i < gamepads.length && webGamepad.connected) {
     44    for (unsigned i = 0; i < Nix::Gamepads::itemsLengthCap; ++i) {
     45        Nix::Gamepad& nixGamepad = gamepads.items[i];
     46        if (i < gamepads.length && nixGamepad.connected) {
    4747            RefPtr<Gamepad> gamepad = into->item(i);
    4848            if (!gamepad)
    4949                gamepad = Gamepad::create();
    50             gamepad->id(webGamepad.id);
     50            gamepad->id(nixGamepad.id);
    5151            gamepad->index(i);
    52             gamepad->timestamp(webGamepad.timestamp);
    53             gamepad->axes(webGamepad.axesLength, webGamepad.axes);
    54             gamepad->buttons(webGamepad.buttonsLength, webGamepad.buttons);
     52            gamepad->timestamp(nixGamepad.timestamp);
     53            gamepad->axes(nixGamepad.axesLength, nixGamepad.axes);
     54            gamepad->buttons(nixGamepad.buttonsLength, nixGamepad.buttons);
    5555            into->set(i, gamepad);
    5656        } else

  • trunk/Source/WebCore/platform/nix/LanguageNix.cpp

    r155360 r156567  
    4242
    4343    if (!localeDefault)
    44         return ASCIIString("c");
     44        return ASCIILiteral("c");
    4545
    4646    String locale = String(localeDefault);

  • trunk/Source/WebCore/platform/nix/LocalizedStringsNix.cpp

    r155360 r156567  
    4545}
    4646
     47String unacceptableTLSCertificate()
     48{
     49    return ASCIILiteral("Unacceptable TLS certificate");
    4750}
     51
     52}

  • trunk/Source/WebCore/platform/nix/PasteboardNix.cpp

    r156550 r156567  
    2525#include "Pasteboard.h"
    2626
    27 #include "DocumentFragment.h"
    2827#include "NotImplemented.h"
    29 #include <wtf/text/StringHash.h>
     28
     29using namespace WTF;
    3030
    3131namespace WebCore {
    32 
    33 Pasteboard* Pasteboard::generalPasteboard()
    34 {
    35     static Pasteboard* pasteboard = new Pasteboard();
    36     return pasteboard;
    37 }
    3832
    3933Pasteboard::Pasteboard()
    … …  
    4741}
    4842
    49 void Pasteboard::writeSelection(Range*, bool, Frame*, ShouldSerializeSelectedTextForClipboard)
    50 {
    51     notImplemented();
    52 }
    53 
    5443void Pasteboard::write(const PasteboardURL&)
    55 {
    56     notImplemented();
    57 }
    58 
    59 void Pasteboard::writeImage(Node*, const URL&, const String&)
    60 {
    61     notImplemented();
    62 }
    63 
    64 void Pasteboard::writeClipboard(Clipboard*)
    6544{
    6645    notImplemented();
    … …  
    7655    notImplemented();
    7756    return false;
    78 }
    79 
    80 PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame*, PassRefPtr<Range>, bool, bool&)
    81 {
    82     notImplemented();
    83     return 0;
    8457}
    8558
    … …  
    134107}
    135108
    136 ListHashSet<String> Pasteboard::types()
     109Vector<String> Pasteboard::types()
    137110{
    138111    notImplemented();
    139     return ListHashSet<String>();
     112    return Vector<String>();
    140113}
    141114

  • trunk/Source/WebCore/platform/nix/RenderThemeNix.cpp

    r152428 r156567  
    3030#include "PaintInfo.h"
    3131#include "PlatformContextCairo.h"
     32#include "public/Canvas.h"
    3233#include "public/Platform.h"
    33 #include "public/WebCanvas.h"
    34 #include "public/WebRect.h"
    35 #include "public/WebThemeEngine.h"
     34#include "public/Rect.h"
     35#include "public/ThemeEngine.h"
    3636#if ENABLE(PROGRESS_ELEMENT)
    3737#include "RenderProgress.h"
    … …  
    5454}
    5555
    56 Color toColor(const WebKit::WebColor& color)
     56Color toColor(const Nix::Color& color)
    5757{
    5858    return WebCore::Color(RGBA32(color));
    5959}
    6060
    61 static WebKit::WebThemeEngine* themeEngine()
    62 {
    63     return WebKit::Platform::current()->themeEngine();
    64 }
    65 
    66 static WebKit::WebCanvas* webCanvas(const PaintInfo& info)
     61static Nix::ThemeEngine* themeEngine()
     62{
     63    return Nix::Platform::current()->themeEngine();
     64}
     65
     66static Nix::Canvas* webCanvas(const PaintInfo& info)
    6767{
    6868    return info.context->platformContext()->cr();
    … …  
    170170}
    171171
    172 static WebKit::WebThemeEngine::State getWebThemeState(const RenderTheme* theme, const RenderObject* o)
     172static Nix::ThemeEngine::State getWebThemeState(const RenderTheme* theme, const RenderObject* o)
    173173{
    174174    if (!theme->isEnabled(o))
    175         return WebKit::WebThemeEngine::StateDisabled;
     175        return Nix::ThemeEngine::StateDisabled;
    176176    if (theme->isPressed(o))
    177         return WebKit::WebThemeEngine::StatePressed;
     177        return Nix::ThemeEngine::StatePressed;
    178178    if (theme->isHovered(o))
    179         return WebKit::WebThemeEngine::StateHover;
    180 
    181     return WebKit::WebThemeEngine::StateNormal;
     179        return Nix::ThemeEngine::StateHover;
     180
     181    return Nix::ThemeEngine::StateNormal;
    182182}
    183183
    184184bool RenderThemeNix::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    185185{
    186     WebKit::WebThemeEngine::ButtonExtraParams extraParams;
     186    Nix::ThemeEngine::ButtonExtraParams extraParams;
    187187    extraParams.isDefault = isDefault(o);
    188188    extraParams.hasBorder = true;
    … …  
    191191        extraParams.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
    192192
    193     themeEngine()->paintButton(webCanvas(i), getWebThemeState(this, o), WebKit::WebRect(rect), extraParams);
     193    themeEngine()->paintButton(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
    194194    return false;
    195195}
    … …  
    202202        return true;
    203203
    204     themeEngine()->paintTextField(webCanvas(i), getWebThemeState(this, o), WebKit::WebRect(rect));
     204    themeEngine()->paintTextField(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect));
    205205    return false;
    206206}
    … …  
    213213bool RenderThemeNix::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    214214{
    215     WebKit::WebThemeEngine::ButtonExtraParams extraParams;
     215    Nix::ThemeEngine::ButtonExtraParams extraParams;
    216216    extraParams.checked = isChecked(o);
    217217    extraParams.indeterminate = isIndeterminate(o);
    218218
    219     themeEngine()->paintCheckbox(webCanvas(i), getWebThemeState(this, o), WebKit::WebRect(rect), extraParams);
     219    themeEngine()->paintCheckbox(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
    220220    return false;
    221221}
    … …  
    233233bool RenderThemeNix::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    234234{
    235     WebKit::WebThemeEngine::ButtonExtraParams extraParams;
     235    Nix::ThemeEngine::ButtonExtraParams extraParams;
    236236    extraParams.checked = isChecked(o);
    237237    extraParams.indeterminate = isIndeterminate(o);
    238238
    239     themeEngine()->paintRadio(webCanvas(i), getWebThemeState(this, o), WebKit::WebRect(rect), extraParams);
     239    themeEngine()->paintRadio(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
    240240    return false;
    241241}
    … …  
    253253bool RenderThemeNix::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    254254{
    255     themeEngine()->paintMenuList(webCanvas(i), getWebThemeState(this, o), WebKit::WebRect(rect));
     255    themeEngine()->paintMenuList(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect));
    256256    return false;
    257257}
    … …  
    282282{
    283283    RenderProgress* renderProgress = toRenderProgress(o);
    284     WebKit::WebThemeEngine::ProgressBarExtraParams extraParams;
     284    Nix::ThemeEngine::ProgressBarExtraParams extraParams;
    285285    extraParams.isDeterminate = renderProgress->isDeterminate();
    286286    extraParams.position = renderProgress->position();
    287287    extraParams.animationProgress = renderProgress->animationProgress();
    288288    extraParams.animationStartTime = renderProgress->animationStartTime();
    289     themeEngine()->paintProgressBar(webCanvas(i), getWebThemeState(this, o), WebKit::WebRect(rect), extraParams);
     289    themeEngine()->paintProgressBar(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
    290290
    291291    return false;
    … …  
    385385bool RenderThemeNix::paintInnerSpinButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    386386{
    387     WebKit::WebThemeEngine::InnerSpinButtonExtraParams extraParams;
     387    Nix::ThemeEngine::InnerSpinButtonExtraParams extraParams;
    388388    extraParams.spinUp = isSpinUpButtonPartPressed(o);
    389389    extraParams.readOnly = isReadOnlyControl(o);
    390390
    391     themeEngine()->paintInnerSpinButton(webCanvas(i), getWebThemeState(this, o), WebKit::WebRect(rect), extraParams);
     391    themeEngine()->paintInnerSpinButton(webCanvas(i), getWebThemeState(this, o), Nix::Rect(rect), extraParams);
    392392    return false;
    393393}
    … …  
    425425    RenderMeter* renderMeter = toRenderMeter(o);
    426426    HTMLMeterElement* e = renderMeter->meterElement();
    427     WebKit::WebThemeEngine::MeterExtraParams extraParams;
     427    Nix::ThemeEngine::MeterExtraParams extraParams;
    428428    extraParams.min = e->min();
    429429    extraParams.max = e->max();
Note: See TracChangeset for help on using the changeset viewer.