Changeset 141632 in webkit
- Timestamp:
- Feb 1, 2013 1:08:31 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r141619 r141632 1 2013-02-01 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> 2 3 [Qt] [WK2] Fix build after r141619 4 https://bugs.webkit.org/show_bug.cgi?id=108680 5 6 Reviewed by Benjamin Poulain. 7 8 Take a reference instead of a pointer for decoding functions. 9 10 * Platform/unix/SharedMemoryUnix.cpp: 11 (WebKit::SharedMemory::Handle::decode): 12 * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp: 13 (CoreIPC::::decode): 14 (CoreIPC::decodeTimingFunction): 15 * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h: 16 * Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp: 17 (WebKit::WebCoordinatedSurface::Handle::decode): 18 * Shared/CoordinatedGraphics/WebCoordinatedSurface.h: 19 (Handle): 20 * Shared/qt/ArgumentCodersQt.cpp: 21 (CoreIPC::::decode): 22 * Shared/qt/ArgumentCodersQt.h: 23 (CoreIPC): 24 * Shared/qt/LayerTreeContextQt.cpp: 25 (WebKit::LayerTreeContext::decode): 26 * Shared/qt/PlatformCertificateInfo.h: 27 (WebKit::PlatformCertificateInfo::decode): 28 * Shared/qt/QtNetworkReplyData.cpp: 29 (WebKit::QtNetworkReplyData::decode): 30 * Shared/qt/QtNetworkReplyData.h: 31 (QtNetworkReplyData): 32 * Shared/qt/QtNetworkRequestData.cpp: 33 (WebKit::QtNetworkRequestData::decode): 34 * Shared/qt/QtNetworkRequestData.h: 35 (QtNetworkRequestData): 36 * Shared/qt/WebCoreArgumentCodersQt.cpp: 37 (CoreIPC::::decodePlatformData): 38 1 39 2013-02-01 Anders Carlsson <andersca@apple.com> 2 40 -
trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp
r132361 r141632 69 69 } 70 70 71 bool SharedMemory::Handle::decode(CoreIPC::ArgumentDecoder *decoder, Handle& handle)71 bool SharedMemory::Handle::decode(CoreIPC::ArgumentDecoder& decoder, Handle& handle) 72 72 { 73 73 ASSERT_ARG(handle, !handle.m_size); … … 75 75 76 76 CoreIPC::Attachment attachment; 77 if (!decoder ->decode(attachment))77 if (!decoder.decode(attachment)) 78 78 return false; 79 79 -
trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp
r141543 r141632 85 85 } 86 86 87 bool ArgumentCoder<FloatPoint3D>::decode(ArgumentDecoder *decoder, FloatPoint3D& floatPoint3D)87 bool ArgumentCoder<FloatPoint3D>::decode(ArgumentDecoder& decoder, FloatPoint3D& floatPoint3D) 88 88 { 89 89 return SimpleArgumentCoder<FloatPoint3D>::decode(decoder, floatPoint3D); … … 95 95 } 96 96 97 bool ArgumentCoder<Length>::decode(ArgumentDecoder *decoder, Length& length)97 bool ArgumentCoder<Length>::decode(ArgumentDecoder& decoder, Length& length) 98 98 { 99 99 return SimpleArgumentCoder<Length>::decode(decoder, length); … … 105 105 } 106 106 107 bool ArgumentCoder<TransformationMatrix>::decode(ArgumentDecoder *decoder, TransformationMatrix& transformationMatrix)107 bool ArgumentCoder<TransformationMatrix>::decode(ArgumentDecoder& decoder, TransformationMatrix& transformationMatrix) 108 108 { 109 109 return SimpleArgumentCoder<TransformationMatrix>::decode(decoder, transformationMatrix); … … 200 200 } 201 201 202 bool ArgumentCoder<WebCore::FilterOperations>::decode(ArgumentDecoder *decoder, WebCore::FilterOperations& filters)202 bool ArgumentCoder<WebCore::FilterOperations>::decode(ArgumentDecoder& decoder, WebCore::FilterOperations& filters) 203 203 { 204 204 uint32_t size; 205 if (!decoder ->decode(size))205 if (!decoder.decode(size)) 206 206 return false; 207 207 … … 211 211 FilterOperation::OperationType type; 212 212 RefPtr<FilterOperation> filter; 213 if (!decoder ->decodeEnum(type))213 if (!decoder.decodeEnum(type)) 214 214 return false; 215 215 … … 220 220 case FilterOperation::HUE_ROTATE: { 221 221 double value; 222 if (!decoder ->decode(value))222 if (!decoder.decode(value)) 223 223 return false; 224 224 filter = BasicColorMatrixFilterOperation::create(value, type); … … 230 230 case FilterOperation::OPACITY: { 231 231 double value; 232 if (!decoder ->decode(value))232 if (!decoder.decode(value)) 233 233 return false; 234 234 filter = BasicComponentTransferFilterOperation::create(value, type); … … 248 248 if (!ArgumentCoder<IntPoint>::decode(decoder, location)) 249 249 return false; 250 if (!decoder ->decode(stdDeviation))250 if (!decoder.decode(stdDeviation)) 251 251 return false; 252 252 if (!ArgumentCoder<Color>::decode(decoder, color)) … … 264 264 // https://bugs.webkit.org/show_bug.cgi?id=102529 265 265 CustomFilterMeshType meshType; 266 if (!decoder ->decodeEnum(meshType))266 if (!decoder.decodeEnum(meshType)) 267 267 return false; 268 268 int programID = 0; 269 if (!decoder ->decode(programID))269 if (!decoder.decode(programID)) 270 270 return false; 271 271 272 272 uint32_t parametersSize; 273 if (!decoder ->decode(parametersSize))273 if (!decoder.decode(parametersSize)) 274 274 return false; 275 275 … … 278 278 String name; 279 279 CustomFilterParameter::ParameterType parameterType; 280 if (!decoder ->decode(name))280 if (!decoder.decode(name)) 281 281 return false; 282 if (!decoder ->decodeEnum(parameterType))282 if (!decoder.decodeEnum(parameterType)) 283 283 return false; 284 284 … … 287 287 RefPtr<CustomFilterArrayParameter> arrayParameter = CustomFilterArrayParameter::create(name); 288 288 uint32_t arrayParameterSize; 289 if (!decoder ->decode(arrayParameterSize))289 if (!decoder.decode(arrayParameterSize)) 290 290 return false; 291 291 double arrayParameterValue; 292 292 for (size_t j = 0; j < arrayParameterSize; ++j) { 293 if (!decoder ->decode(arrayParameterValue))293 if (!decoder.decode(arrayParameterValue)) 294 294 return false; 295 295 arrayParameter->addValue(arrayParameterValue); … … 301 301 RefPtr<CustomFilterNumberParameter> numberParameter = CustomFilterNumberParameter::create(name); 302 302 uint32_t numberParameterSize; 303 if (!decoder ->decode(numberParameterSize))303 if (!decoder.decode(numberParameterSize)) 304 304 return false; 305 305 double numberParameterValue; 306 306 for (size_t j = 0; j < numberParameterSize; ++j) { 307 if (!decoder ->decode(numberParameterValue))307 if (!decoder.decode(numberParameterValue)) 308 308 return false; 309 309 numberParameter->addValue(numberParameterValue); … … 326 326 unsigned meshRows; 327 327 unsigned meshColumns; 328 if (!decoder ->decode(meshRows))329 return false; 330 if (!decoder ->decode(meshColumns))328 if (!decoder.decode(meshRows)) 329 return false; 330 if (!decoder.decode(meshColumns)) 331 331 return false; 332 332 … … 360 360 } 361 361 362 bool ArgumentCoder<WebCore::CustomFilterProgramInfo>::decode(ArgumentDecoder *decoder, CustomFilterProgramInfo& programInfo)362 bool ArgumentCoder<WebCore::CustomFilterProgramInfo>::decode(ArgumentDecoder& decoder, CustomFilterProgramInfo& programInfo) 363 363 { 364 364 String vertexShaderString; … … 367 367 CustomFilterMeshType meshType; 368 368 CustomFilterProgramMixSettings mixSettings; 369 if (!decoder ->decode(vertexShaderString))370 return false; 371 if (!decoder ->decode(fragmentShaderString))372 return false; 373 if (!decoder ->decodeEnum(programType))374 return false; 375 if (!decoder ->decodeEnum(meshType))376 return false; 377 if (!decoder ->decodeEnum(mixSettings.blendMode))378 return false; 379 if (!decoder ->decodeEnum(mixSettings.compositeOperator))369 if (!decoder.decode(vertexShaderString)) 370 return false; 371 if (!decoder.decode(fragmentShaderString)) 372 return false; 373 if (!decoder.decodeEnum(programType)) 374 return false; 375 if (!decoder.decodeEnum(meshType)) 376 return false; 377 if (!decoder.decodeEnum(mixSettings.blendMode)) 378 return false; 379 if (!decoder.decodeEnum(mixSettings.compositeOperator)) 380 380 return false; 381 381 programInfo = CustomFilterProgramInfo(vertexShaderString, fragmentShaderString, programType, mixSettings, meshType); … … 443 443 } 444 444 445 bool ArgumentCoder<TransformOperations>::decode(ArgumentDecoder *decoder, TransformOperations& transformOperations)445 bool ArgumentCoder<TransformOperations>::decode(ArgumentDecoder& decoder, TransformOperations& transformOperations) 446 446 { 447 447 uint32_t operationsSize; 448 if (!decoder ->decode(operationsSize))448 if (!decoder.decode(operationsSize)) 449 449 return false; 450 450 451 451 for (size_t i = 0; i < operationsSize; ++i) { 452 452 TransformOperation::OperationType operationType; 453 if (!decoder ->decodeEnum(operationType))453 if (!decoder.decodeEnum(operationType)) 454 454 return false; 455 455 … … 461 461 case TransformOperation::SCALE_3D: { 462 462 double x, y, z; 463 if (!decoder ->decode(x))464 return false; 465 if (!decoder ->decode(y))466 return false; 467 if (!decoder ->decode(z))463 if (!decoder.decode(x)) 464 return false; 465 if (!decoder.decode(y)) 466 return false; 467 if (!decoder.decode(z)) 468 468 return false; 469 469 transformOperations.operations().append(ScaleTransformOperation::create(x, y, z, operationType)); … … 490 490 case TransformOperation::ROTATE_3D: { 491 491 double x, y, z, angle; 492 if (!decoder ->decode(x))493 return false; 494 if (!decoder ->decode(y))495 return false; 496 if (!decoder ->decode(z))497 return false; 498 if (!decoder ->decode(angle))492 if (!decoder.decode(x)) 493 return false; 494 if (!decoder.decode(y)) 495 return false; 496 if (!decoder.decode(z)) 497 return false; 498 if (!decoder.decode(angle)) 499 499 return false; 500 500 transformOperations.operations().append(RotateTransformOperation::create(x, y, z, angle, operationType)); … … 505 505 case TransformOperation::SKEW: { 506 506 double angleX, angleY; 507 if (!decoder ->decode(angleX))508 return false; 509 if (!decoder ->decode(angleY))507 if (!decoder.decode(angleX)) 508 return false; 509 if (!decoder.decode(angleY)) 510 510 return false; 511 511 transformOperations.operations().append(SkewTransformOperation::create(angleX, angleY, operationType)); … … 577 577 } 578 578 579 bool decodeTimingFunction(ArgumentDecoder *decoder, RefPtr<TimingFunction>& timingFunction)579 bool decodeTimingFunction(ArgumentDecoder& decoder, RefPtr<TimingFunction>& timingFunction) 580 580 { 581 581 TimingFunction::TimingFunctionType type; 582 if (!decoder ->decodeEnum(type))582 if (!decoder.decodeEnum(type)) 583 583 return false; 584 584 … … 593 593 double x1, y1, x2, y2; 594 594 CubicBezierTimingFunction::TimingFunctionPreset bezierPreset; 595 if (!decoder ->decodeEnum(bezierPreset))595 if (!decoder.decodeEnum(bezierPreset)) 596 596 return false; 597 597 if (bezierPreset != CubicBezierTimingFunction::Custom) { … … 599 599 return true; 600 600 } 601 if (!decoder ->decode(x1))602 return false; 603 if (!decoder ->decode(y1))604 return false; 605 if (!decoder ->decode(x2))606 return false; 607 if (!decoder ->decode(y2))601 if (!decoder.decode(x1)) 602 return false; 603 if (!decoder.decode(y1)) 604 return false; 605 if (!decoder.decode(x2)) 606 return false; 607 if (!decoder.decode(y2)) 608 608 return false; 609 609 … … 614 614 uint32_t numberOfSteps; 615 615 bool stepAtStart; 616 if (!decoder ->decode(numberOfSteps))617 return false; 618 if (!decoder ->decode(stepAtStart))616 if (!decoder.decode(numberOfSteps)) 617 return false; 618 if (!decoder.decode(stepAtStart)) 619 619 return false; 620 620 … … 668 668 } 669 669 670 bool ArgumentCoder<GraphicsLayerAnimation>::decode(ArgumentDecoder *decoder, GraphicsLayerAnimation& animation)670 bool ArgumentCoder<GraphicsLayerAnimation>::decode(ArgumentDecoder& decoder, GraphicsLayerAnimation& animation) 671 671 { 672 672 String name; … … 684 684 RefPtr<Animation> animationObject; 685 685 686 if (!decoder ->decode(name))687 return false; 688 if (!decoder ->decode(boxSize))689 return false; 690 if (!decoder ->decodeEnum(state))691 return false; 692 if (!decoder ->decode(startTime))693 return false; 694 if (!decoder ->decode(pauseTime))695 return false; 696 if (!decoder ->decode(listsMatch))697 return false; 698 if (!decoder ->decodeEnum(direction))699 return false; 700 if (!decoder ->decode(fillMode))701 return false; 702 if (!decoder ->decode(duration))703 return false; 704 if (!decoder ->decode(iterationCount))686 if (!decoder.decode(name)) 687 return false; 688 if (!decoder.decode(boxSize)) 689 return false; 690 if (!decoder.decodeEnum(state)) 691 return false; 692 if (!decoder.decode(startTime)) 693 return false; 694 if (!decoder.decode(pauseTime)) 695 return false; 696 if (!decoder.decode(listsMatch)) 697 return false; 698 if (!decoder.decodeEnum(direction)) 699 return false; 700 if (!decoder.decode(fillMode)) 701 return false; 702 if (!decoder.decode(duration)) 703 return false; 704 if (!decoder.decode(iterationCount)) 705 705 return false; 706 706 if (!decodeTimingFunction(decoder, timingFunction)) … … 716 716 717 717 AnimatedPropertyID property; 718 if (!decoder ->decodeEnum(property))718 if (!decoder.decodeEnum(property)) 719 719 return false; 720 720 KeyframeValueList keyframes(property); 721 721 unsigned keyframesSize; 722 if (!decoder ->decode(keyframesSize))722 if (!decoder.decode(keyframesSize)) 723 723 return false; 724 724 for (unsigned i = 0; i < keyframesSize; ++i) { 725 725 float keyTime; 726 726 RefPtr<TimingFunction> timingFunction; 727 if (!decoder ->decode(keyTime))727 if (!decoder.decode(keyTime)) 728 728 return false; 729 729 if (!decodeTimingFunction(decoder, timingFunction)) … … 733 733 case AnimatedPropertyOpacity: { 734 734 float value; 735 if (!decoder ->decode(value))735 if (!decoder.decode(value)) 736 736 return false; 737 737 keyframes.insert(new FloatAnimationValue(keyTime, value, timingFunction)); … … 740 740 case AnimatedPropertyWebkitTransform: { 741 741 TransformOperations transform; 742 if (!decoder ->decode(transform))742 if (!decoder.decode(transform)) 743 743 return false; 744 744 keyframes.insert(new TransformAnimationValue(keyTime, &transform, timingFunction)); … … 748 748 case AnimatedPropertyWebkitFilter: { 749 749 FilterOperations filter; 750 if (!decoder ->decode(filter))750 if (!decoder.decode(filter)) 751 751 return false; 752 752 keyframes.insert(new FilterAnimationValue(keyTime, &filter, timingFunction)); … … 770 770 } 771 771 772 bool ArgumentCoder<GraphicsLayerAnimations>::decode(ArgumentDecoder *decoder, GraphicsLayerAnimations& animations)773 { 774 return decoder ->decode(animations.animations());772 bool ArgumentCoder<GraphicsLayerAnimations>::decode(ArgumentDecoder& decoder, GraphicsLayerAnimations& animations) 773 { 774 return decoder.decode(animations.animations()); 775 775 } 776 776 … … 789 789 } 790 790 791 bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(ArgumentDecoder *decoder, WebCore::GraphicsSurfaceToken& token)791 bool ArgumentCoder<WebCore::GraphicsSurfaceToken>::decode(ArgumentDecoder& decoder, WebCore::GraphicsSurfaceToken& token) 792 792 { 793 793 #if OS(WINDOWS) 794 794 uint64_t frontBufferHandle; 795 if (!decoder ->decode(frontBufferHandle))795 if (!decoder.decode(frontBufferHandle)) 796 796 return false; 797 797 token.frontBufferHandle = reinterpret_cast<GraphicsSurfaceToken::BufferHandle>(frontBufferHandle); 798 798 uint64_t backBufferHandle; 799 if (!decoder ->decode(backBufferHandle))799 if (!decoder.decode(backBufferHandle)) 800 800 return false; 801 801 token.backBufferHandle = reinterpret_cast<GraphicsSurfaceToken::BufferHandle>(backBufferHandle); 802 802 #elif OS(DARWIN) 803 803 Attachment frontAttachment, backAttachment; 804 if (!decoder ->decode(frontAttachment))805 return false; 806 if (!decoder ->decode(backAttachment))804 if (!decoder.decode(frontAttachment)) 805 return false; 806 if (!decoder.decode(backAttachment)) 807 807 return false; 808 808 809 809 token = GraphicsSurfaceToken(frontAttachment.port(), backAttachment.port()); 810 810 #elif OS(LINUX) 811 if (!decoder ->decode(token.frontBufferHandle))811 if (!decoder.decode(token.frontBufferHandle)) 812 812 return false; 813 813 #endif … … 821 821 } 822 822 823 bool ArgumentCoder<CoordinatedLayerInfo>::decode(ArgumentDecoder *decoder, CoordinatedLayerInfo& coordinatedLayerInfo)823 bool ArgumentCoder<CoordinatedLayerInfo>::decode(ArgumentDecoder& decoder, CoordinatedLayerInfo& coordinatedLayerInfo) 824 824 { 825 825 return SimpleArgumentCoder<CoordinatedLayerInfo>::decode(decoder, coordinatedLayerInfo); … … 831 831 } 832 832 833 bool ArgumentCoder<SurfaceUpdateInfo>::decode(ArgumentDecoder *decoder, SurfaceUpdateInfo& surfaceUpdateInfo)833 bool ArgumentCoder<SurfaceUpdateInfo>::decode(ArgumentDecoder& decoder, SurfaceUpdateInfo& surfaceUpdateInfo) 834 834 { 835 835 return SimpleArgumentCoder<SurfaceUpdateInfo>::decode(decoder, surfaceUpdateInfo); -
trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h
r141571 r141632 59 59 template<> struct ArgumentCoder<WebCore::FloatPoint3D> { 60 60 static void encode(ArgumentEncoder&, const WebCore::FloatPoint3D&); 61 static bool decode(ArgumentDecoder *, WebCore::FloatPoint3D&);61 static bool decode(ArgumentDecoder&, WebCore::FloatPoint3D&); 62 62 }; 63 63 64 64 template<> struct ArgumentCoder<WebCore::Length> { 65 65 static void encode(ArgumentEncoder&, const WebCore::Length&); 66 static bool decode(ArgumentDecoder *, WebCore::Length&);66 static bool decode(ArgumentDecoder&, WebCore::Length&); 67 67 }; 68 68 69 69 template<> struct ArgumentCoder<WebCore::TransformationMatrix> { 70 70 static void encode(ArgumentEncoder&, const WebCore::TransformationMatrix&); 71 static bool decode(ArgumentDecoder *, WebCore::TransformationMatrix&);71 static bool decode(ArgumentDecoder&, WebCore::TransformationMatrix&); 72 72 }; 73 73 … … 75 75 template<> struct ArgumentCoder<WebCore::FilterOperations> { 76 76 static void encode(ArgumentEncoder&, const WebCore::FilterOperations&); 77 static bool decode(ArgumentDecoder *, WebCore::FilterOperations&);77 static bool decode(ArgumentDecoder&, WebCore::FilterOperations&); 78 78 }; 79 79 #endif … … 82 82 template<> struct ArgumentCoder<WebCore::CustomFilterProgramInfo> { 83 83 static void encode(ArgumentEncoder&, const WebCore::CustomFilterProgramInfo&); 84 static bool decode(ArgumentDecoder *, WebCore::CustomFilterProgramInfo&);84 static bool decode(ArgumentDecoder&, WebCore::CustomFilterProgramInfo&); 85 85 }; 86 86 #endif … … 88 88 template<> struct ArgumentCoder<WebCore::TransformOperations> { 89 89 static void encode(ArgumentEncoder&, const WebCore::TransformOperations&); 90 static bool decode(ArgumentDecoder *, WebCore::TransformOperations&);90 static bool decode(ArgumentDecoder&, WebCore::TransformOperations&); 91 91 }; 92 92 93 93 template<> struct ArgumentCoder<WebCore::GraphicsLayerAnimations> { 94 94 static void encode(ArgumentEncoder&, const WebCore::GraphicsLayerAnimations&); 95 static bool decode(ArgumentDecoder *, WebCore::GraphicsLayerAnimations&);95 static bool decode(ArgumentDecoder&, WebCore::GraphicsLayerAnimations&); 96 96 }; 97 97 98 98 template<> struct ArgumentCoder<WebCore::GraphicsLayerAnimation> { 99 99 static void encode(ArgumentEncoder&, const WebCore::GraphicsLayerAnimation&); 100 static bool decode(ArgumentDecoder *, WebCore::GraphicsLayerAnimation&);100 static bool decode(ArgumentDecoder&, WebCore::GraphicsLayerAnimation&); 101 101 }; 102 102 … … 104 104 template<> struct ArgumentCoder<WebCore::GraphicsSurfaceToken> { 105 105 static void encode(ArgumentEncoder&, const WebCore::GraphicsSurfaceToken&); 106 static bool decode(ArgumentDecoder *, WebCore::GraphicsSurfaceToken&);106 static bool decode(ArgumentDecoder&, WebCore::GraphicsSurfaceToken&); 107 107 }; 108 108 #endif … … 110 110 template<> struct ArgumentCoder<WebCore::CoordinatedLayerInfo> { 111 111 static void encode(ArgumentEncoder&, const WebCore::CoordinatedLayerInfo&); 112 static bool decode(ArgumentDecoder *, WebCore::CoordinatedLayerInfo&);112 static bool decode(ArgumentDecoder&, WebCore::CoordinatedLayerInfo&); 113 113 }; 114 114 115 115 template<> struct ArgumentCoder<WebCore::SurfaceUpdateInfo> { 116 116 static void encode(ArgumentEncoder&, const WebCore::SurfaceUpdateInfo&); 117 static bool decode(ArgumentDecoder *, WebCore::SurfaceUpdateInfo&);117 static bool decode(ArgumentDecoder&, WebCore::SurfaceUpdateInfo&); 118 118 }; 119 119 -
trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp
r141384 r141632 51 51 } 52 52 53 bool WebCoordinatedSurface::Handle::decode(CoreIPC::ArgumentDecoder *decoder, Handle& handle)54 { 55 if (!decoder ->decode(handle.m_size))56 return false; 57 if (!decoder ->decode(handle.m_flags))58 return false; 59 #if USE(GRAPHICS_SURFACE) 60 if (!decoder ->decode(handle.m_graphicsSurfaceToken))53 bool WebCoordinatedSurface::Handle::decode(CoreIPC::ArgumentDecoder& decoder, Handle& handle) 54 { 55 if (!decoder.decode(handle.m_size)) 56 return false; 57 if (!decoder.decode(handle.m_flags)) 58 return false; 59 #if USE(GRAPHICS_SURFACE) 60 if (!decoder.decode(handle.m_graphicsSurfaceToken)) 61 61 return false; 62 62 if (handle.m_graphicsSurfaceToken.isValid()) 63 63 return true; 64 64 #endif 65 if (!decoder ->decode(handle.m_bitmapHandle))65 if (!decoder.decode(handle.m_bitmapHandle)) 66 66 return false; 67 67 -
trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.h
r141543 r141632 45 45 46 46 void encode(CoreIPC::ArgumentEncoder&) const; 47 static bool decode(CoreIPC::ArgumentDecoder *, Handle&);47 static bool decode(CoreIPC::ArgumentDecoder&, Handle&); 48 48 49 49 #if USE(GRAPHICS_SURFACE) -
trunk/Source/WebKit2/Shared/qt/ArgumentCodersQt.cpp
r141209 r141632 58 58 } 59 59 60 bool ArgumentCoder<WebCore::DragData>::decode(ArgumentDecoder *decoder, DragData& dragData)60 bool ArgumentCoder<WebCore::DragData>::decode(ArgumentDecoder& decoder, DragData& dragData) 61 61 { 62 62 IntPoint clientPosition; … … 64 64 uint64_t sourceOperationMask; 65 65 uint64_t flags; 66 if (!decoder ->decode(clientPosition))66 if (!decoder.decode(clientPosition)) 67 67 return false; 68 if (!decoder ->decode(globalPosition))68 if (!decoder.decode(globalPosition)) 69 69 return false; 70 if (!decoder ->decode(sourceOperationMask))70 if (!decoder.decode(sourceOperationMask)) 71 71 return false; 72 if (!decoder ->decode(flags))72 if (!decoder.decode(flags)) 73 73 return false; 74 74 75 75 bool hasPlatformData; 76 if (!decoder ->decode(hasPlatformData))76 if (!decoder.decode(hasPlatformData)) 77 77 return false; 78 78 … … 80 80 if (hasPlatformData) { 81 81 MIMEDataHashMap map; 82 if (!decoder ->decode(map))82 if (!decoder.decode(map)) 83 83 return false; 84 84 -
trunk/Source/WebKit2/Shared/qt/ArgumentCodersQt.h
r133075 r141632 28 28 29 29 void encode(ArgumentEncoder&, const WebCore::DragData&); 30 bool decode(ArgumentDecoder *, WebCore::DragData&);30 bool decode(ArgumentDecoder&, WebCore::DragData&); 31 31 32 32 template<> struct ArgumentCoder<WebCore::DragData> { 33 33 static void encode(ArgumentEncoder&, const WebCore::DragData&); 34 static bool decode(ArgumentDecoder *, WebCore::DragData&);34 static bool decode(ArgumentDecoder&, WebCore::DragData&); 35 35 }; 36 36 -
trunk/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp
r136912 r141632 46 46 } 47 47 48 bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder *decoder, LayerTreeContext& context)48 bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder& decoder, LayerTreeContext& context) 49 49 { 50 return decoder ->decode(context.coordinatedLayerID);50 return decoder.decode(context.coordinatedLayerID); 51 51 } 52 52 -
trunk/Source/WebKit2/Shared/qt/PlatformCertificateInfo.h
r132361 r141632 47 47 } 48 48 49 static bool decode(CoreIPC::ArgumentDecoder *, PlatformCertificateInfo&)49 static bool decode(CoreIPC::ArgumentDecoder&, PlatformCertificateInfo&) 50 50 { 51 51 return true; -
trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.cpp
r141209 r141632 51 51 } 52 52 53 bool QtNetworkReplyData::decode(CoreIPC::ArgumentDecoder *decoder, QtNetworkReplyData& destination)53 bool QtNetworkReplyData::decode(CoreIPC::ArgumentDecoder& decoder, QtNetworkReplyData& destination) 54 54 { 55 if (!decoder ->decode(destination.m_urlString))55 if (!decoder.decode(destination.m_urlString)) 56 56 return false; 57 if (!decoder ->decode(destination.m_contentType))57 if (!decoder.decode(destination.m_contentType)) 58 58 return false; 59 if (!decoder ->decode(destination.m_contentLength))59 if (!decoder.decode(destination.m_contentLength)) 60 60 return false; 61 if (!decoder ->decode(destination.m_replyUuid))61 if (!decoder.decode(destination.m_replyUuid)) 62 62 return false; 63 if (!decoder ->decode(destination.m_dataHandle))63 if (!decoder.decode(destination.m_dataHandle)) 64 64 return false; 65 65 return true; -
trunk/Source/WebKit2/Shared/qt/QtNetworkReplyData.h
r132361 r141632 44 44 45 45 void encode(CoreIPC::ArgumentEncoder&) const; 46 static bool decode(CoreIPC::ArgumentDecoder *, QtNetworkReplyData&);46 static bool decode(CoreIPC::ArgumentDecoder&, QtNetworkReplyData&); 47 47 48 48 WTF::String m_urlString; -
trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.cpp
r138449 r141632 57 57 } 58 58 59 bool QtNetworkRequestData::decode(CoreIPC::ArgumentDecoder *decoder, QtNetworkRequestData& destination)59 bool QtNetworkRequestData::decode(CoreIPC::ArgumentDecoder& decoder, QtNetworkRequestData& destination) 60 60 { 61 if (!decoder ->decode(destination.m_scheme))61 if (!decoder.decode(destination.m_scheme)) 62 62 return false; 63 if (!decoder ->decode(destination.m_urlString))63 if (!decoder.decode(destination.m_urlString)) 64 64 return false; 65 if (!decoder ->decode(destination.m_replyUuid))65 if (!decoder.decode(destination.m_replyUuid)) 66 66 return false; 67 67 return true; -
trunk/Source/WebKit2/Shared/qt/QtNetworkRequestData.h
r132361 r141632 46 46 QtNetworkRequestData(const QNetworkRequest&, QNetworkReply*); 47 47 void encode(CoreIPC::ArgumentEncoder&) const; 48 static bool decode(CoreIPC::ArgumentDecoder *, QtNetworkRequestData&);48 static bool decode(CoreIPC::ArgumentDecoder&, QtNetworkRequestData&); 49 49 50 50 String m_scheme; -
trunk/Source/WebKit2/Shared/qt/WebCoreArgumentCodersQt.cpp
r133075 r141632 39 39 } 40 40 41 bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder *decoder, ResourceRequest& resourceRequest)41 bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder& decoder, ResourceRequest& resourceRequest) 42 42 { 43 43 return true; … … 49 49 } 50 50 51 bool ArgumentCoder<ResourceResponse>::decodePlatformData(ArgumentDecoder *decoder, ResourceResponse& resourceResponse)51 bool ArgumentCoder<ResourceResponse>::decodePlatformData(ArgumentDecoder& decoder, ResourceResponse& resourceResponse) 52 52 { 53 53 return true; … … 59 59 } 60 60 61 bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder *decoder, ResourceError& resourceError)61 bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError) 62 62 { 63 63 return true;
Note: See TracChangeset
for help on using the changeset viewer.