Diff
Modified: trunk/Source/WebCore/ChangeLog (282787 => 282788)
--- trunk/Source/WebCore/ChangeLog 2021-09-20 22:05:07 UTC (rev 282787)
+++ trunk/Source/WebCore/ChangeLog 2021-09-20 22:40:14 UTC (rev 282788)
@@ -1,3 +1,11 @@
+2021-09-20 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Unreviewed build fix for WinCairo with ENABLE_EXPERIMENTAL_FEATURES off.
+
+ * rendering/TextBoxPainter.cpp:
+ (WebCore::TextBoxPainter::paintForeground):
+ * rendering/TextBoxPainter.h:
+
2021-09-20 Chris Dumez <cdu...@apple.com>
Reduce use of makeRefPtr() and use RefPtr { } directly
Modified: trunk/Source/WebCore/rendering/TextBoxPainter.cpp (282787 => 282788)
--- trunk/Source/WebCore/rendering/TextBoxPainter.cpp 2021-09-20 22:05:07 UTC (rev 282787)
+++ trunk/Source/WebCore/rendering/TextBoxPainter.cpp 2021-09-20 22:40:14 UTC (rev 282788)
@@ -49,10 +49,12 @@
m_emphasisMarkExistsAndIsAbove = textBox.emphasisMarkExistsAndIsAbove(m_style);
}
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
TextBoxPainter::TextBoxPainter(const LayoutIntegration::InlineContent& inlineContent, const Layout::Run& run, PaintInfo& paintInfo, const LayoutPoint& paintOffset)
: TextBoxPainter(LayoutIntegration::textRunFor(inlineContent, run), paintInfo, paintOffset)
{
}
+#endif
TextBoxPainter::TextBoxPainter(LayoutIntegration::TextRunIterator&& textBox, PaintInfo& paintInfo, const LayoutPoint& paintOffset)
: m_textBox(WTFMove(textBox))
@@ -323,8 +325,10 @@
if (auto* legacyInlineBox = textBox().legacyInlineBox())
textPainter.setGlyphDisplayListIfNeeded(*legacyInlineBox, m_paintInfo, font, context, m_paintTextRun);
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
else
textPainter.setGlyphDisplayListIfNeeded(*textBox().inlineBox(), m_paintInfo, font, context, m_paintTextRun);
+#endif
GraphicsContextStateSaver stateSaver { context, false };
if (markedText.type == MarkedText::DraggedContent) {
Modified: trunk/Source/WebCore/rendering/TextBoxPainter.h (282787 => 282788)
--- trunk/Source/WebCore/rendering/TextBoxPainter.h 2021-09-20 22:05:07 UTC (rev 282787)
+++ trunk/Source/WebCore/rendering/TextBoxPainter.h 2021-09-20 22:40:14 UTC (rev 282788)
@@ -47,7 +47,9 @@
class TextBoxPainter {
public:
TextBoxPainter(const LegacyInlineTextBox&, PaintInfo&, const LayoutPoint& paintOffset);
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
TextBoxPainter(const LayoutIntegration::InlineContent&, const Layout::Run&, PaintInfo&, const LayoutPoint& paintOffset);
+#endif
~TextBoxPainter();
void paint();
Modified: trunk/Source/WebKit/ChangeLog (282787 => 282788)
--- trunk/Source/WebKit/ChangeLog 2021-09-20 22:05:07 UTC (rev 282787)
+++ trunk/Source/WebKit/ChangeLog 2021-09-20 22:40:14 UTC (rev 282788)
@@ -1,3 +1,11 @@
+2021-09-20 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Unreviewed build fix for WinCairo with ENABLE_EXPERIMENTAL_FEATURES off.
+
+ * NetworkProcess/NetworkSession.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::createNewPage):
+
2021-09-20 Chris Dumez <cdu...@apple.com>
Unreviewed, rebaseline webkitpy test after r282755.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.h (282787 => 282788)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.h 2021-09-20 22:05:07 UTC (rev 282787)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.h 2021-09-20 22:40:14 UTC (rev 282788)
@@ -32,6 +32,7 @@
#include "PrivateClickMeasurementManagerInterface.h"
#include "SandboxExtension.h"
#include "ServiceWorkerSoftUpdateLoader.h"
+#include "WebPageProxyIdentifier.h"
#include "WebResourceLoadStatisticsStore.h"
#include <WebCore/BlobRegistryImpl.h>
#include <WebCore/NetworkStorageSession.h>
@@ -42,6 +43,7 @@
#include <wtf/Ref.h>
#include <wtf/Seconds.h>
#include <wtf/UniqueRef.h>
+#include <wtf/WeakHashSet.h>
#include <wtf/WeakPtr.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (282787 => 282788)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-09-20 22:05:07 UTC (rev 282787)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-09-20 22:40:14 UTC (rev 282788)
@@ -5855,6 +5855,7 @@
RefPtr<API::UserInitiatedAction> userInitiatedActivity;
+#if ENABLE(INTELLIGENT_TRACKING_PREVENTION)
// WebKit cancels the original gesture to open the BBC radio player so
// we can call the Storage Access API first. When we re-initiate the open,
// we should make sure the client knows that this was user initiated so it
@@ -5862,6 +5863,7 @@
if (request.url().string() == Quirks::staticRadioPlayerURLString())
userInitiatedActivity = API::UserInitiatedAction::create();
else
+#endif
userInitiatedActivity = m_process->userInitiatedActivity(navigationActionData.userGestureTokenIdentifier);
bool shouldOpenAppLinks = originatingFrameInfo->request().url().host() != request.url().host();
