diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/platform')
31 files changed, 119 insertions, 133 deletions
diff --git a/chromium/third_party/WebKit/Source/core/platform/AsyncFileSystem.h b/chromium/third_party/WebKit/Source/core/platform/AsyncFileSystem.h index d260af8b65d..2a408f80a15 100644 --- a/chromium/third_party/WebKit/Source/core/platform/AsyncFileSystem.h +++ b/chromium/third_party/WebKit/Source/core/platform/AsyncFileSystem.h @@ -54,7 +54,7 @@ public: // Subclass must implement this if it supports synchronous operations. // This should return false if there are no pending operations. - virtual bool waitForOperationToComplete() { return true; } + virtual bool waitForOperationToComplete() { return false; } // Creates and returns a new platform-specific AsyncFileSystem instance if the platform has its own implementation. static PassOwnPtr<AsyncFileSystem> create(); diff --git a/chromium/third_party/WebKit/Source/core/platform/DEPS b/chromium/third_party/WebKit/Source/core/platform/DEPS index cfd697d11ac..f1e4fe8f090 100644 --- a/chromium/third_party/WebKit/Source/core/platform/DEPS +++ b/chromium/third_party/WebKit/Source/core/platform/DEPS @@ -17,7 +17,7 @@ include_rules = [ "!core/fileapi", "!core/html", "!core/inspector", - "!core/fetch", + "!core/loader/cache", "!core/page", "!core/plugins", "!core/rendering", diff --git a/chromium/third_party/WebKit/Source/core/platform/LifecycleNotifier.h b/chromium/third_party/WebKit/Source/core/platform/LifecycleNotifier.h index cc12be21144..fd4835383eb 100644 --- a/chromium/third_party/WebKit/Source/core/platform/LifecycleNotifier.h +++ b/chromium/third_party/WebKit/Source/core/platform/LifecycleNotifier.h @@ -55,8 +55,7 @@ protected: IteratingOverActiveDOMObjects, IteratingOverContextObservers, IteratingOverDocumentObservers, - IteratingOverPageObservers, - IteratingOverDOMWindowObservers + IteratingOverPageObservers }; IterationType m_iterating; diff --git a/chromium/third_party/WebKit/Source/core/platform/LifecycleObserver.h b/chromium/third_party/WebKit/Source/core/platform/LifecycleObserver.h index 3e2d0a47cab..5e3ca2ccc25 100644 --- a/chromium/third_party/WebKit/Source/core/platform/LifecycleObserver.h +++ b/chromium/third_party/WebKit/Source/core/platform/LifecycleObserver.h @@ -37,8 +37,7 @@ public: ActiveDOMObjectType, DocumentLifecycleObserverType, GenericType, - PageLifecycleObserverType, - DOMWindowLifecycleObserverType + PageLifecycleObserverType }; explicit LifecycleObserver(LifecycleContext*, Type = GenericType); diff --git a/chromium/third_party/WebKit/Source/core/platform/animation/CSSAnimationData.h b/chromium/third_party/WebKit/Source/core/platform/animation/CSSAnimationData.h index a8ab4598cbf..f8c441cd5a4 100644 --- a/chromium/third_party/WebKit/Source/core/platform/animation/CSSAnimationData.h +++ b/chromium/third_party/WebKit/Source/core/platform/animation/CSSAnimationData.h @@ -148,7 +148,7 @@ public: private: CSSAnimationData(); - explicit CSSAnimationData(const CSSAnimationData&); + CSSAnimationData(const CSSAnimationData& o); AtomicString m_name; CSSPropertyID m_property; diff --git a/chromium/third_party/WebKit/Source/core/platform/animation/CSSAnimationDataList.h b/chromium/third_party/WebKit/Source/core/platform/animation/CSSAnimationDataList.h index 48d855674f0..bd7d942ae82 100644 --- a/chromium/third_party/WebKit/Source/core/platform/animation/CSSAnimationDataList.h +++ b/chromium/third_party/WebKit/Source/core/platform/animation/CSSAnimationDataList.h @@ -35,7 +35,7 @@ class CSSAnimationDataList { WTF_MAKE_FAST_ALLOCATED; public: CSSAnimationDataList() { } - explicit CSSAnimationDataList(const CSSAnimationDataList&); + CSSAnimationDataList(const CSSAnimationDataList&); void fillUnsetProperties(); bool operator==(const CSSAnimationDataList& o) const; diff --git a/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.cpp index a9a536dfcfa..2c7fa1601a4 100644 --- a/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.cpp @@ -90,24 +90,18 @@ void ChromiumDataObject::clearAll() m_itemList.clear(); } -PassRefPtr<ChromiumDataObjectItem> ChromiumDataObject::add(const String& data, const String& type, ExceptionState& es) +void ChromiumDataObject::add(const String& data, const String& type, ExceptionState& es) { - RefPtr<ChromiumDataObjectItem> item = ChromiumDataObjectItem::createFromString(type, data); - if (!internalAddStringItem(item)) { + if (!internalAddStringItem(ChromiumDataObjectItem::createFromString(type, data))) es.throwDOMException(NotSupportedError); - return 0; - } - return item; } -PassRefPtr<ChromiumDataObjectItem> ChromiumDataObject::add(PassRefPtr<File> file, ScriptExecutionContext* context) +void ChromiumDataObject::add(PassRefPtr<File> file, ScriptExecutionContext* context) { if (!file) - return 0; + return; - RefPtr<ChromiumDataObjectItem> item = ChromiumDataObjectItem::createFromFile(file); - m_itemList.append(item); - return item; + m_itemList.append(ChromiumDataObjectItem::createFromFile(file)); } void ChromiumDataObject::clearData(const String& type) diff --git a/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.h b/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.h index dfb9a75d207..04063170119 100644 --- a/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.h +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ChromiumDataObject.h @@ -62,8 +62,8 @@ public: // FIXME: Implement V8DataTransferItemList::indexedPropertyDeleter to get this called. void deleteItem(unsigned long index); void clearAll(); - PassRefPtr<ChromiumDataObjectItem> add(const String& data, const String& type, ExceptionState&); - PassRefPtr<ChromiumDataObjectItem> add(PassRefPtr<File>, ScriptExecutionContext*); + void add(const String& data, const String& type, ExceptionState&); + void add(PassRefPtr<File>, ScriptExecutionContext*); // WebCore helpers. void clearData(const String& type); diff --git a/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp index 48b258c7a0d..50e69e505e9 100644 --- a/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.cpp @@ -35,9 +35,9 @@ #include "core/dom/ExceptionCode.h" #include "core/dom/StringCallback.h" #include "core/editing/markup.h" -#include "core/fetch/ImageResource.h" #include "core/fileapi/File.h" #include "core/fileapi/FileList.h" +#include "core/loader/cache/ImageResource.h" #include "core/page/Frame.h" #include "core/platform/DragData.h" #include "core/platform/MIMETypeRegistry.h" @@ -64,8 +64,8 @@ public: virtual PassRefPtr<DataTransferItem> item(unsigned long index) OVERRIDE; virtual void deleteItem(unsigned long index, ExceptionState&) OVERRIDE; virtual void clear() OVERRIDE; - virtual PassRefPtr<DataTransferItem> add(const String& data, const String& type, ExceptionState&) OVERRIDE; - virtual PassRefPtr<DataTransferItem> add(PassRefPtr<File>) OVERRIDE; + virtual void add(const String& data, const String& type, ExceptionState&) OVERRIDE; + virtual void add(PassRefPtr<File>) OVERRIDE; private: DataTransferItemListPolicyWrapper(PassRefPtr<ClipboardChromium>, PassRefPtr<ChromiumDataObject>); @@ -119,24 +119,18 @@ void DataTransferItemListPolicyWrapper::clear() m_dataObject->clearAll(); } -PassRefPtr<DataTransferItem> DataTransferItemListPolicyWrapper::add(const String& data, const String& type, ExceptionState& es) +void DataTransferItemListPolicyWrapper::add(const String& data, const String& type, ExceptionState& es) { if (!m_clipboard->canWriteData()) - return 0; - RefPtr<ChromiumDataObjectItem> item = m_dataObject->add(data, type, es); - if (!item) - return 0; - return DataTransferItemPolicyWrapper::create(m_clipboard, item); + return; + m_dataObject->add(data, type, es); } -PassRefPtr<DataTransferItem> DataTransferItemListPolicyWrapper::add(PassRefPtr<File> file) +void DataTransferItemListPolicyWrapper::add(PassRefPtr<File> file) { if (!m_clipboard->canWriteData()) - return 0; - RefPtr<ChromiumDataObjectItem> item = m_dataObject->add(file, m_clipboard->frame()->document()->scriptExecutionContext()); - if (!item) - return 0; - return DataTransferItemPolicyWrapper::create(m_clipboard, item); + return; + m_dataObject->add(file, m_clipboard->frame()->document()->scriptExecutionContext()); } DataTransferItemListPolicyWrapper::DataTransferItemListPolicyWrapper( diff --git a/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.h b/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.h index 4cc14168802..980a22dea67 100644 --- a/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.h +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ClipboardChromium.h @@ -32,7 +32,7 @@ #include "core/dom/Clipboard.h" #include "core/dom/DataTransferItem.h" -#include "core/fetch/ImageResourceClient.h" +#include "core/loader/cache/ImageResourceClient.h" #include "core/platform/chromium/ChromiumDataObject.h" namespace WebCore { diff --git a/chromium/third_party/WebKit/Source/core/platform/chromium/PasteboardChromium.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/PasteboardChromium.cpp index 61c2dc9608a..d06f207a9ef 100644 --- a/chromium/third_party/WebKit/Source/core/platform/chromium/PasteboardChromium.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/PasteboardChromium.cpp @@ -39,8 +39,8 @@ #include "core/dom/Element.h" #include "core/dom/Range.h" #include "core/editing/markup.h" -#include "core/fetch/ImageResource.h" #include "core/html/parser/HTMLParserIdioms.h" +#include "core/loader/cache/ImageResource.h" #include "core/page/Frame.h" #include "core/platform/chromium/ClipboardChromium.h" #include "core/platform/chromium/ClipboardUtilitiesChromium.h" diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeNonMacCommon.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromium.cpp index 72208ba0493..d44a778a65d 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeNonMacCommon.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromium.cpp @@ -25,7 +25,7 @@ */ #include "config.h" -#include "core/platform/ScrollbarThemeNonMacCommon.h" +#include "core/platform/chromium/ScrollbarThemeChromium.h" #include "core/platform/PlatformMouseEvent.h" #include "core/platform/ScrollableArea.h" @@ -33,16 +33,21 @@ #include "core/platform/ScrollbarTheme.h" #include "core/platform/graphics/GraphicsContextStateSaver.h" +// ----------------------------------------------------------------------------- +// This file contains scrollbar theme code that is cross platform. Additional +// members of ScrollbarThemeChromium can be found in the platform specific files +// ----------------------------------------------------------------------------- + namespace WebCore { -bool ScrollbarThemeNonMacCommon::hasThumb(ScrollbarThemeClient* scrollbar) +bool ScrollbarThemeChromium::hasThumb(ScrollbarThemeClient* scrollbar) { // This method is just called as a paint-time optimization to see if - // painting the thumb can be skipped. We don't have to be exact here. + // painting the thumb can be skipped. We don't have to be exact here. return thumbLength(scrollbar) > 0; } -IntRect ScrollbarThemeNonMacCommon::backButtonRect(ScrollbarThemeClient* scrollbar, ScrollbarPart part, bool) +IntRect ScrollbarThemeChromium::backButtonRect(ScrollbarThemeClient* scrollbar, ScrollbarPart part, bool) { // Windows and Linux just have single arrows. if (part == BackButtonEndPart) @@ -52,7 +57,7 @@ IntRect ScrollbarThemeNonMacCommon::backButtonRect(ScrollbarThemeClient* scrollb return IntRect(scrollbar->x(), scrollbar->y(), size.width(), size.height()); } -IntRect ScrollbarThemeNonMacCommon::forwardButtonRect(ScrollbarThemeClient* scrollbar, ScrollbarPart part, bool) +IntRect ScrollbarThemeChromium::forwardButtonRect(ScrollbarThemeClient* scrollbar, ScrollbarPart part, bool) { // Windows and Linux just have single arrows. if (part == ForwardButtonStartPart) @@ -70,7 +75,7 @@ IntRect ScrollbarThemeNonMacCommon::forwardButtonRect(ScrollbarThemeClient* scro return IntRect(x, y, size.width(), size.height()); } -IntRect ScrollbarThemeNonMacCommon::trackRect(ScrollbarThemeClient* scrollbar, bool) +IntRect ScrollbarThemeChromium::trackRect(ScrollbarThemeClient* scrollbar, bool) { IntSize bs = buttonSize(scrollbar); int thickness = scrollbarThickness(scrollbar->controlSize()); @@ -86,20 +91,20 @@ IntRect ScrollbarThemeNonMacCommon::trackRect(ScrollbarThemeClient* scrollbar, b return IntRect(scrollbar->x(), scrollbar->y() + bs.height(), thickness, scrollbar->height() - 2 * bs.height()); } -void ScrollbarThemeNonMacCommon::paintTrackBackground(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect) +void ScrollbarThemeChromium::paintTrackBackground(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect) { - // Just assume a forward track part. We only paint the track as a single piece when there is no thumb. + // Just assume a forward track part. We only paint the track as a single piece when there is no thumb. if (!hasThumb(scrollbar)) paintTrackPiece(context, scrollbar, rect, ForwardTrackPart); } -void ScrollbarThemeNonMacCommon::paintTickmarks(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect) +void ScrollbarThemeChromium::paintTickmarks(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect) { if (scrollbar->orientation() != VerticalScrollbar) return; if (rect.height() <= 0 || rect.width() <= 0) - return; + return; // nothing to draw on. // Get the tickmarks for the frameview. Vector<IntRect> tickmarks; diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeNonMacCommon.h b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromium.h index 3fc76476037..9866a179693 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeNonMacCommon.h +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromium.h @@ -28,8 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ScrollbarThemeNonMacCommon_h -#define ScrollbarThemeNonMacCommon_h +#ifndef ScrollbarThemeChromium_h +#define ScrollbarThemeChromium_h #include "core/platform/ScrollbarTheme.h" @@ -37,7 +37,9 @@ namespace WebCore { class PlatformMouseEvent; -class ScrollbarThemeNonMacCommon : public ScrollbarTheme { +// This class contains the scrollbar code which is shared between Chromium +// Windows and Linux. +class ScrollbarThemeChromium : public ScrollbarTheme { protected: virtual bool hasButtons(ScrollbarThemeClient*) OVERRIDE { return true; } virtual bool hasThumb(ScrollbarThemeClient*) OVERRIDE; diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeAndroid.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumAndroid.cpp index 8ab6b8ca5b6..ca8b507a417 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeAndroid.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumAndroid.cpp @@ -24,15 +24,16 @@ */ #include "config.h" + #include "core/platform/ScrollbarTheme.h" -#include "core/platform/ScrollbarThemeOverlay.h" +#include "core/platform/chromium/ScrollbarThemeChromiumOverlay.h" namespace WebCore { ScrollbarTheme* ScrollbarTheme::nativeTheme() { - DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, ()); + DEFINE_STATIC_LOCAL(ScrollbarThemeChromiumOverlay, theme, ()); return &theme; } diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeAuraOrGtk.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumDefault.cpp index e3753391115..721870a29c9 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeAuraOrGtk.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumDefault.cpp @@ -29,38 +29,38 @@ */ #include "config.h" -#include "core/platform/ScrollbarThemeAuraOrGtk.h" +#include "core/platform/chromium/ScrollbarThemeChromiumDefault.h" #include "RuntimeEnabledFeatures.h" #include "core/platform/PlatformMouseEvent.h" #include "core/platform/Scrollbar.h" -#include "core/platform/ScrollbarThemeOverlay.h" +#include "core/platform/chromium/ScrollbarThemeChromiumOverlay.h" #include "core/platform/graphics/GraphicsContext.h" +#include "public/platform/default/WebThemeEngine.h" #include "public/platform/Platform.h" #include "public/platform/WebRect.h" -#include "public/platform/default/WebThemeEngine.h" namespace WebCore { ScrollbarTheme* ScrollbarTheme::nativeTheme() { if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) { - DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, ()); + DEFINE_STATIC_LOCAL(ScrollbarThemeChromiumOverlay, theme, ()); return &theme; } - DEFINE_STATIC_LOCAL(ScrollbarThemeAuraOrGtk, theme, ()); + DEFINE_STATIC_LOCAL(ScrollbarThemeChromiumDefault, theme, ()); return &theme; } -int ScrollbarThemeAuraOrGtk::scrollbarThickness(ScrollbarControlSize controlSize) +int ScrollbarThemeChromiumDefault::scrollbarThickness(ScrollbarControlSize controlSize) { // Horiz and Vert scrollbars are the same thickness. IntSize scrollbarSize = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarVerticalTrack); return scrollbarSize.width(); } -void ScrollbarThemeAuraOrGtk::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart partType) +void ScrollbarThemeChromiumDefault::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart partType) { WebKit::WebThemeEngine::State state = scrollbar->hoveredPart() == partType ? WebKit::WebThemeEngine::StateHover : WebKit::WebThemeEngine::StateNormal; IntRect alignRect = trackRect(scrollbar, false); @@ -73,7 +73,7 @@ void ScrollbarThemeAuraOrGtk::paintTrackPiece(GraphicsContext* gc, ScrollbarThem WebKit::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::PartScrollbarHorizontalTrack : WebKit::WebThemeEngine::PartScrollbarVerticalTrack, state, WebKit::WebRect(rect), &extraParams); } -void ScrollbarThemeAuraOrGtk::paintButton(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part) +void ScrollbarThemeChromiumDefault::paintButton(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part) { WebKit::WebThemeEngine::Part paintPart; WebKit::WebThemeEngine::State state = WebKit::WebThemeEngine::StateNormal; @@ -109,7 +109,7 @@ void ScrollbarThemeAuraOrGtk::paintButton(GraphicsContext* gc, ScrollbarThemeCli WebKit::Platform::current()->themeEngine()->paint(canvas, paintPart, state, WebKit::WebRect(rect), 0); } -void ScrollbarThemeAuraOrGtk::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect) +void ScrollbarThemeChromiumDefault::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect) { WebKit::WebThemeEngine::State state; WebKit::WebCanvas* canvas = gc->canvas(); @@ -122,12 +122,12 @@ void ScrollbarThemeAuraOrGtk::paintThumb(GraphicsContext* gc, ScrollbarThemeClie WebKit::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::PartScrollbarHorizontalThumb : WebKit::WebThemeEngine::PartScrollbarVerticalThumb, state, WebKit::WebRect(rect), 0); } -bool ScrollbarThemeAuraOrGtk::shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent& evt) +bool ScrollbarThemeChromiumDefault::shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent& evt) { return (evt.shiftKey() && evt.button() == LeftButton) || (evt.button() == MiddleButton); } -IntSize ScrollbarThemeAuraOrGtk::buttonSize(ScrollbarThemeClient* scrollbar) +IntSize ScrollbarThemeChromiumDefault::buttonSize(ScrollbarThemeClient* scrollbar) { if (scrollbar->orientation() == VerticalScrollbar) { IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarUpArrow); @@ -139,7 +139,7 @@ IntSize ScrollbarThemeAuraOrGtk::buttonSize(ScrollbarThemeClient* scrollbar) return IntSize(scrollbar->width() < 2 * size.width() ? scrollbar->width() / 2 : size.width(), size.height()); } -int ScrollbarThemeAuraOrGtk::minimumThumbLength(ScrollbarThemeClient* scrollbar) +int ScrollbarThemeChromiumDefault::minimumThumbLength(ScrollbarThemeClient* scrollbar) { if (scrollbar->orientation() == VerticalScrollbar) { IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarVerticalThumb); diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeAuraOrGtk.h b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumDefault.h index ec37c2c1f78..133dab06edc 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeAuraOrGtk.h +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumDefault.h @@ -28,14 +28,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ScrollbarThemeAuraOrGtk_h -#define ScrollbarThemeAuraOrGtk_h +#ifndef ScrollbarThemeChromiumDefault_h +#define ScrollbarThemeChromiumDefault_h -#include "core/platform/ScrollbarThemeNonMacCommon.h" +#include "core/platform/chromium/ScrollbarThemeChromium.h" namespace WebCore { -class ScrollbarThemeAuraOrGtk : public ScrollbarThemeNonMacCommon { +class ScrollbarThemeChromiumDefault : public ScrollbarThemeChromium { public: virtual int scrollbarThickness(ScrollbarControlSize); diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeOverlay.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumOverlay.cpp index 29b44ba4292..c10c89bbd55 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeOverlay.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumOverlay.cpp @@ -24,7 +24,7 @@ */ #include "config.h" -#include "core/platform/ScrollbarThemeOverlay.h" +#include "core/platform/chromium/ScrollbarThemeChromiumOverlay.h" #include "core/platform/PlatformMouseEvent.h" #include "core/platform/Scrollbar.h" @@ -40,17 +40,17 @@ namespace WebCore { static const int scrollbarWidth = 3; static const int scrollbarMargin = 4; -int ScrollbarThemeOverlay::scrollbarThickness(ScrollbarControlSize controlSize) +int ScrollbarThemeChromiumOverlay::scrollbarThickness(ScrollbarControlSize controlSize) { return scrollbarWidth + scrollbarMargin; } -bool ScrollbarThemeOverlay::usesOverlayScrollbars() const +bool ScrollbarThemeChromiumOverlay::usesOverlayScrollbars() const { return true; } -int ScrollbarThemeOverlay::thumbPosition(ScrollbarThemeClient* scrollbar) +int ScrollbarThemeChromiumOverlay::thumbPosition(ScrollbarThemeClient* scrollbar) { if (!scrollbar->totalSize()) return 0; @@ -60,7 +60,7 @@ int ScrollbarThemeOverlay::thumbPosition(ScrollbarThemeClient* scrollbar) return round(proportion * trackLen); } -int ScrollbarThemeOverlay::thumbLength(ScrollbarThemeClient* scrollbar) +int ScrollbarThemeChromiumOverlay::thumbLength(ScrollbarThemeClient* scrollbar) { int trackLen = trackLength(scrollbar); @@ -73,22 +73,22 @@ int ScrollbarThemeOverlay::thumbLength(ScrollbarThemeClient* scrollbar) return length; } -bool ScrollbarThemeOverlay::hasThumb(ScrollbarThemeClient* scrollbar) +bool ScrollbarThemeChromiumOverlay::hasThumb(ScrollbarThemeClient* scrollbar) { return true; } -IntRect ScrollbarThemeOverlay::backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool) +IntRect ScrollbarThemeChromiumOverlay::backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool) { return IntRect(); } -IntRect ScrollbarThemeOverlay::forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool) +IntRect ScrollbarThemeChromiumOverlay::forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool) { return IntRect(); } -IntRect ScrollbarThemeOverlay::trackRect(ScrollbarThemeClient* scrollbar, bool) +IntRect ScrollbarThemeChromiumOverlay::trackRect(ScrollbarThemeClient* scrollbar, bool) { IntRect rect = scrollbar->frameRect(); if (scrollbar->orientation() == HorizontalScrollbar) @@ -98,7 +98,7 @@ IntRect ScrollbarThemeOverlay::trackRect(ScrollbarThemeClient* scrollbar, bool) return rect; } -void ScrollbarThemeOverlay::paintThumb(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect) +void ScrollbarThemeChromiumOverlay::paintThumb(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect) { IntRect thumbRect = rect; if (scrollbar->orientation() == HorizontalScrollbar) diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeOverlay.h b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumOverlay.h index 8a8595916d7..291ef8c9baa 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeOverlay.h +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumOverlay.h @@ -23,8 +23,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ScrollbarThemeOverlay_h -#define ScrollbarThemeOverlay_h +#ifndef ScrollbarThemeChromiumOverlay_h +#define ScrollbarThemeChromiumOverlay_h #include "core/platform/ScrollbarTheme.h" @@ -32,7 +32,7 @@ namespace WebCore { // This scrollbar theme is used to get overlay scrollbar for platforms other // than Mac. Mac's overlay scrollbars are in ScrollbarThemeMac*. -class ScrollbarThemeOverlay : public ScrollbarTheme { +class ScrollbarThemeChromiumOverlay : public ScrollbarTheme { public: virtual int scrollbarThickness(ScrollbarControlSize) OVERRIDE; virtual bool usesOverlayScrollbars() const OVERRIDE; diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeWin.cpp b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumWin.cpp index d8f51e4e4c0..a41c6b1f524 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeWin.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumWin.cpp @@ -25,7 +25,7 @@ */ #include "config.h" -#include "core/platform/ScrollbarThemeWin.h" +#include "core/platform/chromium/ScrollbarThemeChromiumWin.h" #include <windows.h> #include <vsstyle.h> @@ -38,27 +38,28 @@ #include "public/platform/Platform.h" #include "public/platform/WebRect.h" #include "public/platform/win/WebThemeEngine.h" + namespace WebCore { ScrollbarTheme* ScrollbarTheme::nativeTheme() { - static ScrollbarThemeWin theme; + static ScrollbarThemeChromiumWin theme; return &theme; } // The scrollbar size in DumpRenderTree on the Mac - so we can match their -// layout results. Entries are for regular, small, and mini scrollbars. +// layout results. Entries are for regular, small, and mini scrollbars. // Metrics obtained using [NSScroller scrollerWidthForControlSize:] static const int kMacScrollbarSize[3] = { 15, 11, 15 }; // Constants used to figure the drag rect outside which we should snap the -// scrollbar thumb back to its origin. These calculations are based on +// scrollbar thumb back to its origin. These calculations are based on // observing the behavior of the MSVC8 main window scrollbar + some // guessing/extrapolation. static const int kOffEndMultiplier = 3; static const int kOffSideMultiplier = 8; -int ScrollbarThemeWin::scrollbarThickness(ScrollbarControlSize controlSize) +int ScrollbarThemeChromiumWin::scrollbarThickness(ScrollbarControlSize controlSize) { static int thickness; if (!thickness) { @@ -69,12 +70,12 @@ int ScrollbarThemeWin::scrollbarThickness(ScrollbarControlSize controlSize) return thickness; } -bool ScrollbarThemeWin::invalidateOnMouseEnterExit() +bool ScrollbarThemeChromiumWin::invalidateOnMouseEnterExit() { return windowsVersion() >= WindowsVista; } -bool ScrollbarThemeWin::shouldSnapBackToDragOrigin(ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& evt) +bool ScrollbarThemeChromiumWin::shouldSnapBackToDragOrigin(ScrollbarThemeClient* scrollbar, const PlatformMouseEvent& evt) { // Find the rect within which we shouldn't snap, by expanding the track rect // in both dimensions. @@ -92,7 +93,7 @@ bool ScrollbarThemeWin::shouldSnapBackToDragOrigin(ScrollbarThemeClient* scrollb return !rect.contains(mousePosition); } -void ScrollbarThemeWin::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart partType) +void ScrollbarThemeChromiumWin::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart partType) { bool horz = scrollbar->orientation() == HorizontalScrollbar; @@ -109,7 +110,7 @@ void ScrollbarThemeWin::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClien WebKit::Platform::current()->themeEngine()->paintScrollbarTrack(canvas, partId, getThemeState(scrollbar, partType), getClassicThemeState(scrollbar, partType), WebKit::WebRect(rect), WebKit::WebRect(alignRect)); } -void ScrollbarThemeWin::paintButton(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part) +void ScrollbarThemeChromiumWin::paintButton(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part) { bool horz = scrollbar->orientation() == HorizontalScrollbar; @@ -124,7 +125,7 @@ void ScrollbarThemeWin::paintButton(GraphicsContext* gc, ScrollbarThemeClient* s WebKit::Platform::current()->themeEngine()->paintScrollbarArrow(canvas, getThemeArrowState(scrollbar, part), partId | getClassicThemeState(scrollbar, part), WebKit::WebRect(rect)); } -void ScrollbarThemeWin::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect) +void ScrollbarThemeChromiumWin::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect) { bool horz = scrollbar->orientation() == HorizontalScrollbar; @@ -136,10 +137,10 @@ void ScrollbarThemeWin::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* sc WebKit::Platform::current()->themeEngine()->paintScrollbarThumb(canvas, horz ? SBP_GRIPPERHORZ : SBP_GRIPPERVERT, getThemeState(scrollbar, ThumbPart), getClassicThemeState(scrollbar, ThumbPart), WebKit::WebRect(rect)); } -int ScrollbarThemeWin::getThemeState(ScrollbarThemeClient* scrollbar, ScrollbarPart part) const +int ScrollbarThemeChromiumWin::getThemeState(ScrollbarThemeClient* scrollbar, ScrollbarPart part) const { // When dragging the thumb, draw thumb pressed and other segments normal - // regardless of where the cursor actually is. See also four places in + // regardless of where the cursor actually is. See also four places in // getThemeArrowState(). if (scrollbar->pressedPart() == ThumbPart) { if (part == ThumbPart) @@ -155,7 +156,7 @@ int ScrollbarThemeWin::getThemeState(ScrollbarThemeClient* scrollbar, ScrollbarP return (scrollbar->pressedPart() == part) ? SCRBS_PRESSED : SCRBS_NORMAL; } -int ScrollbarThemeWin::getThemeArrowState(ScrollbarThemeClient* scrollbar, ScrollbarPart part) const +int ScrollbarThemeChromiumWin::getThemeArrowState(ScrollbarThemeClient* scrollbar, ScrollbarPart part) const { // We could take advantage of knowing the values in the state enum to write // some simpler code, but treating the state enum as a black box seems @@ -205,7 +206,7 @@ int ScrollbarThemeWin::getThemeArrowState(ScrollbarThemeClient* scrollbar, Scrol return (scrollbar->pressedPart() == part) ? ABS_DOWNPRESSED : ABS_DOWNNORMAL; } -int ScrollbarThemeWin::getClassicThemeState(ScrollbarThemeClient* scrollbar, ScrollbarPart part) const +int ScrollbarThemeChromiumWin::getClassicThemeState(ScrollbarThemeClient* scrollbar, ScrollbarPart part) const { // When dragging the thumb, draw the buttons normal even when hovered. if (scrollbar->pressedPart() == ThumbPart) @@ -219,24 +220,24 @@ int ScrollbarThemeWin::getClassicThemeState(ScrollbarThemeClient* scrollbar, Scr return (scrollbar->pressedPart() == part) ? (DFCS_PUSHED | DFCS_FLAT) : 0; } -bool ScrollbarThemeWin::shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent& evt) +bool ScrollbarThemeChromiumWin::shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent& evt) { return evt.shiftKey() && evt.button() == LeftButton; } -IntSize ScrollbarThemeWin::buttonSize(ScrollbarThemeClient* scrollbar) +IntSize ScrollbarThemeChromiumWin::buttonSize(ScrollbarThemeClient* scrollbar) { // Our desired rect is essentially thickness by thickness. // Our actual rect will shrink to half the available space when we have < 2 - // times thickness pixels left. This allows the scrollbar to scale down + // times thickness pixels left. This allows the scrollbar to scale down // and function even at tiny sizes. int thickness = scrollbarThickness(scrollbar->controlSize()); // In layout test mode, we force the button "girth" (i.e., the length of // the button along the axis of the scrollbar) to be a fixed size. - // FIXME: This is retarded! scrollbarThickness is already fixed in layout + // FIXME: This is retarded! scrollbarThickness is already fixed in layout // test mode so that should be enough to result in repeatable results, but // preserving this hack avoids having to rebaseline pixel tests. const int kLayoutTestModeGirth = 17; diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeWin.h b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumWin.h index 5b5ee6e444a..ba8deafefb7 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeWin.h +++ b/chromium/third_party/WebKit/Source/core/platform/chromium/ScrollbarThemeChromiumWin.h @@ -28,14 +28,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ScrollbarThemeWin_h -#define ScrollbarThemeWin_h +#ifndef ScrollbarThemeChromiumWin_h +#define ScrollbarThemeChromiumWin_h -#include "core/platform/ScrollbarThemeNonMacCommon.h" +#include "core/platform/chromium/ScrollbarThemeChromium.h" namespace WebCore { -class ScrollbarThemeWin : public ScrollbarThemeNonMacCommon { +class ScrollbarThemeChromiumWin : public ScrollbarThemeChromium { public: virtual int scrollbarThickness(ScrollbarControlSize) OVERRIDE; virtual bool invalidateOnMouseEnterExit() OVERRIDE; diff --git a/chromium/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.h b/chromium/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.h index d9b111b499d..e4bb57822ba 100644 --- a/chromium/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.h +++ b/chromium/third_party/WebKit/Source/core/platform/graphics/GraphicsLayer.h @@ -71,7 +71,7 @@ class TimingFunction; class AnimationValue { WTF_MAKE_FAST_ALLOCATED; public: - explicit AnimationValue(double keyTime, PassRefPtr<TimingFunction> timingFunction = 0) + explicit AnimationValue(float keyTime, PassRefPtr<TimingFunction> timingFunction = 0) : m_keyTime(keyTime) , m_timingFunction(timingFunction) { @@ -79,12 +79,12 @@ public: virtual ~AnimationValue() { } - double keyTime() const { return m_keyTime; } + float keyTime() const { return m_keyTime; } const TimingFunction* timingFunction() const { return m_timingFunction.get(); } virtual PassOwnPtr<AnimationValue> clone() const = 0; private: - double m_keyTime; + float m_keyTime; RefPtr<TimingFunction> m_timingFunction; }; @@ -92,7 +92,7 @@ private: // FIXME: Should be moved to its own header file. class FloatAnimationValue : public AnimationValue { public: - FloatAnimationValue(double keyTime, float value, PassRefPtr<TimingFunction> timingFunction = 0) + FloatAnimationValue(float keyTime, float value, PassRefPtr<TimingFunction> timingFunction = 0) : AnimationValue(keyTime, timingFunction) , m_value(value) { @@ -109,7 +109,7 @@ private: // FIXME: Should be moved to its own header file. class TransformAnimationValue : public AnimationValue { public: - explicit TransformAnimationValue(double keyTime, const TransformOperations* value = 0, PassRefPtr<TimingFunction> timingFunction = 0) + explicit TransformAnimationValue(float keyTime, const TransformOperations* value = 0, PassRefPtr<TimingFunction> timingFunction = 0) : AnimationValue(keyTime, timingFunction) { if (value) @@ -127,7 +127,7 @@ private: // FIXME: Should be moved to its own header file. class FilterAnimationValue : public AnimationValue { public: - explicit FilterAnimationValue(double keyTime, const FilterOperations* value = 0, PassRefPtr<TimingFunction> timingFunction = 0) + explicit FilterAnimationValue(float keyTime, const FilterOperations* value = 0, PassRefPtr<TimingFunction> timingFunction = 0) : AnimationValue(keyTime, timingFunction) { if (value) diff --git a/chromium/third_party/WebKit/Source/core/platform/graphics/filters/FilterOperation.h b/chromium/third_party/WebKit/Source/core/platform/graphics/filters/FilterOperation.h index 4e4a31a49c5..3473418b1ac 100644 --- a/chromium/third_party/WebKit/Source/core/platform/graphics/filters/FilterOperation.h +++ b/chromium/third_party/WebKit/Source/core/platform/graphics/filters/FilterOperation.h @@ -26,7 +26,7 @@ #ifndef FilterOperation_h #define FilterOperation_h -#include "core/fetch/DocumentResourceReference.h" +#include "core/loader/cache/DocumentResourceReference.h" #include "core/platform/Length.h" #include "core/platform/graphics/Color.h" #include "core/platform/graphics/filters/Filter.h" diff --git a/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/TransformOperations.cpp b/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/TransformOperations.cpp index 3ca3d7f462f..bcca50201e8 100644 --- a/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/TransformOperations.cpp +++ b/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/TransformOperations.cpp @@ -108,12 +108,4 @@ TransformOperations TransformOperations::blend(const TransformOperations& from, return blendByUsingMatrixInterpolation(from, progress); } -TransformOperations TransformOperations::add(const TransformOperations& addend) const -{ - TransformOperations result; - result.m_operations = operations(); - result.m_operations.append(addend.operations()); - return result; -} - } // namespace WebCore diff --git a/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/TransformOperations.h b/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/TransformOperations.h index 2f650126189..f40f77f3ce1 100644 --- a/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/TransformOperations.h +++ b/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/TransformOperations.h @@ -75,7 +75,6 @@ public: TransformOperations blendByMatchingOperations(const TransformOperations& from, const double& progress) const; TransformOperations blendByUsingMatrixInterpolation(const TransformOperations& from, double progress) const; TransformOperations blend(const TransformOperations& from, double progress) const; - TransformOperations add(const TransformOperations& addend) const; private: Vector<RefPtr<TransformOperation> > m_operations; diff --git a/chromium/third_party/WebKit/Source/core/platform/mac/ScrollAnimatorMac.mm b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollAnimatorMac.mm index 9f4dda58b55..a92ab24b9cc 100644 --- a/chromium/third_party/WebKit/Source/core/platform/mac/ScrollAnimatorMac.mm +++ b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollAnimatorMac.mm @@ -32,12 +32,12 @@ #include "core/platform/ScrollView.h" #include "core/platform/ScrollableArea.h" #include "core/platform/ScrollbarTheme.h" -#include "core/platform/ScrollbarThemeMacCommon.h" -#include "core/platform/ScrollbarThemeMacOverlayAPI.h" #include "core/platform/graphics/FloatPoint.h" #include "core/platform/mac/BlockExceptions.h" #include "core/platform/mac/EmptyProtocolDefinitions.h" #include "core/platform/mac/NSScrollerImpDetails.h" +#include "core/platform/mac/ScrollbarThemeMac.h" +#include "core/platform/mac/ScrollbarThemeMacOverlayAPI.h" #include "wtf/MainThread.h" #include "wtf/PassOwnPtr.h" #include "wtf/UnusedParam.h" diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacCommon.h b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMac.h index 8a62dd909d2..fac25ecaaf6 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacCommon.h +++ b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMac.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ScrollbarThemeMacCommon_h -#define ScrollbarThemeMacCommon_h +#ifndef ScrollbarThemeMac_h +#define ScrollbarThemeMac_h #include "core/platform/ScrollbarTheme.h" @@ -63,4 +63,4 @@ protected: } -#endif // ScrollbarThemeMacCommon_h +#endif diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacCommon.mm b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMac.mm index 5577f9631bd..6b7975afda3 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacCommon.mm +++ b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMac.mm @@ -20,18 +20,16 @@ * 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. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "config.h" -#include "core/platform/ScrollbarThemeMacCommon.h" +#include "core/platform/mac/ScrollbarThemeMac.h" #include <Carbon/Carbon.h> #include "core/page/FrameView.h" #include "core/platform/PlatformMouseEvent.h" #include "core/platform/ScrollView.h" -#include "core/platform/ScrollbarThemeMacNonOverlayAPI.h" -#include "core/platform/ScrollbarThemeMacOverlayAPI.h" #include "core/platform/graphics/Gradient.h" #include "core/platform/graphics/GraphicsContext.h" #include "core/platform/graphics/GraphicsContextStateSaver.h" @@ -41,6 +39,8 @@ #include "core/platform/mac/LocalCurrentGraphicsContext.h" #include "core/platform/mac/NSScrollerImpDetails.h" #include "core/platform/mac/ScrollAnimatorMac.h" +#include "core/platform/mac/ScrollbarThemeMacNonOverlayAPI.h" +#include "core/platform/mac/ScrollbarThemeMacOverlayAPI.h" #include "public/platform/mac/WebThemeEngine.h" #include "public/platform/Platform.h" #include "public/platform/WebRect.h" diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacNonOverlayAPI.h b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMacNonOverlayAPI.h index e51380059f4..28066053108 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacNonOverlayAPI.h +++ b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMacNonOverlayAPI.h @@ -31,7 +31,7 @@ #ifndef ScrollbarThemeMacNonOverlayAPI_h #define ScrollbarThemeMacNonOverlayAPI_h -#include "core/platform/ScrollbarThemeMacCommon.h" +#include "core/platform/mac/ScrollbarThemeMac.h" namespace WebCore { diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacNonOverlayAPI.mm b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMacNonOverlayAPI.mm index dc8540053d9..62e2db5c1ef 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacNonOverlayAPI.mm +++ b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMacNonOverlayAPI.mm @@ -29,7 +29,7 @@ */ #include "config.h" -#include "core/platform/ScrollbarThemeMacNonOverlayAPI.h" +#include "core/platform/mac/ScrollbarThemeMacNonOverlayAPI.h" #include <Carbon/Carbon.h> #include "core/platform/ScrollbarThemeClient.h" diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacOverlayAPI.h b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMacOverlayAPI.h index b0c5aef9eb7..f1712a0d144 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacOverlayAPI.h +++ b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMacOverlayAPI.h @@ -31,7 +31,7 @@ #ifndef ScrollbarThemeMacOverlayAPI_h #define ScrollbarThemeMacOverlayAPI_h -#include "core/platform/ScrollbarThemeMacCommon.h" +#include "core/platform/mac/ScrollbarThemeMac.h" typedef id ScrollbarPainter; diff --git a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacOverlayAPI.mm b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMacOverlayAPI.mm index cac425ed928..a0ad14f2474 100644 --- a/chromium/third_party/WebKit/Source/core/platform/ScrollbarThemeMacOverlayAPI.mm +++ b/chromium/third_party/WebKit/Source/core/platform/mac/ScrollbarThemeMacOverlayAPI.mm @@ -29,7 +29,7 @@ */ #include "config.h" -#include "core/platform/ScrollbarThemeMacOverlayAPI.h" +#include "core/platform/mac/ScrollbarThemeMacOverlayAPI.h" #include "core/platform/graphics/GraphicsContext.h" #include "core/platform/graphics/GraphicsContextStateSaver.h" |