Changeset 84538 in webkit
- Timestamp:
- Apr 21, 2011 12:27:29 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r84535 r84538 1 2011-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 1 26 2011-04-21 Mike Reed <reed@google.com> 2 27 -
trunk/Source/WebCore/loader/DocumentLoader.cpp
r82580 r84538 480 480 PassRefPtr<Archive> DocumentLoader::popArchiveForSubframe(const String& frameName) 481 481 { 482 return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName) : 0;482 return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName) : PassRefPtr<Archive>(0); 483 483 } 484 484 -
trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp
r79434 r84538 77 77 { 78 78 RawDataCreationFunction* function = mimeType.isEmpty() ? 0 : archiveMIMETypes().get(mimeType); 79 return function ? function(data) : 0;79 return function ? function(data) : PassRefPtr<Archive>(0); 80 80 } 81 81 -
trunk/Source/WebCore/loader/icon/IconDatabase.cpp
r84371 r84538 512 512 return; 513 513 514 RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : 0;514 RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : PassRefPtr<SharedBuffer>(0); 515 515 String iconURL = iconURLOriginal.crossThreadString(); 516 516 -
trunk/Source/WebCore/page/animation/AnimationBase.cpp
r83555 r84538 167 167 RefPtr<TransformOperation> fromOp = (i < fromSize) ? from.operations()[i].get() : 0; 168 168 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)); 170 170 if (blendedOp) 171 171 result.operations().append(blendedOp); -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r84504 r84538 4022 4022 { 4023 4023 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); 4025 4025 if (corner) { 4026 4026 if (!m_scrollCorner) { … … 4038 4038 { 4039 4039 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); 4041 4041 if (resizer) { 4042 4042 if (!m_resizer) { -
trunk/Source/WebCore/rendering/RenderScrollbar.cpp
r76378 r84538 230 230 return; 231 231 232 RefPtr<RenderStyle> partStyle = !destroy ? getScrollbarPseudoStyle(partType, pseudoForScrollbarPart(partType)) : 0;232 RefPtr<RenderStyle> partStyle = !destroy ? getScrollbarPseudoStyle(partType, pseudoForScrollbarPart(partType)) : PassRefPtr<RenderStyle>(0); 233 233 234 234 bool needRenderer = !destroy && partStyle && partStyle->display() != NONE && partStyle->visibility() == VISIBLE; -
trunk/Source/WebCore/rendering/RenderTextFragment.cpp
r70797 r84538 30 30 31 31 RenderTextFragment::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)) 33 33 , m_start(startOffset) 34 34 , m_end(length)
Note: See TracChangeset
for help on using the changeset viewer.