Attachment 348817 Details for Bug 187925 – Patch

[patch] Patch

bug-187925-20180904093423.patch (text/plain), 8.17 KB, created by Per Arne Vollan on 2018-09-04 09:34:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Per Arne Vollan

Created: 2018-09-04 09:34:23 PDT

Size: 8.17 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 235612)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-09-04  Per Arne Vollan  <pvollan@apple.com>
>+
>+        Add test for fix in https://bugs.webkit.org/show_bug.cgi?id=187922
>+        https://bugs.webkit.org/show_bug.cgi?id=187925
>+
>+        Reviewed by Simon Fraser.
>+
>+        This will test that the function primaryScreenDisplayID() returns a valid display ID.
>+
>+        Test: fast/misc/valid-primary-screen-displayID.html
>+
>+        * platform/PlatformScreen.h:
>+        * platform/mac/PlatformScreenMac.mm:
>+        (WebCore::primaryScreenDisplayID):
>+        * testing/Internals.cpp:
>+        (WebCore::Internals::primaryScreenDisplayID):
>+        * testing/Internals.h:
>+        * testing/Internals.idl:
>+
> 2018-09-04  Zan Dobersek  <zdobersek@igalia.com> and Ms2ger  <Ms2ger@igalia.com>
> 
>         Implement support for passing ImageBitmap to texImage2D/texSubImage2D
>Index: Source/WebCore/platform/PlatformScreen.h
>===================================================================
>--- Source/WebCore/platform/PlatformScreen.h	(revision 235612)
>+++ Source/WebCore/platform/PlatformScreen.h	(working copy)
>@@ -99,6 +99,8 @@ NSPoint flipScreenPoint(const NSPoint&, 
> WEBCORE_EXPORT ScreenProperties collectScreenProperties();
> WEBCORE_EXPORT void setScreenProperties(const ScreenProperties&);
> 
>+WEBCORE_EXPORT PlatformDisplayID primaryScreenDisplayID();
>+
> uint32_t primaryOpenGLDisplayMask();
> uint32_t displayMaskForDisplay(PlatformDisplayID);
> 
>Index: Source/WebCore/platform/mac/PlatformScreenMac.mm
>===================================================================
>--- Source/WebCore/platform/mac/PlatformScreenMac.mm	(revision 235612)
>+++ Source/WebCore/platform/mac/PlatformScreenMac.mm	(working copy)
>@@ -102,7 +102,7 @@ static ScreenProperties& screenPropertie
>     return screenProperties;
> }
> 
>-static PlatformDisplayID& primaryScreenDisplayID()
>+PlatformDisplayID primaryScreenDisplayID()
> {
>     return screenProperties().primaryDisplayID;
> }
>Index: Source/WebCore/testing/Internals.cpp
>===================================================================
>--- Source/WebCore/testing/Internals.cpp	(revision 235612)
>+++ Source/WebCore/testing/Internals.cpp	(working copy)
>@@ -120,6 +120,7 @@
> #include "PageOverlay.h"
> #include "PathUtilities.h"
> #include "PlatformMediaSessionManager.h"
>+#include "PlatformScreen.h"
> #include "PlatformStrategies.h"
> #include "PluginData.h"
> #include "PrintContext.h"
>@@ -4720,4 +4721,13 @@ void Internals::notifyResourceLoadObserv
>     ResourceLoadObserver::shared().notifyObserver();
> }
> 
>+unsigned long Internals::primaryScreenDisplayID()
>+{
>+#if PLATFORM(MAC)
>+    return WebCore::primaryScreenDisplayID();
>+#else
>+    return 0;
>+#endif
>+}
>+
> } // namespace WebCore
>Index: Source/WebCore/testing/Internals.h
>===================================================================
>--- Source/WebCore/testing/Internals.h	(revision 235612)
>+++ Source/WebCore/testing/Internals.h	(working copy)
>@@ -735,6 +735,8 @@ public:
> 
>     void notifyResourceLoadObserver();
> 
>+    unsigned long primaryScreenDisplayID();
>+        
> private:
>     explicit Internals(Document&);
>     Document* contextDocument() const;
>Index: Source/WebCore/testing/Internals.idl
>===================================================================
>--- Source/WebCore/testing/Internals.idl	(revision 235612)
>+++ Source/WebCore/testing/Internals.idl	(working copy)
>@@ -669,4 +669,6 @@ enum CompositingPolicy {
>     unsigned long pluginCount();
> 
>     void notifyResourceLoadObserver();
>+
>+    unsigned long primaryScreenDisplayID();
> };
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 235612)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2018-09-04  Per Arne Vollan  <pvollan@apple.com>
>+
>+        Add test for fix in https://bugs.webkit.org/show_bug.cgi?id=187922
>+        https://bugs.webkit.org/show_bug.cgi?id=187925
>+
>+        Reviewed by Simon Fraser.
>+
>+        This will test that the function primaryScreenDisplayID() returns a valid display ID.
>+
>+        * TestExpectations:
>+        * fast/misc/valid-primary-screen-displayID-expected.txt: Added.
>+        * fast/misc/valid-primary-screen-displayID.html: Added.
>+        * platform/mac-wk2/TestExpectations:
>+
> 2018-09-04  Zan Dobersek  <zdobersek@igalia.com> and Ms2ger  <Ms2ger@igalia.com>
> 
>         Implement support for passing ImageBitmap to texImage2D/texSubImage2D
>Index: LayoutTests/TestExpectations
>===================================================================
>--- LayoutTests/TestExpectations	(revision 235612)
>+++ LayoutTests/TestExpectations	(working copy)
>@@ -399,6 +399,11 @@ http/wpt/cross-origin-resource-policy/ [
> # testRunner.terminateNetworkProcess() only works in WebKit2
> fast/files/blob-network-process-crash.html [ Skip ]
> 
>+# This test is currently only relevant on mac-wk2
>+fast/canvas/webgl/context-update-on-display-configuration.html [ Skip ]
>+
>+fast/misc/valid-primary-screen-displayID.html [ Skip ]
>+
> #//////////////////////////////////////////////////////////////////////////////////////////
> # End platform-specific tests.
> #//////////////////////////////////////////////////////////////////////////////////////////
>@@ -2235,6 +2240,3 @@ webkit.org/b/187762 http/tests/websocket
> webkit.org/b/187269 [ Debug ] imported/w3c/web-platform-tests/FileAPI/reading-data-section/filereader_abort.html [ Skip ]
> 
> webkit.org/b/185308 legacy-animation-engine/animations/combo-transform-translate+scale.html [ Pass Failure ]
>-
>-# This test is currently only relevant on mac-wk2
>-fast/canvas/webgl/context-update-on-display-configuration.html [ Skip ]
>Index: LayoutTests/fast/misc/valid-primary-screen-displayID-expected.txt
>===================================================================
>--- LayoutTests/fast/misc/valid-primary-screen-displayID-expected.txt	(nonexistent)
>+++ LayoutTests/fast/misc/valid-primary-screen-displayID-expected.txt	(working copy)
>@@ -0,0 +1,2 @@
>+PASS: Valid primary screen display ID.
>+
>Index: LayoutTests/fast/misc/valid-primary-screen-displayID.html
>===================================================================
>--- LayoutTests/fast/misc/valid-primary-screen-displayID.html	(nonexistent)
>+++ LayoutTests/fast/misc/valid-primary-screen-displayID.html	(working copy)
>@@ -0,0 +1,25 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<title>This tests that the display ID of the primary screen is valid.</title>
>+<script>
>+function log(msg)
>+{
>+    document.getElementById('console').appendChild(document.createTextNode(msg + "\n"));
>+}
>+
>+function onload()
>+{
>+    if (window.testRunner)
>+        testRunner.dumpAsText();
>+    if (window.internals.primaryScreenDisplayID())
>+        log("PASS: Valid primary screen display ID.");
>+    else
>+        log("FAIL: Invalid primary screen display ID.");
>+}
>+</script>
>+</head>
>+<body onLoad="onload()">
>+<pre id="console"></pre>
>+</body>
>+</html>
>Index: LayoutTests/platform/mac-wk2/TestExpectations
>===================================================================
>--- LayoutTests/platform/mac-wk2/TestExpectations	(revision 235612)
>+++ LayoutTests/platform/mac-wk2/TestExpectations	(working copy)
>@@ -53,6 +53,10 @@ applicationmanifest/ [ Pass ]
> 
> webkit.org/b/187183 http/tests/security/pasteboard-file-url.html [ Pass ]
> 
>+[ Mojave+ ] fast/canvas/webgl/context-update-on-display-configuration.html [ Pass ]
>+
>+fast/misc/valid-primary-screen-displayID.html [ Pass ]
>+
> #//////////////////////////////////////////////////////////////////////////////////////////
> # End platform-specific directories.
> #//////////////////////////////////////////////////////////////////////////////////////////
>@@ -833,8 +837,6 @@ webkit.org/b/186362 [ Release ] http/tes
> 
> webkit.org/b/186425 [ Debug ] inspector/console/webcore-logging.html [ Pass Failure ]
> 
>-[ Mojave+ ] fast/canvas/webgl/context-update-on-display-configuration.html [ Pass ]
>-
> # skip manual payment-request tests
> imported/w3c/web-platform-tests/payment-request/MerchantValidationEvent/complete-method-manual.https.html [ Skip ]
> imported/w3c/web-platform-tests/payment-request/PaymentRequestUpdateEvent/updateWith-call-immediate-manual.https.html [ Skip ]

Actions: View | Formatted Diff | Diff

Attachments on bug 187925: 348651 | 348817