Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 163 deletions

diff --git a/WebCore/rendering/RenderThemeChromiumMac.mm b/WebCore/rendering/RenderThemeChromiumMac.mm
deleted file mode 100644
index e8ffe6c..0000000
--- a/WebCore/rendering/RenderThemeChromiumMac.mm
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2008, 2009 Google, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#import "config.h"
-#import "RenderThemeChromiumMac.h"
-#import "ChromiumBridge.h"
-#import "RenderMediaControlsChromium.h"
-#import "UserAgentStyleSheets.h"
-#import <Carbon/Carbon.h>
-#import <Cocoa/Cocoa.h>
-#import <wtf/RetainPtr.h>
-#import <wtf/StdLibExtras.h>
-#import <math.h>
-
-@interface RTCMFlippedView : NSView
-{}
-
-- (BOOL)isFlipped;
-- (NSText *)currentEditor;
-
-@end
-
-@implementation RTCMFlippedView
-
-- (BOOL)isFlipped {
-    return [[NSGraphicsContext currentContext] isFlipped];
-}
-
-- (NSText *)currentEditor {
-    return nil;
-}
-
-@end
-
-namespace WebCore {
-
-NSView* FlippedView()
-{
-    static NSView* view = [[RTCMFlippedView alloc] init];
-    return view;
-}
-
-PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page*)
-{
-    static RenderTheme* rt = RenderThemeChromiumMac::create().releaseRef();
-    return rt;
-}
-
-PassRefPtr<RenderTheme> RenderThemeChromiumMac::create()
-{
-    return adoptRef(new RenderThemeChromiumMac);
-}
-
-bool RenderThemeChromiumMac::usesTestModeFocusRingColor() const
-{
-    return ChromiumBridge::layoutTestMode();
-}
-
-NSView* RenderThemeChromiumMac::documentViewFor(RenderObject*) const
-{
-    return FlippedView();
-}
-
-// Updates the control tint (a.k.a. active state) of |cell| (from |o|).
-// In the Chromium port, the renderer runs as a background process and controls'
-// NSCell(s) lack a parent NSView. Therefore controls don't have their tint
-// color updated correctly when the application is activated/deactivated.
-// FocusController's setActive() is called when the application is
-// activated/deactivated, which causes a repaint at which time this code is
-// called.
-// This function should be called before drawing any NSCell-derived controls,
-// unless you're sure it isn't needed.
-void RenderThemeChromiumMac::updateActiveState(NSCell* cell, const RenderObject* o)
-{
-    NSControlTint oldTint = [cell controlTint];
-    NSControlTint tint = isActive(o) ? [NSColor currentControlTint] :
-                                       static_cast<NSControlTint>(NSClearControlTint);
-
-    if (tint != oldTint)
-        [cell setControlTint:tint];
-}
-
-#if ENABLE(VIDEO)
-
-void RenderThemeChromiumMac::adjustMediaSliderThumbSize(RenderObject* o) const
-{
-    RenderMediaControlsChromium::adjustMediaSliderThumbSize(o);
-}
-
-bool RenderThemeChromiumMac::shouldRenderMediaControlPart(ControlPart part, Element* e)
-{
-    return RenderMediaControlsChromium::shouldRenderMediaControlPart(part, e);
-}
-
-bool RenderThemeChromiumMac::paintMediaPlayButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    return RenderMediaControlsChromium::paintMediaControlsPart(MediaPlayButton, object, paintInfo, rect);
-}
-
-bool RenderThemeChromiumMac::paintMediaMuteButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    return RenderMediaControlsChromium::paintMediaControlsPart(MediaMuteButton, object, paintInfo, rect);
-}
-
-bool RenderThemeChromiumMac::paintMediaSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    return RenderMediaControlsChromium::paintMediaControlsPart(MediaSlider, object, paintInfo, rect);
-}
-
-bool RenderThemeChromiumMac::paintMediaControlsBackground(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    return RenderMediaControlsChromium::paintMediaControlsPart(MediaTimelineContainer, object, paintInfo, rect);
-}
-
-String RenderThemeChromiumMac::extraMediaControlsStyleSheet()
-{
-    return String(mediaControlsChromiumUserAgentStyleSheet, sizeof(mediaControlsChromiumUserAgentStyleSheet));
-}
-
-bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    return true;
-}
-
-bool RenderThemeChromiumMac::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    return RenderMediaControlsChromium::paintMediaControlsPart(MediaVolumeSlider, object, paintInfo, rect);
-}
-
-bool RenderThemeChromiumMac::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    return RenderMediaControlsChromium::paintMediaControlsPart(MediaVolumeSliderThumb, object, paintInfo, rect);
-}
-
-bool RenderThemeChromiumMac::paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
-{
-    return RenderMediaControlsChromium::paintMediaControlsPart(MediaSliderThumb, object, paintInfo, rect);
-}
-
-IntPoint RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
-{
-    return RenderTheme::volumeSliderOffsetFromMuteButton(muteButton, size);
-}
-#endif
-
-} // namespace WebCore