Diff
Modified: trunk/Source/WebCore/ChangeLog (186006 => 186007)
--- trunk/Source/WebCore/ChangeLog 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/ChangeLog 2015-06-26 20:42:38 UTC (rev 186007)
@@ -1,3 +1,42 @@
+2015-06-25 Anders Carlsson <ander...@apple.com>
+
+ Get rid of ScrollbarThemeClient now that it's unused
+ https://bugs.webkit.org/show_bug.cgi?id=146327
+
+ Reviewed by Beth Dakin.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::scrollbarOverlayStyle): Deleted.
+ (WebCore::Scrollbar::isScrollableAreaActive): Deleted.
+ (WebCore::Scrollbar::isScrollViewScrollbar): Deleted.
+ (WebCore::Scrollbar::root): Deleted.
+ * platform/Scrollbar.h:
+ (WebCore::Scrollbar::isCustomScrollbar):
+ (WebCore::Scrollbar::orientation):
+ (WebCore::Scrollbar::value):
+ (WebCore::Scrollbar::currentPos):
+ (WebCore::Scrollbar::visibleSize):
+ (WebCore::Scrollbar::totalSize):
+ (WebCore::Scrollbar::maximum):
+ (WebCore::Scrollbar::controlSize):
+ (WebCore::Scrollbar::lineStep):
+ (WebCore::Scrollbar::pageStep):
+ (WebCore::Scrollbar::pressedPart):
+ (WebCore::Scrollbar::hoveredPart):
+ (WebCore::Scrollbar::enabled):
+ (WebCore::Scrollbar::styleChanged):
+ (WebCore::Scrollbar::isAlphaLocked):
+ (WebCore::Scrollbar::setIsAlphaLocked):
+ * platform/ScrollbarTheme.h:
+ * platform/ScrollbarThemeClient.h: Removed.
+ (WebCore::ScrollbarThemeClient::~ScrollbarThemeClient): Deleted.
+ * platform/mac/ScrollbarThemeMac.mm:
+ (WebCore::ScrollbarThemeMac::updateScrollbarOverlayStyle):
+ * rendering/RenderScrollbarTheme.cpp:
+
2015-06-26 Chris Dumez <cdu...@apple.com>
Prevent new loads while in PageCache (or being added to PageCache)
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (186006 => 186007)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-06-26 20:42:38 UTC (rev 186007)
@@ -19908,7 +19908,6 @@
<ClInclude Include="..\platform\ScrollAnimatorNone.h" />
<ClInclude Include="..\platform\Scrollbar.h" />
<ClInclude Include="..\platform\ScrollbarTheme.h" />
- <ClInclude Include="..\platform\ScrollbarThemeClient.h" />
<ClInclude Include="..\platform\ScrollbarThemeComposite.h" />
<ClInclude Include="..\platform\ScrollTypes.h" />
<ClInclude Include="..\platform\ScrollView.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (186006 => 186007)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-06-26 20:42:38 UTC (rev 186007)
@@ -8280,9 +8280,6 @@
<ClInclude Include="..\platform\ScrollbarTheme.h">
<Filter>platform</Filter>
</ClInclude>
- <ClInclude Include="..\platform\ScrollbarThemeClient.h">
- <Filter>platform</Filter>
- </ClInclude>
<ClInclude Include="..\platform\ScrollbarThemeComposite.h">
<Filter>platform</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186006 => 186007)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-26 20:42:38 UTC (rev 186007)
@@ -5685,7 +5685,6 @@
C5EBDD84105EDDEC0056816F /* StorageEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = C5EBDD81105EDDEC0056816F /* StorageEventDispatcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
C65046A9167BFB5500CC2A4D /* TemplateContentDocumentFragment.h in Headers */ = {isa = PBXBuildFile; fileRef = C65046A8167BFB5500CC2A4D /* TemplateContentDocumentFragment.h */; };
C6A703325C9D0B6CDCBC4D77 /* JSEventTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6A703325C9D0B6CDCBC4D78 /* JSEventTarget.cpp */; };
- C6B31B2E14F841FB0089F23F /* ScrollbarThemeClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C691614714F6EBA70046375C /* ScrollbarThemeClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
C6D74AD509AA282E000B0A52 /* ModifySelectionListLevel.h in Headers */ = {isa = PBXBuildFile; fileRef = C6D74AD309AA282E000B0A52 /* ModifySelectionListLevel.h */; };
C6D74AE409AA290A000B0A52 /* ModifySelectionListLevel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6D74AE309AA290A000B0A52 /* ModifySelectionListLevel.cpp */; };
C6F08FBC1430FE8F00685849 /* MutationRecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6F08FB91430FE8F00685849 /* MutationRecord.cpp */; };
@@ -13262,7 +13261,6 @@
C5F765B414E1D414006C899B /* PasteboardStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PasteboardStrategy.h; sourceTree = "<group>"; };
C5F765BA14E1ECF4006C899B /* PlatformPasteboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformPasteboardMac.mm; sourceTree = "<group>"; };
C65046A8167BFB5500CC2A4D /* TemplateContentDocumentFragment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemplateContentDocumentFragment.h; sourceTree = "<group>"; };
- C691614714F6EBA70046375C /* ScrollbarThemeClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarThemeClient.h; sourceTree = "<group>"; };
C6A703325C9D0B6CDCBC4D78 /* JSEventTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSEventTarget.cpp; sourceTree = "<group>"; };
C6D74AD309AA282E000B0A52 /* ModifySelectionListLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifySelectionListLevel.h; sourceTree = "<group>"; };
C6D74AE309AA290A000B0A52 /* ModifySelectionListLevel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModifySelectionListLevel.cpp; sourceTree = "<group>"; };
@@ -21908,7 +21906,6 @@
BC7B2AF80450824100A8000F /* Scrollbar.h */,
0FE71415142189FC00DB33BA /* ScrollbarTheme.cpp */,
BC8B854A0E7C7F5600AB6984 /* ScrollbarTheme.h */,
- C691614714F6EBA70046375C /* ScrollbarThemeClient.h */,
BC1402880E83680800319717 /* ScrollbarThemeComposite.cpp */,
BC1402890E83680800319717 /* ScrollbarThemeComposite.h */,
93C09C850B0657AA005ABD4D /* ScrollTypes.h */,
@@ -26484,7 +26481,6 @@
BCAE1FA712939DB7004CB026 /* ScrollAnimatorMac.h in Headers */,
93F199B808245E59001E9ABC /* Scrollbar.h in Headers */,
BC8B854B0E7C7F5600AB6984 /* ScrollbarTheme.h in Headers */,
- C6B31B2E14F841FB0089F23F /* ScrollbarThemeClient.h in Headers */,
BC14028B0E83680800319717 /* ScrollbarThemeComposite.h in Headers */,
44C991860F3D1EBE00586670 /* ScrollbarThemeIOS.h in Headers */,
BC8B853E0E7C7F1100AB6984 /* ScrollbarThemeMac.h in Headers */,
Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (186006 => 186007)
--- trunk/Source/WebCore/platform/Scrollbar.cpp 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2015-06-26 20:42:38 UTC (rev 186007)
@@ -103,21 +103,6 @@
m_theme->unregisterScrollbar(*this);
}
-ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const
-{
- return m_scrollableArea.scrollbarOverlayStyle();
-}
-
-bool Scrollbar::isScrollableAreaActive() const
-{
- return m_scrollableArea.isActive();
-}
-
-bool Scrollbar::isScrollViewScrollbar() const
-{
- return parent() && parent()->isScrollViewScrollbar(this);
-}
-
void Scrollbar::offsetDidChange()
{
float position = static_cast<float>(m_scrollableArea.scrollPosition(this));
@@ -495,9 +480,4 @@
#endif
}
-ScrollView* Scrollbar::root() const
-{
- return Widget::root();
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/Scrollbar.h (186006 => 186007)
--- trunk/Source/WebCore/platform/Scrollbar.h 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/platform/Scrollbar.h 2015-06-26 20:42:38 UTC (rev 186007)
@@ -26,7 +26,6 @@
#ifndef Scrollbar_h
#define Scrollbar_h
-#include "ScrollbarThemeClient.h"
#include "ScrollTypes.h"
#include "Timer.h"
#include "Widget.h"
@@ -41,59 +40,13 @@
class ScrollableArea;
class ScrollbarTheme;
-class Scrollbar : public Widget,
- public ScrollbarThemeClient {
-
+class Scrollbar : public Widget {
public:
// Must be implemented by platforms that can't simply use the Scrollbar base class. Right now the only platform that is not using the base class is GTK.
WEBCORE_EXPORT static PassRefPtr<Scrollbar> createNativeScrollbar(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize);
virtual ~Scrollbar();
- // ScrollbarThemeClient implementation.
- virtual int x() const override { return Widget::x(); }
- virtual int y() const override { return Widget::y(); }
- virtual int width() const override { return Widget::width(); }
- virtual int height() const override { return Widget::height(); }
- virtual IntSize size() const override { return Widget::size(); }
- virtual IntPoint location() const override { return Widget::location(); }
-
- virtual ScrollView* parent() const override { return Widget::parent(); }
- virtual ScrollView* root() const override;
-
- virtual void setFrameRect(const IntRect& rect) override { Widget::setFrameRect(rect); }
- virtual IntRect frameRect() const override { return Widget::frameRect(); }
-
- virtual void invalidate() override { Widget::invalidate(); }
- virtual void invalidateRect(const IntRect&) override;
-
- virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const override;
- virtual bool isScrollableAreaActive() const override;
- virtual bool isScrollViewScrollbar() const override;
-
- virtual IntPoint convertFromContainingWindow(const IntPoint& windowPoint) override { return Widget::convertFromContainingWindow(windowPoint); }
-
- virtual bool isCustomScrollbar() const override final { return m_isCustomScrollbar; }
- virtual ScrollbarOrientation orientation() const override { return m_orientation; }
-
- virtual int value() const override { return lroundf(m_currentPos); }
- virtual float currentPos() const override { return m_currentPos; }
- virtual int visibleSize() const override { return m_visibleSize; }
- virtual int totalSize() const override { return m_totalSize; }
- virtual int maximum() const override { return m_totalSize - m_visibleSize; }
- virtual ScrollbarControlSize controlSize() const override { return m_controlSize; }
-
- virtual int lineStep() const override { return m_lineStep; }
- virtual int pageStep() const override { return m_pageStep; }
-
- virtual ScrollbarPart pressedPart() const override { return m_pressedPart; }
- virtual ScrollbarPart hoveredPart() const override { return m_hoveredPart; }
-
- virtual void styleChanged() override { }
-
- virtual bool enabled() const override { return m_enabled; }
- virtual void setEnabled(bool) override;
-
// Called by the ScrollableArea when the scroll offset changes.
void offsetDidChange();
@@ -106,10 +59,23 @@
ScrollableArea& scrollableArea() const { return m_scrollableArea; }
+ bool isCustomScrollbar() const { return m_isCustomScrollbar; }
+ ScrollbarOrientation orientation() const { return m_orientation; }
+
+ int value() const { return lroundf(m_currentPos); }
+ float currentPos() const { return m_currentPos; }
int pressedPos() const { return m_pressedPos; }
+ int visibleSize() const { return m_visibleSize; }
+ int totalSize() const { return m_totalSize; }
+ int maximum() const { return m_totalSize - m_visibleSize; }
+ ScrollbarControlSize controlSize() const { return m_controlSize; }
+ int lineStep() const { return m_lineStep; }
+ int pageStep() const { return m_pageStep; }
float pixelStep() const { return m_pixelStep; }
+ ScrollbarPart pressedPart() const { return m_pressedPart; }
+ ScrollbarPart hoveredPart() const { return m_hoveredPart; }
virtual void setHoveredPart(ScrollbarPart);
virtual void setPressedPart(ScrollbarPart);
@@ -119,7 +85,10 @@
virtual void paint(GraphicsContext*, const IntRect& damageRect) override;
- virtual bool isOverlayScrollbar() const override;
+ bool enabled() const { return m_enabled; }
+ virtual void setEnabled(bool);
+
+ virtual bool isOverlayScrollbar() const;
bool shouldParticipateInHitTesting();
bool isWindowActive() const;
@@ -140,9 +109,13 @@
ScrollbarTheme* theme() const { return m_theme; }
+ virtual void invalidateRect(const IntRect&) override;
+
bool suppressInvalidation() const { return m_suppressInvalidation; }
void setSuppressInvalidation(bool s) { m_suppressInvalidation = s; }
+ virtual void styleChanged() { }
+
virtual IntRect convertToContainingView(const IntRect&) const override;
virtual IntRect convertFromContainingView(const IntRect&) const override;
@@ -151,10 +124,10 @@
void moveThumb(int pos, bool draggingDocument = false);
- virtual bool isAlphaLocked() const override { return m_isAlphaLocked; }
- virtual void setIsAlphaLocked(bool flag) override { m_isAlphaLocked = flag; }
+ bool isAlphaLocked() const { return m_isAlphaLocked; }
+ void setIsAlphaLocked(bool flag) { m_isAlphaLocked = flag; }
- virtual bool supportsUpdateOnSecondaryThread() const override;
+ bool supportsUpdateOnSecondaryThread() const;
WeakPtr<Scrollbar> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
Modified: trunk/Source/WebCore/platform/ScrollbarTheme.h (186006 => 186007)
--- trunk/Source/WebCore/platform/ScrollbarTheme.h 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/platform/ScrollbarTheme.h 2015-06-26 20:42:38 UTC (rev 186007)
@@ -34,7 +34,6 @@
class PlatformMouseEvent;
class Scrollbar;
-class ScrollbarThemeClient;
class ScrollView;
#if ENABLE(RUBBER_BANDING)
Deleted: trunk/Source/WebCore/platform/ScrollbarThemeClient.h (186006 => 186007)
--- trunk/Source/WebCore/platform/ScrollbarThemeClient.h 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/platform/ScrollbarThemeClient.h 2015-06-26 20:42:38 UTC (rev 186007)
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * 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 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 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.
- */
-
-#ifndef ScrollbarThemeClient_h
-#define ScrollbarThemeClient_h
-
-#include "IntPoint.h"
-#include "IntRect.h"
-#include "IntSize.h"
-#include "ScrollTypes.h"
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-class ScrollView;
-
-class ScrollbarThemeClient {
-public:
- virtual int x() const = 0;
- virtual int y() const = 0;
- virtual int width() const = 0;
- virtual int height() const = 0;
- virtual IntSize size() const = 0;
- virtual IntPoint location() const = 0;
-
- virtual ScrollView* parent() const = 0;
- virtual ScrollView* root() const = 0;
-
- virtual void setFrameRect(const IntRect&) = 0;
- virtual IntRect frameRect() const = 0;
-
- virtual void invalidate() = 0;
- virtual void invalidateRect(const IntRect&) = 0;
-
- virtual ScrollbarOverlayStyle scrollbarOverlayStyle() const = 0;
- virtual bool isScrollableAreaActive() const = 0;
- virtual bool isScrollViewScrollbar() const = 0;
-
- virtual IntPoint convertFromContainingWindow(const IntPoint& windowPoint) = 0;
-
- virtual bool isCustomScrollbar() const = 0;
- virtual ScrollbarOrientation orientation() const = 0;
-
- virtual int value() const = 0;
- virtual float currentPos() const = 0;
- virtual int visibleSize() const = 0;
- virtual int totalSize() const = 0;
- virtual int maximum() const = 0;
- virtual ScrollbarControlSize controlSize() const = 0;
-
- virtual int lineStep() const = 0;
- virtual int pageStep() const = 0;
-
- virtual ScrollbarPart pressedPart() const = 0;
- virtual ScrollbarPart hoveredPart() const = 0;
-
- virtual void styleChanged() = 0;
-
- virtual bool enabled() const = 0;
- virtual void setEnabled(bool) = 0;
-
- virtual bool isOverlayScrollbar() const = 0;
-
- virtual bool isAlphaLocked() const = 0;
- virtual void setIsAlphaLocked(bool) = 0;
-
- virtual bool supportsUpdateOnSecondaryThread() const = 0;
-
-protected:
- virtual ~ScrollbarThemeClient() { }
-};
-
-} // namespace WebCore
-
-#endif // ScollbarThemeClient_h
Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (186006 => 186007)
--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2015-06-26 20:42:38 UTC (rev 186007)
@@ -244,7 +244,7 @@
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
ScrollbarPainter painter = painterForScrollbar(scrollbar);
- switch (scrollbar.scrollbarOverlayStyle()) {
+ switch (scrollbar.scrollableArea().scrollbarOverlayStyle()) {
case ScrollbarOverlayStyleDefault:
[painter setKnobStyle:NSScrollerKnobStyleDefault];
break;
Modified: trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp (186006 => 186007)
--- trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp 2015-06-26 19:21:02 UTC (rev 186006)
+++ trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp 2015-06-26 20:42:38 UTC (rev 186007)
@@ -26,7 +26,6 @@
#include "config.h"
#include "RenderScrollbarTheme.h"
#include "RenderScrollbar.h"
-#include "ScrollbarThemeClient.h"
#include <wtf/StdLibExtras.h>
namespace WebCore {
