Diff
Modified: trunk/Source/WebCore/ChangeLog (261363 => 261364)
--- trunk/Source/WebCore/ChangeLog 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebCore/ChangeLog 2020-05-08 02:14:33 UTC (rev 261364)
@@ -1,3 +1,16 @@
+2020-05-07 Chris Dumez <cdu...@apple.com>
+
+ Unreviewed, reverting r261252.
+
+ Reland r260684 now that a proper fix has landed in Reader
+
+ Reverted changeset:
+
+ "REGRESSION (r260684): Reader background is lost after
+ multitasking"
+ https://bugs.webkit.org/show_bug.cgi?id=211533
+ https://trac.webkit.org/changeset/261252
+
2020-05-07 Pinki Gyanchandani <pgyanchand...@apple.com>
SIGILL @ WebCore::Shape::createRasterShape -- DOS ASAN
Modified: trunk/Source/WebCore/dom/EventTarget.cpp (261363 => 261364)
--- trunk/Source/WebCore/dom/EventTarget.cpp 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebCore/dom/EventTarget.cpp 2020-05-08 02:14:33 UTC (rev 261364)
@@ -40,6 +40,7 @@
#include "InspectorInstrumentation.h"
#include "JSEventListener.h"
#include "JSLazyEventListener.h"
+#include "Logging.h"
#include "Quirks.h"
#include "ScriptController.h"
#include "ScriptDisallowedScope.h"
@@ -251,6 +252,15 @@
if (!data)
return;
+ // FIXME: Remove once <rdar://problem/62344280> is fixed.
+ if (is<Document>(scriptExecutionContext())) {
+ auto* page = downcast<Document>(*scriptExecutionContext()).page();
+ if (page && !page->shouldFireEvents()) {
+ RELEASE_LOG_IF(page->isAlwaysOnLoggingAllowed(), Events, "%p - EventTarget::fireEventListeners: Not firing %{public}s event because events are temporarily disabled for this page", this, event.type().string().utf8().data());
+ return;
+ }
+ }
+
SetForScope<bool> firingEventListenersScope(data->isFiringEventListeners, true);
if (auto* listenersVector = data->eventListenerMap.find(event.type())) {
Modified: trunk/Source/WebCore/page/FrameView.cpp (261363 => 261364)
--- trunk/Source/WebCore/page/FrameView.cpp 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebCore/page/FrameView.cpp 2020-05-08 02:14:33 UTC (rev 261364)
@@ -3376,11 +3376,6 @@
}
#endif
- if (page && !page->shouldFireResizeEvents()) {
- FRAMEVIEW_RELEASE_LOG_IF_ALLOWED(Events, "sendResizeEventIfNeeded: Not firing resize events because they are temporarily disabled for this page");
- return;
- }
-
LOG_WITH_STREAM(Events, stream << "FrameView" << this << "sendResizeEventIfNeeded scheduling resize event for document" << frame().document() << ", size " << currentSize);
frame().document()->setNeedsDOMWindowResizeEvent();
Modified: trunk/Source/WebCore/page/Page.h (261363 => 261364)
--- trunk/Source/WebCore/page/Page.h 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebCore/page/Page.h 2020-05-08 02:14:33 UTC (rev 261364)
@@ -750,8 +750,8 @@
WEBCORE_EXPORT void injectUserStyleSheet(UserStyleSheet&);
WEBCORE_EXPORT void removeInjectedUserStyleSheet(UserStyleSheet&);
- bool shouldFireResizeEvents() const { return m_shouldFireResizeEvents; }
- void setShouldFireResizeEvents(bool shouldFireResizeEvents) { m_shouldFireResizeEvents = shouldFireResizeEvents; }
+ bool shouldFireEvents() const { return m_shouldFireEvents; }
+ void setShouldFireEvents(bool shouldFireEvents) { m_shouldFireEvents = shouldFireEvents; }
bool hasBeenNotifiedToInjectUserScripts() const { return m_hasBeenNotifiedToInjectUserScripts; }
WEBCORE_EXPORT void notifyToInjectUserScripts();
@@ -1042,7 +1042,7 @@
Vector<UserContentURLPattern> m_corsDisablingPatterns;
Vector<UserStyleSheet> m_userStyleSheetsPendingInjection;
- bool m_shouldFireResizeEvents { true };
+ bool m_shouldFireEvents { true };
bool m_loadsSubresources { true };
bool m_loadsFromNetwork { true };
bool m_hasBeenNotifiedToInjectUserScripts { false };
Modified: trunk/Source/WebKit/ChangeLog (261363 => 261364)
--- trunk/Source/WebKit/ChangeLog 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebKit/ChangeLog 2020-05-08 02:14:33 UTC (rev 261364)
@@ -1,3 +1,16 @@
+2020-05-07 Chris Dumez <cdu...@apple.com>
+
+ Unreviewed, reverting r261252.
+
+ Reland r260684 now that a proper fix has landed in Reader
+
+ Reverted changeset:
+
+ "REGRESSION (r260684): Reader background is lost after
+ multitasking"
+ https://bugs.webkit.org/show_bug.cgi?id=211533
+ https://trac.webkit.org/changeset/261252
+
2020-05-07 Megan Gardner <megan_gard...@apple.com>
Build Fix for MacCatalyst
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (261363 => 261364)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-05-08 02:14:33 UTC (rev 261364)
@@ -10121,9 +10121,9 @@
send(Messages::WebPage::SetOverriddenMediaType(mediaType));
}
-void WebPageProxy::setShouldFireResizeEvents(bool shouldFireResizeEvents)
+void WebPageProxy::setShouldFireEvents(bool shouldFireEvents)
{
- send(Messages::WebPage::SetShouldFireResizeEvents(shouldFireResizeEvents));
+ send(Messages::WebPage::SetShouldFireEvents(shouldFireEvents));
}
void WebPageProxy::setNeedsDOMWindowResizeEvent()
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (261363 => 261364)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2020-05-08 02:14:33 UTC (rev 261364)
@@ -1738,7 +1738,7 @@
void grantAccessToPreferenceService();
#endif
- void setShouldFireResizeEvents(bool);
+ void setShouldFireEvents(bool);
void setNeedsDOMWindowResizeEvent();
void isNavigatingToAppBoundDomainTesting(CompletionHandler<void(bool)>&&);
Modified: trunk/Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm (261363 => 261364)
--- trunk/Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm 2020-05-08 02:14:33 UTC (rev 261364)
@@ -109,7 +109,7 @@
if (!page)
return;
- page->setShouldFireResizeEvents(false);
+ page->setShouldFireEvents(false);
}
- (void)_didCompleteSnapshotSequence
@@ -118,7 +118,7 @@
if (!page)
return;
- page->setShouldFireResizeEvents(true);
+ page->setShouldFireEvents(true);
}
- (BOOL)isBackground
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (261363 => 261364)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-05-08 02:14:33 UTC (rev 261364)
@@ -3313,12 +3313,12 @@
send(Messages::WebPageProxy::ShowPage());
}
-void WebPage::setShouldFireResizeEvents(bool shouldFireResizeEvents)
+void WebPage::setShouldFireEvents(bool shouldFireEvents)
{
- RELEASE_LOG_IF_ALLOWED(Resize, "setShouldFireResizeEvents(%d)", shouldFireResizeEvents);
+ RELEASE_LOG_IF_ALLOWED(Resize, "setShouldFireEvents(%d)", shouldFireEvents);
if (m_page)
- m_page->setShouldFireResizeEvents(shouldFireResizeEvents);
+ m_page->setShouldFireEvents(shouldFireEvents);
}
void WebPage::setNeedsDOMWindowResizeEvent()
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (261363 => 261364)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-05-08 02:14:33 UTC (rev 261364)
@@ -1702,7 +1702,7 @@
void urlSchemeTaskDidReceiveData(uint64_t handlerIdentifier, uint64_t taskIdentifier, const IPC::SharedBufferDataReference&);
void urlSchemeTaskDidComplete(uint64_t handlerIdentifier, uint64_t taskIdentifier, const WebCore::ResourceError&);
- void setShouldFireResizeEvents(bool);
+ void setShouldFireEvents(bool);
void setNeedsDOMWindowResizeEvent();
void setIsSuspended(bool);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (261363 => 261364)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2020-05-08 01:54:31 UTC (rev 261363)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2020-05-08 02:14:33 UTC (rev 261364)
@@ -603,7 +603,7 @@
UpdateCORSDisablingPatterns(Vector<String> patterns)
- SetShouldFireResizeEvents(bool shouldFireResizeEvents)
+ SetShouldFireEvents(bool shouldFireEvents)
SetNeedsDOMWindowResizeEvent()
SetHasResourceLoadClient(bool has)
