Changeset 69109 in webkit


Ignore:
Timestamp:
Oct 5, 2010 8:32:22 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-05 Philippe Normand <​pnormand@igalia.com>

Reviewed by Martin Robinson.

check for ENABLE(GLIB_SUPPORT) in WebView
​https://bugs.webkit.org/show_bug.cgi?id=46788

Use ENABLE(GLIB_SUPPORT) in WebView to guard the glib runloop observer.

  • WebView/WebView.mm: (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]): (-[WebView _close]):
  • WebView/WebViewData.h:
  • WebView/WebViewInternal.h:
Location:
trunk/WebKit/mac
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/mac/ChangeLog

    r68956 r69109  
     12010-10-05  Philippe Normand  <pnormand@igalia.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        check for ENABLE(GLIB_SUPPORT) in WebView
     6        https://bugs.webkit.org/show_bug.cgi?id=46788
     7
     8        Use ENABLE(GLIB_SUPPORT) in WebView to guard the glib runloop observer.
     9
     10        * WebView/WebView.mm:
     11        (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
     12        (-[WebView _close]):
     13        * WebView/WebViewData.h:
     14        * WebView/WebViewInternal.h:
     15
    1162010-10-01  Anders Carlsson  <andersca@apple.com>
    217

  • trunk/WebKit/mac/WebView/WebView.mm

    r68475 r69109  
    191191#endif
    192192
    193 #if ENABLE(VIDEO) && USE(GSTREAMER)
     193#if ENABLE(GLIB_SUPPORT)
    194194#import <glib.h>
    195195#endif
    … …  
    386386- (void)_clearLayerSyncLoopObserver;
    387387#endif
    388 #if ENABLE(VIDEO) && USE(GSTREAMER)
     388#if ENABLE(GLIB_SUPPORT)
    389389- (void)_clearGlibLoopObserver;
    390390#endif
    … …  
    751751        ResourceHandle::forceContentSniffing();
    752752
    753 #if ENABLE(VIDEO) && USE(GSTREAMER)
     753#if ENABLE(GLIB_SUPPORT)
    754754    [self _scheduleGlibContextIterations];
    755755#endif
    … …  
    11521152#endif
    11531153   
    1154 #if ENABLE(VIDEO) && USE(GSTREAMER)
     1154#if ENABLE(GLIB_SUPPORT)
    11551155    [self _clearGlibLoopObserver];
    11561156#endif
    … …  
    56335633#endif
    56345634
    5635 #if ENABLE(VIDEO) && USE(GSTREAMER)
     5635#if ENABLE(GLIB_SUPPORT)
    56365636- (void)_clearGlibLoopObserver
    56375637{
    … …  
    59565956#endif
    59575957
    5958 #if ENABLE(VIDEO) && USE(GSTREAMER)
     5958#if ENABLE(GLIB_SUPPORT)
    59595959
    59605960static void glibContextIterationCallback(CFRunLoopObserverRef, CFRunLoopActivity, void*)

  • trunk/WebKit/mac/WebView/WebViewData.h

    r67274 r69109  
    173173#endif
    174174
    175 #if ENABLE(VIDEO) && USE(GSTREAMER)
     175#if ENABLE(GLIB_SUPPORT)
    176176    CFRunLoopObserverRef glibRunLoopObserver;
    177177#endif

  • trunk/WebKit/mac/WebView/WebViewInternal.h

    r65021 r69109  
    8989#endif
    9090
    91 #if ENABLE(VIDEO) && USE(GSTREAMER)
     91#if ENABLE(GLIB_SUPPORT)
    9292- (void)_scheduleGlibContextIterations;
    9393#endif
Note: See TracChangeset for help on using the changeset viewer.