Diff
Modified: trunk/Source/WebCore/ChangeLog (238335 => 238336)
--- trunk/Source/WebCore/ChangeLog 2018-11-17 02:26:06 UTC (rev 238335)
+++ trunk/Source/WebCore/ChangeLog 2018-11-17 02:46:49 UTC (rev 238336)
@@ -1,3 +1,30 @@
+2018-11-16 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Provide default implementation of Widget
+ https://bugs.webkit.org/show_bug.cgi?id=191784
+
+ Reviewed by Michael Catanzaro.
+
+ * SourcesWPE.txt:
+ * platform/Widget.cpp:
+ (WebCore::Widget::Widget):
+ (WebCore::Widget::frameRect const):
+ (WebCore::Widget::~Widget):
+ (WebCore::Widget::setFrameRect):
+ (WebCore::Widget::paint):
+ (WebCore::Widget::setFocus):
+ (WebCore::Widget::setCursor):
+ (WebCore::Widget::show):
+ (WebCore::Widget::hide):
+ (WebCore::Widget::setIsSelected):
+ * platform/gtk/WidgetGtk.cpp:
+ (WebCore::Widget::Widget): Deleted.
+ (WebCore::Widget::frameRect const): Deleted.
+ * platform/win/WidgetWin.cpp:
+ (WebCore::Widget::Widget): Deleted.
+ (WebCore::Widget::frameRect const): Deleted.
+ * platform/wpe/WidgetWPE.cpp: Removed.
+
2018-11-16 Chris Dumez <cdu...@apple.com>
[macOS] Label "prewarmed" WebContent processes in Activity Monitor
Modified: trunk/Source/WebCore/SourcesWPE.txt (238335 => 238336)
--- trunk/Source/WebCore/SourcesWPE.txt 2018-11-17 02:26:06 UTC (rev 238335)
+++ trunk/Source/WebCore/SourcesWPE.txt 2018-11-17 02:46:49 UTC (rev 238336)
@@ -76,6 +76,5 @@
platform/wpe/RenderThemeWPE.cpp
platform/wpe/ScrollbarThemeWPE.cpp
platform/wpe/ThemeWPE.cpp
-platform/wpe/WidgetWPE.cpp
platform/xdg/MIMETypeRegistryXdg.cpp
Modified: trunk/Source/WebCore/platform/Widget.cpp (238335 => 238336)
--- trunk/Source/WebCore/platform/Widget.cpp 2018-11-17 02:26:06 UTC (rev 238335)
+++ trunk/Source/WebCore/platform/Widget.cpp 2018-11-17 02:46:49 UTC (rev 238336)
@@ -28,6 +28,7 @@
#include "FrameView.h"
#include "IntRect.h"
+#include "NotImplemented.h"
#include <wtf/Assertions.h>
namespace WebCore {
@@ -149,6 +150,17 @@
}
#if !PLATFORM(COCOA)
+
+Widget::Widget(PlatformWidget widget)
+{
+ init(widget);
+}
+
+IntRect Widget::frameRect() const
+{
+ return m_frame;
+}
+
IntRect Widget::convertFromRootToContainingWindow(const Widget*, const IntRect& rect)
{
return rect;
@@ -168,8 +180,9 @@
{
return point;
}
-#endif
+#endif // !PLATFORM(COCOA)
+
IntRect Widget::convertToContainingView(const IntRect& localRect) const
{
if (const ScrollView* parentScrollView = parent()) {
@@ -212,4 +225,50 @@
return parentPoint;
}
+#if !PLATFORM(COCOA) && !PLATFORM(GTK) && !PLATFORM(WIN)
+
+Widget::~Widget()
+{
+ ASSERT(!parent());
+ notImplemented();
+}
+
+void Widget::setFrameRect(const IntRect& rect)
+{
+ m_frame = rect;
+ notImplemented();
+}
+
+void Widget::paint(GraphicsContext&, const IntRect&, SecurityOriginPaintPolicy)
+{
+ notImplemented();
+}
+
+void Widget::setFocus(bool)
+{
+ notImplemented();
+}
+
+void Widget::setCursor(const Cursor&)
+{
+ notImplemented();
+}
+
+void Widget::show()
+{
+ notImplemented();
+}
+
+void Widget::hide()
+{
+ notImplemented();
+}
+
+void Widget::setIsSelected(bool)
+{
+ notImplemented();
+}
+
+#endif // !PLATFORM(COCOA) && !PLATFORM(GTK) && !PLATFORM(WIN)
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/gtk/WidgetGtk.cpp (238335 => 238336)
--- trunk/Source/WebCore/platform/gtk/WidgetGtk.cpp 2018-11-17 02:26:06 UTC (rev 238335)
+++ trunk/Source/WebCore/platform/gtk/WidgetGtk.cpp 2018-11-17 02:46:49 UTC (rev 238336)
@@ -40,11 +40,6 @@
namespace WebCore {
-Widget::Widget(PlatformWidget widget)
-{
- init(widget);
-}
-
Widget::~Widget()
{
ASSERT(!parent());
@@ -99,11 +94,6 @@
g_object_set(platformWidget(), "webkit-widget-is-selected", isSelected, NULL);
}
-IntRect Widget::frameRect() const
-{
- return m_frame;
-}
-
void Widget::setFrameRect(const IntRect& rect)
{
m_frame = rect;
Modified: trunk/Source/WebCore/platform/win/WidgetWin.cpp (238335 => 238336)
--- trunk/Source/WebCore/platform/win/WidgetWin.cpp 2018-11-17 02:26:06 UTC (rev 238335)
+++ trunk/Source/WebCore/platform/win/WidgetWin.cpp 2018-11-17 02:46:49 UTC (rev 238336)
@@ -40,11 +40,6 @@
namespace WebCore {
-Widget::Widget(PlatformWidget widget)
-{
- init(widget);
-}
-
Widget::~Widget()
{
ASSERT(!parent());
@@ -87,11 +82,6 @@
{
}
-IntRect Widget::frameRect() const
-{
- return m_frame;
-}
-
void Widget::setFrameRect(const IntRect& rect)
{
m_frame = rect;
Deleted: trunk/Source/WebCore/platform/wpe/WidgetWPE.cpp (238335 => 238336)
--- trunk/Source/WebCore/platform/wpe/WidgetWPE.cpp 2018-11-17 02:26:06 UTC (rev 238335)
+++ trunk/Source/WebCore/platform/wpe/WidgetWPE.cpp 2018-11-17 02:46:49 UTC (rev 238336)
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2014 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "Widget.h"
-
-#include "NotImplemented.h"
-
-namespace WebCore {
-
-Widget::Widget(PlatformWidget widget)
-{
- init(widget);
-}
-
-Widget::~Widget()
-{
- ASSERT(!parent());
- notImplemented();
-}
-
-void Widget::setFrameRect(const IntRect& rect)
-{
- m_frame = rect;
- notImplemented();
-}
-
-IntRect Widget::frameRect() const
-{
- return m_frame;
-}
-
-void Widget::paint(GraphicsContext&, const IntRect&, SecurityOriginPaintPolicy)
-{
- notImplemented();
-}
-
-void Widget::setFocus(bool)
-{
- notImplemented();
-}
-
-void Widget::setCursor(const Cursor&)
-{
- notImplemented();
-}
-
-void Widget::show()
-{
- notImplemented();
-}
-
-void Widget::hide()
-{
- notImplemented();
-}
-
-void Widget::setIsSelected(bool)
-{
- notImplemented();
-}
-
-} // namespace WebCore
