Title: [234238] branches/safari-606-branch/Source/WebCore
Revision
234238
Author
[email protected]
Date
2018-07-26 00:14:50 -0700 (Thu, 26 Jul 2018)

Log Message

Cherry-pick r234113. rdar://problem/42604546

    WebCore::primaryScreenDisplayID() always return 0
    https://bugs.webkit.org/show_bug.cgi?id=187922
    <rdar://problem/42286933>

    Reviewed by Geoffrey Garen.

    This function should return a valid display ID.

    No new tests. Testing this requires a dual monitor setup.

    * platform/mac/PlatformScreenMac.mm:
    (WebCore::primaryScreenDisplayID):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (234237 => 234238)


--- branches/safari-606-branch/Source/WebCore/ChangeLog	2018-07-26 07:14:47 UTC (rev 234237)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog	2018-07-26 07:14:50 UTC (rev 234238)
@@ -1,5 +1,40 @@
 2018-07-25  Babak Shafiei  <[email protected]>
 
+        Cherry-pick r234113. rdar://problem/42604546
+
+    WebCore::primaryScreenDisplayID() always return 0
+    https://bugs.webkit.org/show_bug.cgi?id=187922
+    <rdar://problem/42286933>
+    
+    Reviewed by Geoffrey Garen.
+    
+    This function should return a valid display ID.
+    
+    No new tests. Testing this requires a dual monitor setup.
+    
+    * platform/mac/PlatformScreenMac.mm:
+    (WebCore::primaryScreenDisplayID):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234113 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-07-23  Per Arne Vollan  <[email protected]>
+
+            WebCore::primaryScreenDisplayID() always return 0
+            https://bugs.webkit.org/show_bug.cgi?id=187922
+            <rdar://problem/42286933>
+
+            Reviewed by Geoffrey Garen.
+
+            This function should return a valid display ID.
+
+            No new tests. Testing this requires a dual monitor setup.
+
+            * platform/mac/PlatformScreenMac.mm:
+            (WebCore::primaryScreenDisplayID):
+
+2018-07-25  Babak Shafiei  <[email protected]>
+
         Cherry-pick r234112. rdar://problem/42604514
 
     AX: Press tab to highlight items on a webpage is not working with voiceover enabled

Modified: branches/safari-606-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm (234237 => 234238)


--- branches/safari-606-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm	2018-07-26 07:14:47 UTC (rev 234237)
+++ branches/safari-606-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm	2018-07-26 07:14:50 UTC (rev 234238)
@@ -104,8 +104,7 @@
 
 static PlatformDisplayID& primaryScreenDisplayID()
 {
-    static PlatformDisplayID primaryScreenDisplayID = 0;
-    return primaryScreenDisplayID;
+    return screenProperties().primaryDisplayID;
 }
 
 ScreenProperties collectScreenProperties()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to