Changeset 84538 in webkit


Ignore:
Timestamp:
Apr 21, 2011 12:27:29 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-21 Ben Taylor <bentaylor.solx86@gmail.com>

Reviewed by Alexey Proskuryakov.

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

Fix a compile issue on Solaris 10 with Sun Studio 12,
ternary operators (?:) must have the same types

  • loader/DocumentLoader.cpp: (WebCore::DocumentLoader::popArchiveForSubframe):
  • loader/archive/ArchiveFactory.cpp: (WebCore::ArchiveFactory::create):
  • loader/icon/IconDatabase.cpp: (WebCore::IconDatabase::setIconDataForIconURL):
  • page/animation/AnimationBase.cpp: (WebCore::blendFunc):
  • rendering/RenderLayer.cpp: (WebCore::RenderLayer::updateScrollCornerStyle): (WebCore::RenderLayer::updateResizerStyle):
  • rendering/RenderScrollbar.cpp: (WebCore::RenderScrollbar::updateScrollbarPart):
  • rendering/RenderTextFragment.cpp: (WebCore::RenderTextFragment::RenderTextFragment):
Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r84535 r84538  
     12011-04-21  Ben Taylor  <bentaylor.solx86@gmail.com>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=58725
     6
     7        Fix a compile issue on Solaris 10 with Sun Studio 12,
     8        ternary operators (?:) must have the same types
     9
     10        * loader/DocumentLoader.cpp:
     11        (WebCore::DocumentLoader::popArchiveForSubframe):
     12        * loader/archive/ArchiveFactory.cpp:
     13        (WebCore::ArchiveFactory::create):
     14        * loader/icon/IconDatabase.cpp:
     15        (WebCore::IconDatabase::setIconDataForIconURL):
     16        * page/animation/AnimationBase.cpp:
     17        (WebCore::blendFunc):
     18        * rendering/RenderLayer.cpp:
     19        (WebCore::RenderLayer::updateScrollCornerStyle):
     20        (WebCore::RenderLayer::updateResizerStyle):
     21        * rendering/RenderScrollbar.cpp:
     22        (WebCore::RenderScrollbar::updateScrollbarPart):
     23        * rendering/RenderTextFragment.cpp:
     24        (WebCore::RenderTextFragment::RenderTextFragment):
     25
    1262011-04-21  Mike Reed  <reed@google.com>
    227
  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r82580 r84538  
    480480PassRefPtr<Archive> DocumentLoader::popArchiveForSubframe(const String& frameName)
    481481{
    482     return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName) : 0;
     482    return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName) : PassRefPtr<Archive>(0);
    483483}
    484484
  • trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp

    r79434 r84538  
    7777{
    7878    RawDataCreationFunction* function = mimeType.isEmpty() ? 0 : archiveMIMETypes().get(mimeType);
    79     return function ? function(data) : 0;
     79    return function ? function(data) : PassRefPtr<Archive>(0);
    8080}
    8181
  • trunk/Source/WebCore/loader/icon/IconDatabase.cpp

    r84371 r84538  
    512512        return;
    513513   
    514     RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : 0;
     514    RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : PassRefPtr<SharedBuffer>(0);
    515515    String iconURL = iconURLOriginal.crossThreadString();
    516516   
  • trunk/Source/WebCore/page/animation/AnimationBase.cpp

    r83555 r84538  
    167167            RefPtr<TransformOperation> fromOp = (i < fromSize) ? from.operations()[i].get() : 0;
    168168            RefPtr<TransformOperation> toOp = (i < toSize) ? to.operations()[i].get() : 0;
    169             RefPtr<TransformOperation> blendedOp = toOp ? toOp->blend(fromOp.get(), progress) : (fromOp ? fromOp->blend(0, progress, true) : 0);
     169            RefPtr<TransformOperation> blendedOp = toOp ? toOp->blend(fromOp.get(), progress) : (fromOp ? fromOp->blend(0, progress, true) : PassRefPtr<TransformOperation>(0));
    170170            if (blendedOp)
    171171                result.operations().append(blendedOp);
  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r84504 r84538  
    40224022{
    40234023    RenderObject* actualRenderer = renderer()->node() ? renderer()->node()->shadowAncestorNode()->renderer() : renderer();
    4024     RefPtr<RenderStyle> corner = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(SCROLLBAR_CORNER, actualRenderer->style()) : 0;
     4024    RefPtr<RenderStyle> corner = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(SCROLLBAR_CORNER, actualRenderer->style()) : PassRefPtr<RenderStyle>(0);
    40254025    if (corner) {
    40264026        if (!m_scrollCorner) {
     
    40384038{
    40394039    RenderObject* actualRenderer = renderer()->node() ? renderer()->node()->shadowAncestorNode()->renderer() : renderer();
    4040     RefPtr<RenderStyle> resizer = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(RESIZER, actualRenderer->style()) : 0;
     4040    RefPtr<RenderStyle> resizer = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(RESIZER, actualRenderer->style()) : PassRefPtr<RenderStyle>(0);
    40414041    if (resizer) {
    40424042        if (!m_resizer) {
  • trunk/Source/WebCore/rendering/RenderScrollbar.cpp

    r76378 r84538  
    230230        return;
    231231
    232     RefPtr<RenderStyle> partStyle = !destroy ? getScrollbarPseudoStyle(partType,  pseudoForScrollbarPart(partType)) : 0;
     232    RefPtr<RenderStyle> partStyle = !destroy ? getScrollbarPseudoStyle(partType,  pseudoForScrollbarPart(partType)) : PassRefPtr<RenderStyle>(0);
    233233   
    234234    bool needRenderer = !destroy && partStyle && partStyle->display() != NONE && partStyle->visibility() == VISIBLE;
  • trunk/Source/WebCore/rendering/RenderTextFragment.cpp

    r70797 r84538  
    3030
    3131RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str, int startOffset, int length)
    32     : RenderText(node, str ? str->substring(startOffset, length) : 0)
     32    : RenderText(node, str ? str->substring(startOffset, length) : PassRefPtr<StringImpl>(0))
    3333    , m_start(startOffset)
    3434    , m_end(length)
Note: See TracChangeset for help on using the changeset viewer.