Changeset 275557 in webkit
- Timestamp:
- Apr 6, 2021 2:45:45 PM (3 years ago)
- Location:
- trunk/Source
- Files:
-
- 30 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r275551 r275557 1 2021-04-06 Mike Gorse <mgorse@suse.com> 2 3 Build fails when video is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=224198 5 6 Reviewed by Adrian Perez de Castro. 7 8 Add #if ENABLE(VIDEO) where needed. 9 10 * editing/markup.cpp: 11 (WebCore::createPageForSanitizingWebContent): 12 * page/Page.cpp: 13 * page/Page.h: 14 * platform/graphics/GraphicsContext.cpp: 15 * platform/graphics/GraphicsContext.h: 16 * platform/graphics/GraphicsContextGL.h: 17 * platform/graphics/GraphicsContextImpl.h: 18 * platform/graphics/cairo/GraphicsContextImplCairo.cpp: 19 * platform/graphics/cairo/GraphicsContextImplCairo.h: 20 * platform/graphics/displaylists/DisplayList.cpp: 21 (WebCore::DisplayList::DisplayList::append): 22 * platform/graphics/displaylists/DisplayListItemBuffer.cpp: 23 (WebCore::DisplayList::ItemHandle::apply): 24 (WebCore::DisplayList::ItemHandle::destroy): 25 (WebCore::DisplayList::ItemHandle::safeCopy const): 26 * platform/graphics/displaylists/DisplayListItemType.cpp: 27 (WebCore::DisplayList::sizeOfItemInBytes): 28 (WebCore::DisplayList::isDrawingItem): 29 (WebCore::DisplayList::isInlineItem): 30 * platform/graphics/displaylists/DisplayListItemType.h: 31 * platform/graphics/displaylists/DisplayListItems.cpp: 32 (WebCore::DisplayList::operator<<): 33 * platform/graphics/displaylists/DisplayListItems.h: 34 * platform/graphics/displaylists/DisplayListRecorder.cpp: 35 * platform/graphics/displaylists/DisplayListRecorder.h: 36 * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp: 37 * platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h: 38 * platform/graphics/opengl/GraphicsContextGLOpenGL.cpp: 39 * platform/graphics/opengl/GraphicsContextGLOpenGL.h: 40 * platform/graphics/win/GraphicsContextImplDirect2D.cpp: 41 * platform/graphics/win/GraphicsContextImplDirect2D.h: 42 * svg/graphics/SVGImage.cpp: 43 (WebCore::SVGImage::dataChanged): 44 1 45 2021-04-06 Philippe Normand <pnormand@igalia.com> 2 46 -
trunk/Source/WebCore/editing/markup.cpp
r273621 r275557 184 184 185 185 auto page = makeUnique<Page>(WTFMove(pageConfiguration)); 186 #if ENABLE(VIDEO) 186 187 page->settings().setMediaEnabled(false); 188 #endif 187 189 page->settings().setScriptEnabled(false); 188 190 page->settings().setHTMLParserScriptingFlagPolicy(HTMLParserScriptingFlagPolicy::Enabled); -
trunk/Source/WebCore/page/Page.cpp
r275302 r275557 2142 2142 } 2143 2143 2144 #endif2145 2146 2144 void Page::playbackControlsMediaEngineChanged() 2147 2145 { 2148 2146 chrome().client().playbackControlsMediaEngineChanged(); 2149 2147 } 2148 2149 #endif 2150 2150 2151 2151 void Page::setMuted(MediaProducer::MutedStateFlags muted) -
trunk/Source/WebCore/page/Page.h
r275215 r275557 702 702 bool isMediaCaptureMuted() const { return m_mutedState & MediaProducer::MediaStreamCaptureIsMuted; }; 703 703 void schedulePlaybackControlsManagerUpdate(); 704 #if ENABLE(VIDEO) 704 705 void playbackControlsMediaEngineChanged(); 706 #endif 705 707 WEBCORE_EXPORT void setMuted(MediaProducer::MutedStateFlags); 706 708 -
trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp
r274057 r275557 1301 1301 #endif 1302 1302 1303 #if ENABLE(VIDEO) 1303 1304 void GraphicsContext::paintFrameForMedia(MediaPlayer& player, const FloatRect& destination) 1304 1305 { … … 1313 1314 player.playerPrivate()->paintCurrentFrameInContext(*this, destination); 1314 1315 } 1315 1316 } 1316 #endif 1317 1318 } -
trunk/Source/WebCore/platform/graphics/GraphicsContext.h
r274869 r275557 517 517 bool contenfulPaintDetected() const { return m_contenfulPaintDetected; } 518 518 519 #if ENABLE(VIDEO) 519 520 WEBCORE_EXPORT void paintFrameForMedia(MediaPlayer&, const FloatRect& destination); 521 #endif 520 522 521 523 #if OS(WINDOWS) -
trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h
r274704 r275557 1312 1312 virtual GraphicsContextGLCV* asCV() = 0; 1313 1313 #endif 1314 #if ENABLE(VIDEO) 1314 1315 virtual bool copyTextureFromMedia(MediaPlayer&, PlatformGLObject texture, GCGLenum target, GCGLint level, GCGLenum internalFormat, GCGLenum format, GCGLenum type, bool premultiplyAlpha, bool flipY) = 0; 1316 #endif 1315 1317 1316 1318 IntSize getInternalFramebufferSize() const { return IntSize(m_currentWidth, m_currentHeight); } -
trunk/Source/WebCore/platform/graphics/GraphicsContextImpl.h
r273956 r275557 106 106 virtual void clipToImageBuffer(ImageBuffer&, const FloatRect&) = 0; 107 107 virtual void clipToDrawingCommands(const FloatRect& destination, DestinationColorSpace, Function<void(GraphicsContext&)>&& drawingFunction) = 0; 108 #if ENABLE(VIDEO) 108 109 virtual void paintFrameForMedia(MediaPlayer&, const FloatRect& destination) = 0; 109 110 virtual bool canPaintFrameForMedia(const MediaPlayer&) const = 0; 111 #endif 110 112 111 113 virtual void applyDeviceScaleFactor(float) = 0; -
trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.cpp
r272790 r275557 420 420 } 421 421 422 #if ENABLE(VIDEO) 422 423 void GraphicsContextImplCairo::paintFrameForMedia(MediaPlayer&, const FloatRect&) 423 424 { 424 425 // FIXME: Not implemented. 425 426 } 427 #endif 426 428 427 429 } // namespace WebCore -
trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextImplCairo.h
r272772 r275557 106 106 void clipToImageBuffer(ImageBuffer&, const FloatRect&) override; 107 107 void clipToDrawingCommands(const FloatRect& destination, DestinationColorSpace, Function<void(GraphicsContext&)>&&) override; 108 #if ENABLE(VIDEO) 108 109 void paintFrameForMedia(MediaPlayer&, const FloatRect& destination) override; 109 110 bool canPaintFrameForMedia(const MediaPlayer&) const override { return false; } 111 #endif 110 112 111 113 void applyDeviceScaleFactor(float) override; -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp
r275459 r275557 292 292 case ItemType::PutImageData: 293 293 return append<PutImageData>(item.get<PutImageData>()); 294 #if ENABLE(VIDEO) 294 295 case ItemType::PaintFrameForMedia: 295 296 return append<PaintFrameForMedia>(item.get<PaintFrameForMedia>()); 297 #endif 296 298 case ItemType::StrokeRect: 297 299 return append<StrokeRect>(item.get<StrokeRect>()); -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItemBuffer.cpp
r275459 r275557 193 193 ASSERT_NOT_REACHED(); 194 194 return; 195 #if ENABLE(VIDEO) 195 196 case ItemType::PaintFrameForMedia: 196 197 get<PaintFrameForMedia>().apply(context); 197 198 return; 199 #endif 198 200 case ItemType::StrokeRect: 199 201 get<StrokeRect>().apply(context); … … 375 377 static_assert(std::is_trivially_destructible<MetaCommandChangeItemBuffer>::value); 376 378 return; 379 #if ENABLE(VIDEO) 377 380 case ItemType::PaintFrameForMedia: 378 381 static_assert(std::is_trivially_destructible<PaintFrameForMedia>::value); 379 382 return; 383 #endif 380 384 case ItemType::Restore: 381 385 static_assert(std::is_trivially_destructible<Restore>::value); … … 549 553 case ItemType::MetaCommandChangeItemBuffer: 550 554 return copyInto<MetaCommandChangeItemBuffer>(*this, itemOffset); 555 #if ENABLE(VIDEO) 551 556 case ItemType::PaintFrameForMedia: 552 557 return copyInto<PaintFrameForMedia>(*this, itemOffset); 558 #endif 553 559 case ItemType::Restore: 554 560 return copyInto<Restore>(*this, itemOffset); -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.cpp
r274838 r275557 137 137 case ItemType::PutImageData: 138 138 return sizeof(PutImageData); 139 #if ENABLE(VIDEO) 139 140 case ItemType::PaintFrameForMedia: 140 141 return sizeof(PaintFrameForMedia); 142 #endif 141 143 case ItemType::StrokeRect: 142 144 return sizeof(StrokeRect); … … 236 238 case ItemType::FillRectWithRoundedHole: 237 239 case ItemType::FillRoundedRect: 240 #if ENABLE(VIDEO) 238 241 case ItemType::PaintFrameForMedia: 242 #endif 239 243 case ItemType::PutImageData: 240 244 case ItemType::StrokeEllipse: … … 311 315 case ItemType::MetaCommandChangeDestinationImageBuffer: 312 316 case ItemType::MetaCommandChangeItemBuffer: 317 #if ENABLE(VIDEO) 313 318 case ItemType::PaintFrameForMedia: 319 #endif 314 320 case ItemType::Restore: 315 321 case ItemType::Rotate: -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItemType.h
r274838 r275557 82 82 GetImageData, 83 83 PutImageData, 84 #if ENABLE(VIDEO) 84 85 PaintFrameForMedia, 86 #endif 85 87 StrokeRect, 86 88 StrokeLine, -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp
r274838 r275557 805 805 } 806 806 807 #if ENABLE(VIDEO) 807 808 PaintFrameForMedia::PaintFrameForMedia(MediaPlayer& player, const FloatRect& destination) 808 809 : m_identifier(player.identifier()) … … 822 823 return ts; 823 824 } 825 #endif 824 826 825 827 Optional<FloatRect> StrokeRect::localBounds(const GraphicsContext&) const … … 1065 1067 case ItemType::GetImageData: ts << "get-image-data"; break; 1066 1068 case ItemType::PutImageData: ts << "put-image-data"; break; 1069 #if ENABLE(VIDEO) 1067 1070 case ItemType::PaintFrameForMedia: ts << "paint-frame-for-media"; break; 1071 #endif 1068 1072 case ItemType::StrokeRect: ts << "stroke-rect"; break; 1069 1073 case ItemType::StrokeLine: ts << "stroke-line"; break; … … 1234 1238 ts << item.get<PutImageData>(); 1235 1239 break; 1240 #if ENABLE(VIDEO) 1236 1241 case ItemType::PaintFrameForMedia: 1237 1242 ts << item.get<PaintFrameForMedia>(); 1238 1243 break; 1244 #endif 1239 1245 case ItemType::StrokeRect: 1240 1246 ts << item.get<StrokeRect>(); -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.h
r274839 r275557 1986 1986 } 1987 1987 1988 #if ENABLE(VIDEO) 1988 1989 class PaintFrameForMedia { 1989 1990 public: … … 2008 2009 FloatRect m_destination; 2009 2010 }; 2011 #endif 2010 2012 2011 2013 class StrokeRect { … … 2337 2339 WebCore::DisplayList::ItemType::GetImageData, 2338 2340 WebCore::DisplayList::ItemType::PutImageData, 2341 #if ENABLE(VIDEO) 2339 2342 WebCore::DisplayList::ItemType::PaintFrameForMedia, 2343 #endif 2340 2344 WebCore::DisplayList::ItemType::StrokeRect, 2341 2345 WebCore::DisplayList::ItemType::StrokeLine, -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp
r275185 r275557 459 459 } 460 460 461 #if ENABLE(VIDEO) 461 462 bool Recorder::canPaintFrameForMedia(const MediaPlayer& player) const 462 463 { … … 469 470 append<PaintFrameForMedia>(player, destination); 470 471 } 472 #endif 471 473 472 474 void Recorder::applyDeviceScaleFactor(float deviceScaleFactor) -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.h
r275185 r275557 146 146 void clipToImageBuffer(WebCore::ImageBuffer&, const FloatRect&) override; 147 147 void clipToDrawingCommands(const FloatRect& destination, DestinationColorSpace, Function<void(GraphicsContext&)>&&) override; 148 #if ENABLE(VIDEO) 148 149 void paintFrameForMedia(MediaPlayer&, const FloatRect& destination) override; 149 150 bool canPaintFrameForMedia(const MediaPlayer&) const override; 151 #endif 150 152 151 153 void applyDeviceScaleFactor(float) override; -
trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.cpp
r272811 r275557 1082 1082 } 1083 1083 1084 #if ENABLE(VIDEO) 1084 1085 void CairoOperationRecorder::paintFrameForMedia(MediaPlayer&, const FloatRect&) 1085 1086 { 1086 1087 // FIXME: Not implemented. 1087 1088 } 1089 #endif 1088 1090 1089 1091 } // namespace Nicosia -
trunk/Source/WebCore/platform/graphics/nicosia/cairo/NicosiaCairoOperationRecorder.h
r272772 r275557 99 99 void clipToImageBuffer(WebCore::ImageBuffer&, const WebCore::FloatRect&) override; 100 100 void clipToDrawingCommands(const WebCore::FloatRect& destination, WebCore::DestinationColorSpace, Function<void(WebCore::GraphicsContext&)>&&) override; 101 #if ENABLE(VIDEO) 101 102 void paintFrameForMedia(WebCore::MediaPlayer&, const WebCore::FloatRect& destination) override; 102 103 bool canPaintFrameForMedia(const WebCore::MediaPlayer&) const override { return false; } 104 #endif 103 105 104 106 void applyDeviceScaleFactor(float) override; -
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp
r273877 r275557 261 261 #endif 262 262 263 #if ENABLE(VIDEO) 263 264 bool GraphicsContextGLOpenGL::copyTextureFromMedia(MediaPlayer& player, PlatformGLObject outputTexture, GCGLenum outputTarget, GCGLint level, GCGLenum internalFormat, GCGLenum format, GCGLenum type, bool premultiplyAlpha, bool flipY) 264 265 { … … 279 280 #endif 280 281 } 282 #endif 281 283 282 284 } // namespace WebCore -
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h
r275463 r275557 471 471 RefPtr<ImageData> readCompositedResultsForPainting(); 472 472 473 #if ENABLE(VIDEO) 473 474 bool copyTextureFromMedia(MediaPlayer&, PlatformGLObject texture, GCGLenum target, GCGLint level, GCGLenum internalFormat, GCGLenum format, GCGLenum type, bool premultiplyAlpha, bool flipY) final; 475 #endif 474 476 475 477 #if USE(OPENGL) && ENABLE(WEBGL2) -
trunk/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.cpp
r272475 r275557 426 426 } 427 427 428 #if ENABLE(VIDEO) 428 429 void GraphicsContextImplDirect2D::paintFrameForMedia(MediaPlayer&, const FloatRect&) 429 430 { 430 431 // FIXME: Not implemented. 431 432 } 433 #endif 432 434 433 435 } // namespace WebCore -
trunk/Source/WebCore/platform/graphics/win/GraphicsContextImplDirect2D.h
r272475 r275557 103 103 void clipToImageBuffer(ImageBuffer&, const FloatRect&) override; 104 104 void clipToDrawingCommands(const FloatRect& destination, DestinationColorSpace, Function<void(GraphicsContext&)>&&) override; 105 #if ENABLE(VIDEO) 105 106 void paintFrameForMedia(MediaPlayer&, const FloatRect& destination) override; 106 107 bool canPaintFrameForMedia(const MediaPlayer&) const override { return false; } 108 #endif 107 109 108 110 void applyDeviceScaleFactor(float) override; -
trunk/Source/WebCore/svg/graphics/SVGImage.cpp
r272549 r275557 448 448 // loaded by a top-level document. 449 449 m_page = makeUnique<Page>(WTFMove(pageConfiguration)); 450 #if ENABLE(VIDEO) 450 451 m_page->settings().setMediaEnabled(false); 452 #endif 451 453 m_page->settings().setScriptEnabled(false); 452 454 m_page->settings().setPluginsEnabled(false); -
trunk/Source/WebKit/ChangeLog
r275553 r275557 1 2021-04-06 Mike Gorse <mgorse@suse.com> 2 3 Build fails when video is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=224198 5 6 Reviewed by Adrian Perez de Castro. 7 8 Add #if ENABLE(VIDEO) where needed. 9 10 * GPUProcess/graphics/RemoteRenderingBackend.cpp: 11 (WebKit::RemoteRenderingBackend::decodeItem): 12 * UIProcess/gtk/ClipboardGtk3.cpp: 13 * WebProcess/GPU/graphics/RemoteImageBufferProxy.h: 14 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 15 (WebKit::WebFrameLoaderClient::committedLoad): 16 1 17 2021-04-06 Fujii Hironori <Hironori.Fujii@sony.com> 2 18 -
trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp
r275553 r275557 556 556 case DisplayList::ItemType::MetaCommandChangeDestinationImageBuffer: 557 557 case DisplayList::ItemType::MetaCommandChangeItemBuffer: 558 #if ENABLE(VIDEO) 558 559 case DisplayList::ItemType::PaintFrameForMedia: 560 #endif 559 561 case DisplayList::ItemType::Restore: 560 562 case DisplayList::ItemType::Rotate: -
trunk/Source/WebKit/UIProcess/gtk/ClipboardGtk3.cpp
r261802 r275557 36 36 #include <gtk/gtk.h> 37 37 #include <wtf/SetForScope.h> 38 #include <wtf/glib/GUniquePtr.h> 38 39 39 40 namespace WebKit { -
trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h
r275459 r275557 392 392 case WebCore::DisplayList::ItemType::MetaCommandChangeDestinationImageBuffer: 393 393 case WebCore::DisplayList::ItemType::MetaCommandChangeItemBuffer: 394 #if ENABLE(VIDEO) 394 395 case WebCore::DisplayList::ItemType::PaintFrameForMedia: 396 #endif 395 397 case WebCore::DisplayList::ItemType::Restore: 396 398 case WebCore::DisplayList::ItemType::Rotate: -
trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r274746 r275557 1149 1149 // If the document is a stand-alone media document, now is the right time to cancel the WebKit load. 1150 1150 // FIXME: This code should be shared across all ports. <http://webkit.org/b/48762>. 1151 #if ENABLE(VIDEO) 1151 1152 if (is<MediaDocument>(m_frame->coreFrame()->document())) 1152 1153 loader->cancelMainResourceLoad(pluginWillHandleLoadError(loader->response())); 1154 #endif 1153 1155 1154 1156 // Calling commitData did not create the plug-in view.
Note: See TracChangeset
for help on using the changeset viewer.