Attachment 341495 Details for Bug 186056 – Patch

[patch] Patch

bug-186056-20180529103219.patch (text/plain), 5.24 KB, created by Per Arne Vollan on 2018-05-29 10:32:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Per Arne Vollan

Created: 2018-05-29 10:32:20 PDT

Size: 5.24 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 232261)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2018-05-29  Per Arne Vollan  <pvollan@apple.com>
>+
>+        Create typedef for HashMap<PlatformDisplayID, ScreenProperties>
>+        https://bugs.webkit.org/show_bug.cgi?id=186056
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests, no change in behavior.
>+
>+        * platform/PlatformScreen.h:
>+        * platform/mac/PlatformScreenMac.mm:
>+        (WebCore::screenProperties):
>+        (WebCore::getScreenProperties):
>+        (WebCore::setScreenProperties):
>+
> 2018-05-29  Nan Wang  <n_wang@apple.com>
> 
>         AX: setValue on contenteditable should preserve whitespace
>Index: Source/WebCore/platform/PlatformScreen.h
>===================================================================
>--- Source/WebCore/platform/PlatformScreen.h	(revision 232261)
>+++ Source/WebCore/platform/PlatformScreen.h	(working copy)
>@@ -93,8 +93,10 @@ WEBCORE_EXPORT NSRect toDeviceSpace(cons
> 
> NSPoint flipScreenPoint(const NSPoint&, NSScreen *);
> 
>-WEBCORE_EXPORT std::pair<PlatformDisplayID, HashMap<PlatformDisplayID, ScreenProperties>> getScreenProperties();
>-WEBCORE_EXPORT void setScreenProperties(PlatformDisplayID primaryScreenID, const HashMap<PlatformDisplayID, ScreenProperties>&);
>+typedef HashMap<PlatformDisplayID, ScreenProperties> ScreenPropertiesMap;
>+
>+WEBCORE_EXPORT std::pair<PlatformDisplayID, ScreenPropertiesMap> getScreenProperties();
>+WEBCORE_EXPORT void setScreenProperties(PlatformDisplayID primaryScreenID, const ScreenPropertiesMap&);
> ScreenProperties screenProperties(PlatformDisplayID);
> 
> #endif
>Index: Source/WebCore/platform/mac/PlatformScreenMac.mm
>===================================================================
>--- Source/WebCore/platform/mac/PlatformScreenMac.mm	(revision 232261)
>+++ Source/WebCore/platform/mac/PlatformScreenMac.mm	(working copy)
>@@ -96,9 +96,9 @@ static NSScreen *screen(Widget* widget)
>     return screen(displayID(widget));
> }
> 
>-static HashMap<PlatformDisplayID, ScreenProperties>& screenProperties()
>+static ScreenPropertiesMap& screenProperties()
> {
>-    static NeverDestroyed<HashMap<PlatformDisplayID, ScreenProperties>> screenProperties;
>+    static NeverDestroyed<ScreenPropertiesMap> screenProperties;
>     return screenProperties;
> }
> 
>@@ -108,11 +108,11 @@ static PlatformDisplayID& primaryScreenD
>     return primaryScreenDisplayID;
> }
> 
>-std::pair<PlatformDisplayID, HashMap<PlatformDisplayID, ScreenProperties>> getScreenProperties()
>+std::pair<PlatformDisplayID, ScreenPropertiesMap> getScreenProperties()
> {
>     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
> 
>-    HashMap<PlatformDisplayID, ScreenProperties> screenProperties;
>+    ScreenPropertiesMap screenProperties;
>     std::optional<PlatformDisplayID> firstScreen;
> 
>     for (NSScreen *screen in [NSScreen screens]) {
>@@ -138,7 +138,7 @@ std::pair<PlatformDisplayID, HashMap<Pla
>     return { WTFMove(*firstScreen), WTFMove(screenProperties) };
> }
> 
>-void setScreenProperties(PlatformDisplayID primaryScreenID, const HashMap<PlatformDisplayID, ScreenProperties>& properties)
>+void setScreenProperties(PlatformDisplayID primaryScreenID, const ScreenPropertiesMap& properties)
> {
>     primaryScreenDisplayID() = primaryScreenID;
>     screenProperties() = properties;
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 232262)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-05-29  Per Arne Vollan  <pvollan@apple.com>
>+
>+        Create typedef for HashMap<PlatformDisplayID, ScreenProperties>
>+        https://bugs.webkit.org/show_bug.cgi?id=186056
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Shared/WebProcessCreationParameters.cpp:
>+        (WebKit::WebProcessCreationParameters::decode):
>+        * Shared/WebProcessCreationParameters.h:
>+
> 2018-05-29  Per Arne Vollan  <pvollan@apple.com>
> 
>         Follow-up fixes after r228907.
>Index: Source/WebKit/Shared/WebProcessCreationParameters.cpp
>===================================================================
>--- Source/WebKit/Shared/WebProcessCreationParameters.cpp	(revision 232261)
>+++ Source/WebKit/Shared/WebProcessCreationParameters.cpp	(working copy)
>@@ -410,7 +410,7 @@ bool WebProcessCreationParameters::decod
>     if (!decoder.decode(parameters.primaryDisplayID))
>         return false;
> 
>-    std::optional<HashMap<WebCore::PlatformDisplayID, WebCore::ScreenProperties>> screenPropertiesMap;
>+    std::optional<WebCore::ScreenPropertiesMap> screenPropertiesMap;
>     decoder >> screenPropertiesMap;
>     if (!screenPropertiesMap)
>         return false;
>Index: Source/WebKit/Shared/WebProcessCreationParameters.h
>===================================================================
>--- Source/WebKit/Shared/WebProcessCreationParameters.h	(revision 232261)
>+++ Source/WebKit/Shared/WebProcessCreationParameters.h	(working copy)
>@@ -196,7 +196,7 @@ struct WebProcessCreationParameters {
> 
> #if PLATFORM(MAC)
>     WebCore::PlatformDisplayID primaryDisplayID { 0 };
>-    HashMap<WebCore::PlatformDisplayID, WebCore::ScreenProperties> screenPropertiesMap;
>+    WebCore::ScreenPropertiesMap screenPropertiesMap;
> #endif
> };
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186056: 341495