Attachment 341589 Details for Bug 186105 – Patch

[patch] Patch

bug-186105-20180530115733.patch (text/plain), 7.47 KB, created by Aditya Keerthi on 2018-05-30 11:57:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aditya Keerthi

Created: 2018-05-30 11:57:34 PDT

Size: 7.47 KB

patch

obsolete

>Subversion Revision: 231387
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f05708ea21691709e7e242af99b1e73f3581923a..281142e36888462b961bb3dae162462ac9571b35 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-05-30  Aditya Keerthi  <akeerthi@apple.com>
>+
>+        Fix the ENABLE(DATALIST_ELEMENT) build
>+        https://bugs.webkit.org/show_bug.cgi?id=186105
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * html/ColorInputType.cpp:
>+        (WebCore::ColorInputType::suggestions const):
>+        * html/HTMLInputElement.h:
>+        * html/HTMLOptionElement.cpp:
>+        (WebCore::HTMLOptionElement::ownerDataListElement const):
>+        * rendering/RenderTheme.cpp:
>+        (WebCore::RenderTheme::paintSliderTicks):
>+
> 2018-05-04  Don Olmstead  <don.olmstead@sony.com>
> 
>         [Win][WebKit] Fix forwarding headers for Windows build
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index dff61eb74030c77c8490608d234179627de341fd..93b45fc0edf457288830785dccc91aac137af05f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-05-30  Aditya Keerthi  <akeerthi@apple.com>
>+
>+        Fix the ENABLE(DATALIST_ELEMENT) build
>+        https://bugs.webkit.org/show_bug.cgi?id=186105
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebProcess/Automation/WebAutomationSessionProxy.cpp:
>+
> 2018-05-04  Don Olmstead  <don.olmstead@sony.com>
> 
>         [Win][WebKit] Fix forwarding headers for Windows build
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 82efaeaa2d80df57bbe89bd64504a99ed0078c24..89c21b42b64c9ac4ca08c300612da9f90f678a8d 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -4817,7 +4817,7 @@
> 		F5973DE015CFB2030027F804 /* LocaleMac.h in Headers */ = {isa = PBXBuildFile; fileRef = F5973DDE15CFB2030027F804 /* LocaleMac.h */; };
> 		F59C96001255B23F000623C0 /* BaseDateAndTimeInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = F59C95FE1255B23F000623C0 /* BaseDateAndTimeInputType.h */; };
> 		F5A154281279534D00D0B0C0 /* ValidationMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = F5A154261279534D00D0B0C0 /* ValidationMessage.h */; };
>-		F5C041DB0FFCA7CE00839D4A /* HTMLDataListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C041D80FFCA7CE00839D4A /* HTMLDataListElement.h */; };
>+		F5C041DB0FFCA7CE00839D4A /* HTMLDataListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C041D80FFCA7CE00839D4A /* HTMLDataListElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		F5C041E70FFCA96D00839D4A /* JSHTMLDataListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C041E20FFCA96D00839D4A /* JSHTMLDataListElement.h */; };
> 		F5E0C65C1643C42C00D6CB69 /* BaseChooserOnlyDateAndTimeInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E0C65A1643C42C00D6CB69 /* BaseChooserOnlyDateAndTimeInputType.h */; };
> 		F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */; };
>diff --git a/Source/WebCore/html/ColorInputType.cpp b/Source/WebCore/html/ColorInputType.cpp
>index d4df13c32f193cad4a0307507f2a8e57b2323dc9..d9e4d42ef592daee9b5870290a35894e4c6e8213 100644
>--- a/Source/WebCore/html/ColorInputType.cpp
>+++ b/Source/WebCore/html/ColorInputType.cpp
>@@ -253,7 +253,7 @@ Vector<Color> ColorInputType::suggestions() const
>         suggestions.reserveInitialCapacity(length);
>         for (unsigned i = 0; i != length; ++i) {
>             auto value = downcast<HTMLOptionElement>(*options->item(i)).value();
>-            if (isValidSimpleColorString(value))
>+            if (isValidSimpleColor(value))
>                 suggestions.uncheckedAppend(Color(value));
>         }
>     }
>diff --git a/Source/WebCore/html/HTMLInputElement.h b/Source/WebCore/html/HTMLInputElement.h
>index 138433241fa549453f69055f1675b476a69c9465..60e4d8ee149797dfecfcf9f08c51500f6a661ce9 100644
>--- a/Source/WebCore/html/HTMLInputElement.h
>+++ b/Source/WebCore/html/HTMLInputElement.h
>@@ -268,7 +268,7 @@ public:
>     bool willRespondToMouseClickEvents() override;
> 
> #if ENABLE(DATALIST_ELEMENT)
>-    RefPtr<HTMLElement> list() const;
>+    WEBCORE_EXPORT RefPtr<HTMLElement> list() const;
>     RefPtr<HTMLDataListElement> dataList() const;
>     void listAttributeTargetChanged();
> #endif
>diff --git a/Source/WebCore/html/HTMLOptionElement.cpp b/Source/WebCore/html/HTMLOptionElement.cpp
>index 9f6dad2d1a4e856bd2a05bdfcd792cfe20ea483e..a0143f32a1475baf6884b2c038df97e8abef2c8d 100644
>--- a/Source/WebCore/html/HTMLOptionElement.cpp
>+++ b/Source/WebCore/html/HTMLOptionElement.cpp
>@@ -250,11 +250,14 @@ void HTMLOptionElement::childrenChanged(const ChildChange& change)
> #if ENABLE(DATALIST_ELEMENT)
> HTMLDataListElement* HTMLOptionElement::ownerDataListElement() const
> {
>-    for (RefPtr<ContainerNode> parent = parentNode(); parent ; parent = parent->parentNode()) {
>-        if (is<HTMLDataListElement>(*parent))
>-            return downcast<HTMLDataListElement>(parent);
>-    }
>-    return nullptr;
>+    RefPtr<ContainerNode> datalist = parentNode();
>+    while (datalist && !is<HTMLDataListElement>(*datalist))
>+        datalist = datalist->parentNode();
>+
>+    if (!datalist)
>+        return nullptr;
>+
>+    return downcast<HTMLDataListElement>(datalist.get());
> }
> #endif
> 
>diff --git a/Source/WebCore/rendering/RenderTheme.cpp b/Source/WebCore/rendering/RenderTheme.cpp
>index a707f18cf134092aeeeb0fe7c18ff1cb42b0efd0..27fe8806aeae298acf1f8702e869f5a5cca74b1d 100644
>--- a/Source/WebCore/rendering/RenderTheme.cpp
>+++ b/Source/WebCore/rendering/RenderTheme.cpp
>@@ -1000,10 +1000,12 @@ void RenderTheme::paintSliderTicks(const RenderObject& o, const PaintInfo& paint
>         return;
> 
>     auto& input = downcast<HTMLInputElement>(*o.node());
>-    auto* dataList = downcast<HTMLDataListElement>(input.list());
>-    if (!dataList)
>+
>+    if (!input.list())
>         return;
> 
>+    auto& dataList = downcast<HTMLDataListElement>(*input.list());
>+
>     double min = input.minimum();
>     double max = input.maximum();
>     ControlPart part = o.style().appearance();
>@@ -1051,7 +1053,7 @@ void RenderTheme::paintSliderTicks(const RenderObject& o, const PaintInfo& paint
>         tickRegionSideMargin = trackBounds.y() + (thumbSize.width() - tickSize.width() * zoomFactor) / 2.0;
>         tickRegionWidth = trackBounds.height() - thumbSize.width();
>     }
>-    Ref<HTMLCollection> options = dataList->options();
>+    Ref<HTMLCollection> options = dataList.options();
>     GraphicsContextStateSaver stateSaver(paintInfo.context());
>     paintInfo.context().setFillColor(o.style().visitedDependentColorWithColorFilter(CSSPropertyColor));
>     for (unsigned i = 0; Node* node = options->item(i); i++) {
>diff --git a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp
>index b4221647f5aecd72ea4cce27603b28587f81aa2a..6a5b715bab6f8888e603770aaf5aadf77ad5e748 100644
>--- a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp
>+++ b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp
>@@ -48,6 +48,9 @@
> #include <WebCore/Frame.h>
> #include <WebCore/FrameTree.h>
> #include <WebCore/FrameView.h>
>+#if ENABLE(DATALIST_ELEMENT)
>+#include <WebCore/HTMLDataListElement.h>
>+#endif
> #include <WebCore/HTMLFrameElementBase.h>
> #include <WebCore/HTMLOptGroupElement.h>
> #include <WebCore/HTMLOptionElement.h>

Actions: View | Formatted Diff | Diff

Attachments on bug 186105: 341589 | 341593