⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 100068 in webkit


Ignore:
Timestamp:
Nov 11, 2011, 8:45:00 PM (15 years ago)
Author:
nduca@chromium.org
Message:

Since GraphicsContext3D::makeContextCurrent can fail, return bool.

​https://bugs.webkit.org/show_bug.cgi?id=72101

Reviewed by Kenneth Russell.

Source/WebCore:

  • platform/graphics/GraphicsContext3D.h:
  • platform/graphics/efl/GraphicsContext3DEfl.cpp:

(WebCore::GraphicsContext3D::makeContextCurrent):

  • platform/graphics/gtk/GraphicsContext3DGtk.cpp:

(WebCore::GraphicsContext3D::makeContextCurrent):

  • platform/graphics/gtk/GraphicsContext3DPrivate.cpp:

(WebCore::GraphicsContext3DPrivate::makeContextCurrent):

  • platform/graphics/gtk/GraphicsContext3DPrivate.h:
  • platform/graphics/mac/GraphicsContext3DMac.mm:

(WebCore::GraphicsContext3D::makeContextCurrent):

  • platform/graphics/qt/GraphicsContext3DQt.cpp:

(WebCore::GraphicsContext3D::makeContextCurrent):

Source/WebKit/chromium:

  • src/GraphicsContext3DChromium.cpp:
Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r100067 r100068  
     12011-11-11  Nat Duca  <nduca@chromium.org>
     2
     3        Since GraphicsContext3D::makeContextCurrent can fail, return bool.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=72101
     6
     7        Reviewed by Kenneth Russell.
     8
     9        * platform/graphics/GraphicsContext3D.h:
     10        * platform/graphics/efl/GraphicsContext3DEfl.cpp:
     11        (WebCore::GraphicsContext3D::makeContextCurrent):
     12        * platform/graphics/gtk/GraphicsContext3DGtk.cpp:
     13        (WebCore::GraphicsContext3D::makeContextCurrent):
     14        * platform/graphics/gtk/GraphicsContext3DPrivate.cpp:
     15        (WebCore::GraphicsContext3DPrivate::makeContextCurrent):
     16        * platform/graphics/gtk/GraphicsContext3DPrivate.h:
     17        * platform/graphics/mac/GraphicsContext3DMac.mm:
     18        (WebCore::GraphicsContext3D::makeContextCurrent):
     19        * platform/graphics/qt/GraphicsContext3DQt.cpp:
     20        (WebCore::GraphicsContext3D::makeContextCurrent):
     21
    1222011-11-11  Ojan Vafai  <ojan@chromium.org>
    223

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

    r100032 r100068  
    499499#endif
    500500#endif
    501     void makeContextCurrent();
     501    bool makeContextCurrent();
    502502
    503503#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(GTK) || PLATFORM(QT)

  • trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp

    r100032 r100068  
    6666#endif
    6767
    68 void GraphicsContext3D::makeContextCurrent()
     68bool GraphicsContext3D::makeContextCurrent()
    6969{
    7070    m_internal->makeContextCurrent();
     71    return true;
    7172}
    7273

  • trunk/Source/WebCore/platform/graphics/gtk/GraphicsContext3DGtk.cpp

    r95901 r100068  
    136136}
    137137
    138 void GraphicsContext3D::makeContextCurrent()
     138bool GraphicsContext3D::makeContextCurrent()
    139139{
    140140    if (!m_private)
    141141        return;
    142     m_private->makeContextCurrent();
     142    return m_private->makeContextCurrent();
    143143}
    144144

  • trunk/Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.cpp

    r95901 r100068  
    235235}
    236236
    237 void GraphicsContext3DPrivate::makeContextCurrent()
     237bool GraphicsContext3DPrivate::makeContextCurrent()
    238238{
    239239    if (::glXGetCurrentContext() == m_context)

  • trunk/Source/WebCore/platform/graphics/gtk/GraphicsContext3DPrivate.h

    r95901 r100068  
    3737    static PassOwnPtr<GraphicsContext3DPrivate> create();
    3838    ~GraphicsContext3DPrivate();
    39     void makeContextCurrent();
     39    bool makeContextCurrent();
    4040
    4141    private:

  • trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm

    r95901 r100068  
    259259}
    260260
    261 void GraphicsContext3D::makeContextCurrent()
     261bool GraphicsContext3D::makeContextCurrent()
    262262{
    263263    if (!m_contextObj)
    264         return;
     264        return false;
    265265
    266266    CGLContextObj currentContext = CGLGetCurrentContext();
    267267    if (currentContext != m_contextObj)
    268268        CGLSetCurrentContext(m_contextObj);
     269    return true;
    269270}
    270271

  • trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

    r100032 r100068  
    416416#endif
    417417
    418 void GraphicsContext3D::makeContextCurrent()
    419 {
    420     m_private->m_glWidget->makeCurrent();
     418bool GraphicsContext3D::makeContextCurrent()
     419{
     420    m_private->m_glWidget->makeCurrent();
     421    return true;
    421422}
    422423

  • trunk/Source/WebKit/chromium/ChangeLog

    r100062 r100068  
     12011-11-11  Nat Duca  <nduca@chromium.org>
     2
     3        Since GraphicsContext3D::makeContextCurrent can fail, return bool.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=72101
     6
     7        Reviewed by Kenneth Russell.
     8
     9        * src/GraphicsContext3DChromium.cpp:
     10
    1112011-11-11  Ojan Vafai  <ojan@chromium.org>
    212

  • trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

    r100032 r100068  
    10671067#endif
    10681068
    1069 DELEGATE_TO_INTERNAL(makeContextCurrent)
     1069DELEGATE_TO_INTERNAL_R(makeContextCurrent, bool)
    10701070DELEGATE_TO_INTERNAL_2(reshape, int, int)
    10711071
Note: See TracChangeset for help on using the changeset viewer.