Title: [209839] trunk/Source/WebKit2
Revision
209839
Author
[email protected]
Date
2016-12-14 15:42:51 -0800 (Wed, 14 Dec 2016)

Log Message

API Test Fullscreen.TopContentInset is asserting on Yosemite
https://bugs.webkit.org/show_bug.cgi?id=165877

Reviewed by Brady Eidson.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setTopContentInset):
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
We don't use fences on Yosemite, but this codepath still tried to.
Instead of guarding with PLATFORM(COCOA), make use of the more accurate
HAVE(COREANIMATION_FENCES) guard.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (209838 => 209839)


--- trunk/Source/WebKit2/ChangeLog	2016-12-14 23:15:24 UTC (rev 209838)
+++ trunk/Source/WebKit2/ChangeLog	2016-12-14 23:42:51 UTC (rev 209839)
@@ -1,3 +1,19 @@
+2016-12-14  Tim Horton  <[email protected]>
+
+        API Test Fullscreen.TopContentInset is asserting on Yosemite
+        https://bugs.webkit.org/show_bug.cgi?id=165877
+
+        Reviewed by Brady Eidson.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setTopContentInset):
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+        We don't use fences on Yosemite, but this codepath still tried to.
+        Instead of guarding with PLATFORM(COCOA), make use of the more accurate
+        HAVE(COREANIMATION_FENCES) guard.
+
 2016-12-14  Anders Carlsson  <[email protected]>
 
         Add some instrumentation to try to detect a crash on the bots

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (209838 => 209839)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2016-12-14 23:15:24 UTC (rev 209838)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2016-12-14 23:42:51 UTC (rev 209839)
@@ -1400,7 +1400,7 @@
 
     if (!isValid())
         return;
-#if PLATFORM(COCOA)
+#if HAVE(COREANIMATION_FENCES)
     MachSendRight fence = m_drawingArea->createFence();
 
     auto fenceAttachment = IPC::Attachment(fence.leakSendRight(), MACH_MSG_TYPE_MOVE_SEND);

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (209838 => 209839)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2016-12-14 23:15:24 UTC (rev 209838)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2016-12-14 23:42:51 UTC (rev 209839)
@@ -2453,7 +2453,7 @@
     m_drawingArea->setNeedsDisplay();
 }
 
-#if PLATFORM(COCOA)
+#if HAVE(COREANIMATION_FENCES)
 void WebPage::setTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
 {
     m_drawingArea->addFence(MachSendRight::create(fencePort.port()));

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (209838 => 209839)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h	2016-12-14 23:15:24 UTC (rev 209838)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h	2016-12-14 23:42:51 UTC (rev 209839)
@@ -1082,7 +1082,7 @@
 
     void setDrawsBackground(bool);
 
-#if PLATFORM(COCOA)
+#if HAVE(COREANIMATION_FENCES)
     void setTopContentInsetFenced(float, IPC::Attachment);
 #endif
     void setTopContentInset(float);

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (209838 => 209839)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in	2016-12-14 23:15:24 UTC (rev 209838)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in	2016-12-14 23:42:51 UTC (rev 209839)
@@ -27,7 +27,7 @@
 
     SetDrawsBackground(bool drawsBackground)
 
-#if PLATFORM(COCOA)
+#if HAVE(COREANIMATION_FENCES)
     SetTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
 #endif
     SetTopContentInset(float contentInset)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to