Title: [255949] releases/WebKitGTK/webkit-2.28
Revision
255949
Author
[email protected]
Date
2020-02-06 07:12:04 -0800 (Thu, 06 Feb 2020)

Log Message

Merge r255899 - [PlayStation] Miscellaneous build fixes February 2020 edition
https://bugs.webkit.org/show_bug.cgi?id=207312

Unreviewed build fix.

Source/WebCore:

* accessibility/AccessibilityObject.h: Add missing definition for !ENABLE(ACCESSIBILITY)
(WebCore::AccessibilityObject::detachPlatformWrapper):
* layout/blockformatting/BlockFormattingContextGeometry.cpp:
* platform/graphics/cairo/ImageBufferCairo.cpp: Add missing include

Source/WebKit:

* NetworkProcess/NetworkDataTaskBlob.cpp: Add missing include.
* UIProcess/Downloads/DownloadProxyMap.h: Add missing forward declaration.

Tools:

* TestWebKitAPI/PlatformWebView.h: Remove #elif guard and just use #else

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog	2020-02-06 15:12:04 UTC (rev 255949)
@@ -1,3 +1,15 @@
+2020-02-05  Don Olmstead  <[email protected]>
+
+        [PlayStation] Miscellaneous build fixes February 2020 edition
+        https://bugs.webkit.org/show_bug.cgi?id=207312
+
+        Unreviewed build fix.
+
+        * accessibility/AccessibilityObject.h: Add missing definition for !ENABLE(ACCESSIBILITY)
+        (WebCore::AccessibilityObject::detachPlatformWrapper):
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        * platform/graphics/cairo/ImageBufferCairo.cpp: Add missing include
+
 2020-02-05  Fujii Hironori  <[email protected]>
 
         Unreviewed build fix for Windows ports since r255875

Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/accessibility/AccessibilityObject.h (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Source/WebCore/accessibility/AccessibilityObject.h	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/accessibility/AccessibilityObject.h	2020-02-06 15:12:04 UTC (rev 255949)
@@ -781,6 +781,7 @@
 inline String AccessibilityObject::actionVerb() const { return emptyString(); }
 inline int AccessibilityObject::lineForPosition(const VisiblePosition&) const { return -1; }
 inline void AccessibilityObject::updateBackingStore() { }
+inline void AccessibilityObject::detachPlatformWrapper(AccessibilityDetachmentType) { }
 #endif
 
 AccessibilityObject* firstAccessibleObjectFromNode(const Node*, const WTF::Function<bool(const AccessibilityObject&)>& isAccessible);

Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp	2020-02-06 15:12:04 UTC (rev 255949)
@@ -29,6 +29,7 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
 #include "BlockFormattingState.h"
+#include "DisplayBox.h"
 #include "FormattingContext.h"
 #include "InlineFormattingState.h"
 #include "LayoutChildIterator.h"

Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp	2020-02-06 15:12:04 UTC (rev 255949)
@@ -38,6 +38,7 @@
 #include "GraphicsContext.h"
 #include "GraphicsContextImplCairo.h"
 #include "ImageBufferUtilitiesCairo.h"
+#include "IntRect.h"
 #include "MIMETypeRegistry.h"
 #include "NotImplemented.h"
 #include "Pattern.h"

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-02-06 15:12:04 UTC (rev 255949)
@@ -1,3 +1,13 @@
+2020-02-05  Don Olmstead  <[email protected]>
+
+        [PlayStation] Miscellaneous build fixes February 2020 edition
+        https://bugs.webkit.org/show_bug.cgi?id=207312
+
+        Unreviewed build fix.
+
+        * NetworkProcess/NetworkDataTaskBlob.cpp: Add missing include.
+        * UIProcess/Downloads/DownloadProxyMap.h: Add missing forward declaration.
+
 2020-02-05  Chris Dumez  <[email protected]>
 
         Regression(r248734) StorageAreaMap objects are getting leaked

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp	2020-02-06 15:12:04 UTC (rev 255949)
@@ -32,6 +32,7 @@
 #include "config.h"
 #include "NetworkDataTaskBlob.h"
 
+#include "AuthenticationManager.h"
 #include "DataReference.h"
 #include "Download.h"
 #include "Logging.h"

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.h (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.h	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.h	2020-02-06 15:12:04 UTC (rev 255949)
@@ -46,6 +46,7 @@
 class ProcessAssertion;
 class WebProcessPool;
 class WebsiteDataStore;
+struct FrameInfoData;
 
 class DownloadProxyMap : public CanMakeWeakPtr<DownloadProxyMap> {
     WTF_MAKE_FAST_ALLOCATED;

Modified: releases/WebKitGTK/webkit-2.28/Tools/ChangeLog (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Tools/ChangeLog	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Tools/ChangeLog	2020-02-06 15:12:04 UTC (rev 255949)
@@ -1,3 +1,12 @@
+2020-02-05  Don Olmstead  <[email protected]>
+
+        [PlayStation] Miscellaneous build fixes February 2020 edition
+        https://bugs.webkit.org/show_bug.cgi?id=207312
+
+        Unreviewed build fix.
+
+        * TestWebKitAPI/PlatformWebView.h: Remove #elif guard and just use #else
+
 2020-02-05  Yusuke Suzuki  <[email protected]>
 
         [WTF] Try using 75% load factor for HashTable

Modified: releases/WebKitGTK/webkit-2.28/Tools/TestWebKitAPI/PlatformWebView.h (255948 => 255949)


--- releases/WebKitGTK/webkit-2.28/Tools/TestWebKitAPI/PlatformWebView.h	2020-02-06 15:11:56 UTC (rev 255948)
+++ releases/WebKitGTK/webkit-2.28/Tools/TestWebKitAPI/PlatformWebView.h	2020-02-06 15:12:04 UTC (rev 255949)
@@ -91,7 +91,7 @@
 private:
 #if PLATFORM(MAC)
     void initialize(WKPageConfigurationRef, Class wkViewSubclass);
-#elif PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)
+#else
     void initialize(WKPageConfigurationRef);
 #endif
 #if PLATFORM(WIN)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to