Changeset 105032 in webkit


Ignore:
Timestamp:
Jan 15, 2012 12:14:31 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Fix compilation errors on build-webkit --debug --no-video on mac.
https://bugs.webkit.org/show_bug.cgi?id=75867

Patch by Pablo Flouret <pablof@motorola.com> on 2012-01-15
Reviewed by Philippe Normand.

Source/JavaScriptCore:

Make ENABLE_VIDEO_TRACK conditional on ENABLE_VIDEO, video track feature
doesn't build without video.

  • wtf/Platform.h:

Source/WebCore:

  • Some exported HTMLMediaElement symbols were guarded by FULLSCREEN_API feature instead of VIDEO.
  • Unused parameter warning in CanvasRenderingContext::wouldTaintOrigin().
  • RenderThemeMac::shouldShowPlaceholderWhenFocused() implementation wrongly guarded by VIDEO feature.
  • WebCore.exp.in:
  • html/canvas/CanvasRenderingContext.cpp:

(WebCore::CanvasRenderingContext::wouldTaintOrigin):

  • rendering/RenderThemeMac.mm:

Source/WebKit/mac:

  • WebChromeClient::fullScreenRendererChanged() declaration wrongly guarded by VIDEO feature instead of FULLSCREEN_API.
  • _isAnyMoviePlaying implementation depends on VIDEO.
  • WebCoreSupport/WebChromeClient.h:
  • WebView/WebFullScreenController.mm:

(-[WebFullScreenController _isAnyMoviePlaying]):

Tools:

Add --[no-]video-track to build-webkit, since video track feature
depends on video.

  • Scripts/build-webkit:
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r105028 r105032  
     12012-01-15  Pablo Flouret  <pablof@motorola.com>
     2
     3        Fix compilation errors on build-webkit --debug --no-video on mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=75867
     5
     6        Reviewed by Philippe Normand.
     7
     8        Make ENABLE_VIDEO_TRACK conditional on ENABLE_VIDEO, video track feature
     9        doesn't build without video.
     10
     11        * wtf/Platform.h:
     12
    1132012-01-14  David Levin  <levin@chromium.org>
    214
  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r104981 r105032  
    544544#define ENABLE_WEB_ARCHIVE 1
    545545#define ENABLE_WEB_AUDIO 1
     546#if defined(ENABLE_VIDEO)
    546547#define ENABLE_VIDEO_TRACK 1
     548#endif
    547549#endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
    548550
  • trunk/Source/WebCore/ChangeLog

    r105031 r105032  
     12012-01-15  Pablo Flouret  <pablof@motorola.com>
     2
     3        Fix compilation errors on build-webkit --debug --no-video on mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=75867
     5
     6        Reviewed by Philippe Normand.
     7
     8        - Some exported HTMLMediaElement symbols were guarded by FULLSCREEN_API
     9          feature instead of VIDEO.
     10        - Unused parameter warning in CanvasRenderingContext::wouldTaintOrigin().
     11        - RenderThemeMac::shouldShowPlaceholderWhenFocused() implementation
     12          wrongly guarded by VIDEO feature.
     13
     14        * WebCore.exp.in:
     15        * html/canvas/CanvasRenderingContext.cpp:
     16        (WebCore::CanvasRenderingContext::wouldTaintOrigin):
     17        * rendering/RenderThemeMac.mm:
     18
    1192012-01-15  Andreas Kling  <awesomekling@apple.com>
    220
  • trunk/Source/WebCore/WebCore.exp.in

    r104965 r105032  
    19311931__ZN7WebCore16HTMLMediaElement16returnToRealtimeEv
    19321932__ZNK7WebCore16HTMLMediaElement12isFullscreenEv
     1933__ZNK7WebCore16HTMLMediaElement5endedEv
     1934__ZNK7WebCore16HTMLMediaElement6pausedEv
    19331935.objc_class_name_WebVideoFullscreenController
    19341936#endif
     
    19481950__ZN7WebCore8Document36setFullScreenRendererBackgroundColorENS_5ColorE
    19491951__ZNK7WebCore8Document9domWindowEv
    1950 __ZNK7WebCore16HTMLMediaElement5endedEv
    1951 __ZNK7WebCore16HTMLMediaElement6pausedEv
    19521952__ZNK7WebCore4Node16traverseNextNodeEPKS0_
    19531953#endif
  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp

    r103366 r105032  
    8383    if (!video->hasSingleSecurityOrigin())
    8484        return true;
     85#else
     86    UNUSED_PARAM(video);
    8587#endif
    8688
  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r104332 r105032  
    20302030}
    20312031
     2032#endif // ENABLE(VIDEO)
     2033
    20322034bool RenderThemeMac::shouldShowPlaceholderWhenFocused() const
    20332035{
     
    20382040#endif
    20392041}
    2040 
    2041 #endif // ENABLE(VIDEO)
    20422042
    20432043NSPopUpButtonCell* RenderThemeMac::popupButton() const
  • trunk/Source/WebKit/mac/ChangeLog

    r104773 r105032  
     12012-01-15  Pablo Flouret  <pablof@motorola.com>
     2
     3        Fix compilation errors on build-webkit --debug --no-video on mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=75867
     5
     6        Reviewed by Philippe Normand.
     7
     8        - WebChromeClient::fullScreenRendererChanged() declaration wrongly guarded
     9          by VIDEO feature instead of FULLSCREEN_API.
     10        - _isAnyMoviePlaying implementation depends on VIDEO.
     11
     12        * WebCoreSupport/WebChromeClient.h:
     13        * WebView/WebFullScreenController.mm:
     14        (-[WebFullScreenController _isAnyMoviePlaying]):
     15
    1162012-01-11  Beth Dakin  <bdakin@apple.com>
    217
  • trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h

    r104656 r105032  
    165165    virtual void enterFullscreenForNode(WebCore::Node*) OVERRIDE;
    166166    virtual void exitFullscreenForNode(WebCore::Node*) OVERRIDE;
    167     virtual void fullScreenRendererChanged(WebCore::RenderBox*) OVERRIDE;
    168167#endif
    169168   
     
    172171    virtual void enterFullScreenForElement(WebCore::Element*) OVERRIDE;
    173172    virtual void exitFullScreenForElement(WebCore::Element*) OVERRIDE;
     173    virtual void fullScreenRendererChanged(WebCore::RenderBox*) OVERRIDE;
    174174#endif
    175175
  • trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm

    r95901 r105032  
    670670- (BOOL)_isAnyMoviePlaying
    671671{
     672#if ENABLE(VIDEO)
    672673    if (!_element)
    673674        return NO;
     
    684685        nextNode = nextNode->traverseNextNode(_element.get());
    685686    }
     687#endif
    686688   
    687689    return NO;
  • trunk/Tools/ChangeLog

    r105022 r105032  
     12012-01-15  Pablo Flouret  <pablof@motorola.com>
     2
     3        Fix compilation errors on build-webkit --debug --no-video on mac.
     4        https://bugs.webkit.org/show_bug.cgi?id=75867
     5
     6        Reviewed by Philippe Normand.
     7
     8        Add --[no-]video-track to build-webkit, since video track feature
     9        depends on video.
     10
     11        * Scripts/build-webkit:
     12
    1132012-01-14  James Robinson  <jamesr@chromium.org>
    214
  • trunk/Tools/Scripts/build-webkit

    r104386 r105032  
    128128    $touchIconLoadingSupport,
    129129    $videoSupport,
     130    $videoTrackSupport,
    130131    $webAudioSupport,
    131132    $webInspectorSupport,
     
    322323    { option => "video", desc => "Toggle Video support",
    323324      define => "ENABLE_VIDEO", default => (isAppleWebKit() || isGtk() || isBlackBerry()), value => \$videoSupport },
     325
     326    { option => "video-track", desc => "Toggle Video Track support",
     327      define => "ENABLE_VIDEO_TRACK", default => isAppleWebKit(), value => \$videoTrackSupport },
    324328
    325329    { option => "web-audio", desc => "Toggle Web Audio support",
Note: See TracChangeset for help on using the changeset viewer.