Title: [200433] trunk/Source/WebCore
Revision
200433
Author
[email protected]
Date
2016-05-04 15:14:45 -0700 (Wed, 04 May 2016)

Log Message

Add an override point for drawing named images in ThemeCocoa
https://bugs.webkit.org/show_bug.cgi?id=157357
rdar://problem/25878445

Reviewed by Dean Jackson.

Rename ThemeCocoa.cpp to ThemeCocoa.mm and rearrange the code that draws the wireless-playback image
so we can import ThemeCocoaDrawNamedImage.mm below.

* WebCore.xcodeproj/project.pbxproj:
* platform/cocoa/ThemeCocoa.cpp:
(WebCore::fitContextToBox): Deleted.
(WebCore::ThemeCocoa::drawNamedImage): Deleted.
* platform/cocoa/ThemeCocoa.mm: Renamed from Source/WebCore/platform/cocoa/ThemeCocoa.cpp.
(WebCore::fitContextToBox):
(WebCore::ThemeCocoa::drawNamedImage):

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (200432 => 200433)


--- trunk/Source/WebCore/ChangeLog	2016-05-04 22:03:45 UTC (rev 200432)
+++ trunk/Source/WebCore/ChangeLog	2016-05-04 22:14:45 UTC (rev 200433)
@@ -1,3 +1,22 @@
+2016-05-04  Anders Carlsson  <[email protected]>
+
+        Add an override point for drawing named images in ThemeCocoa
+        https://bugs.webkit.org/show_bug.cgi?id=157357
+        rdar://problem/25878445
+
+        Reviewed by Dean Jackson.
+
+        Rename ThemeCocoa.cpp to ThemeCocoa.mm and rearrange the code that draws the wireless-playback image
+        so we can import ThemeCocoaDrawNamedImage.mm below.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/cocoa/ThemeCocoa.cpp:
+        (WebCore::fitContextToBox): Deleted.
+        (WebCore::ThemeCocoa::drawNamedImage): Deleted.
+        * platform/cocoa/ThemeCocoa.mm: Renamed from Source/WebCore/platform/cocoa/ThemeCocoa.cpp.
+        (WebCore::fitContextToBox):
+        (WebCore::ThemeCocoa::drawNamedImage):
+
 2016-05-04  Jeremy Jones  <[email protected]>
 
         Don't disconnect WebAVPlayerController from its delegate since there is no way to reconnect it.

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (200432 => 200433)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-05-04 22:03:45 UTC (rev 200432)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-05-04 22:14:45 UTC (rev 200433)
@@ -1295,7 +1295,7 @@
 		31078CC81880AABB008099DC /* OESTextureHalfFloatLinear.h in Headers */ = {isa = PBXBuildFile; fileRef = 31078CC31880A6A6008099DC /* OESTextureHalfFloatLinear.h */; };
 		31078CC91880AAC9008099DC /* JSOESTextureHalfFloatLinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31078CC51880AAAA008099DC /* JSOESTextureHalfFloatLinear.cpp */; };
 		31078CCA1880AACE008099DC /* JSOESTextureHalfFloatLinear.h in Headers */ = {isa = PBXBuildFile; fileRef = 31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */; };
-		310D71951B335C9D009C7B73 /* ThemeCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 310D71931B335C9D009C7B73 /* ThemeCocoa.cpp */; };
+		310D71951B335C9D009C7B73 /* ThemeCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 310D71931B335C9D009C7B73 /* ThemeCocoa.mm */; };
 		310D71961B335C9E009C7B73 /* ThemeCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 310D71941B335C9D009C7B73 /* ThemeCocoa.h */; };
 		311C08BD18EB7CAF00B65615 /* mediaControlsApple.css in Resources */ = {isa = PBXBuildFile; fileRef = CDC1DD4117CC2C48008CB55D /* mediaControlsApple.css */; };
 		311C08BE18EB7CAF00B65615 /* mediaControlsApple.js in Resources */ = {isa = PBXBuildFile; fileRef = CDE6560E17CA6E7600526BA7 /* mediaControlsApple.js */; };
@@ -8790,7 +8790,7 @@
 		31078CC41880A6A6008099DC /* OESTextureHalfFloatLinear.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OESTextureHalfFloatLinear.idl; sourceTree = "<group>"; };
 		31078CC51880AAAA008099DC /* JSOESTextureHalfFloatLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESTextureHalfFloatLinear.cpp; sourceTree = "<group>"; };
 		31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureHalfFloatLinear.h; sourceTree = "<group>"; };
-		310D71931B335C9D009C7B73 /* ThemeCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThemeCocoa.cpp; sourceTree = "<group>"; };
+		310D71931B335C9D009C7B73 /* ThemeCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ThemeCocoa.mm; sourceTree = "<group>"; };
 		310D71941B335C9D009C7B73 /* ThemeCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeCocoa.h; sourceTree = "<group>"; };
 		311C08BC18E35D6800B65615 /* ControlStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ControlStates.h; sourceTree = "<group>"; };
 		31288E6E0E3005D6003619AE /* CSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSKeyframeRule.cpp; sourceTree = "<group>"; };
@@ -20064,8 +20064,8 @@
 				5D5975B119635F1100D00878 /* SystemVersion.h */,
 				5D5975B219635F1100D00878 /* SystemVersion.mm */,
 				7CC564B918BAC720001B9652 /* TelephoneNumberDetectorCocoa.cpp */,
-				310D71931B335C9D009C7B73 /* ThemeCocoa.cpp */,
 				310D71941B335C9D009C7B73 /* ThemeCocoa.h */,
+				310D71931B335C9D009C7B73 /* ThemeCocoa.mm */,
 				46DB7D561B20FE3C005651B2 /* VNodeTrackerCocoa.cpp */,
 				CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
 				CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
@@ -31893,7 +31893,7 @@
 				498770F01242C535002226BA /* Texture.cpp in Sources */,
 				CD9D82751C7AE535006FF066 /* TextureCacheCV.mm in Sources */,
 				BCE65D320EAD1211007E4533 /* Theme.cpp in Sources */,
-				310D71951B335C9D009C7B73 /* ThemeCocoa.cpp in Sources */,
+				310D71951B335C9D009C7B73 /* ThemeCocoa.mm in Sources */,
 				44C991A00F3D210E00586670 /* ThemeIOS.mm in Sources */,
 				BCE659E90EA92FFA007E4533 /* ThemeMac.mm in Sources */,
 				976D6C94122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp in Sources */,

Deleted: trunk/Source/WebCore/platform/cocoa/ThemeCocoa.cpp (200432 => 200433)


--- trunk/Source/WebCore/platform/cocoa/ThemeCocoa.cpp	2016-05-04 22:03:45 UTC (rev 200432)
+++ trunk/Source/WebCore/platform/cocoa/ThemeCocoa.cpp	2016-05-04 22:14:45 UTC (rev 200433)
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2015 Apple 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 INC. ``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
- * 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.
- */
-
-#import "config.h"
-#import "ThemeCocoa.h"
-
-#import "GraphicsContext.h"
-
-namespace WebCore {
-
-static void fitContextToBox(GraphicsContext& context, const FloatSize& srcImageSize, const FloatSize& dstSize)
-{
-    float srcRatio = srcImageSize.aspectRatio();
-    float dstRatio = dstSize.aspectRatio();
-
-    float scale;
-    float translationX = 0;
-    float translationY = 0;
-    if (srcRatio > dstRatio) {
-        scale = dstSize.width() / srcImageSize.width();
-        translationY = (dstSize.height() - scale * srcImageSize.height()) / 2;
-    } else {
-        scale = dstSize.height() / srcImageSize.height();
-        translationX = (dstSize.width() - scale * srcImageSize.width()) / 2;
-    }
-    context.translate(translationX, translationY);
-    context.scale(FloatSize(scale, scale));
-}
-
-void ThemeCocoa::drawNamedImage(const String& name, GraphicsContext& context, const FloatRect& rect) const
-{
-    // We only handle one icon at the moment.
-    if (name != "wireless-playback") {
-        Theme::drawNamedImage(name, context, rect);
-        return;
-    }
-
-    GraphicsContextStateSaver stateSaver(context);
-    context.setFillColor(Color::black);
-
-    FloatSize wirelessPlaybackSrcSize(32, 24.016);
-    fitContextToBox(context, wirelessPlaybackSrcSize, rect.size());
-
-    Path outline;
-    outline.moveTo(FloatPoint(24.066, 18));
-    outline.addLineTo(FloatPoint(22.111, 16));
-    outline.addLineTo(FloatPoint(30, 16));
-    outline.addLineTo(FloatPoint(30, 2));
-    outline.addLineTo(FloatPoint(2, 2));
-    outline.addLineTo(FloatPoint(2, 16));
-    outline.addLineTo(FloatPoint(9.908, 16));
-    outline.addLineTo(FloatPoint(7.953, 18));
-    outline.addLineTo(FloatPoint(0, 18));
-    outline.addLineTo(FloatPoint(0, 0));
-    outline.addLineTo(FloatPoint(32, 0));
-    outline.addLineTo(FloatPoint(32, 18));
-    outline.addLineTo(FloatPoint(24.066, 18));
-    outline.closeSubpath();
-    outline.moveTo(FloatPoint(26.917, 24.016));
-    outline.addLineTo(FloatPoint(5.040, 24.016));
-    outline.addLineTo(FloatPoint(15.978, 12.828));
-    outline.addLineTo(FloatPoint(26.917, 24.016));
-    outline.closeSubpath();
-    
-    context.fillPath(outline);
-}
-
-}

Copied: trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm (from rev 200432, trunk/Source/WebCore/platform/cocoa/ThemeCocoa.cpp) (0 => 200433)


--- trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm	                        (rev 0)
+++ trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm	2016-05-04 22:14:45 UTC (rev 200433)
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2015 Apple 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 INC. ``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
+ * 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.
+ */
+
+#import "config.h"
+#import "ThemeCocoa.h"
+
+#import "GraphicsContext.h"
+
+namespace WebCore {
+
+static void fitContextToBox(GraphicsContext& context, const FloatSize& srcImageSize, const FloatSize& dstSize)
+{
+    float srcRatio = srcImageSize.aspectRatio();
+    float dstRatio = dstSize.aspectRatio();
+
+    float scale;
+    float translationX = 0;
+    float translationY = 0;
+    if (srcRatio > dstRatio) {
+        scale = dstSize.width() / srcImageSize.width();
+        translationY = (dstSize.height() - scale * srcImageSize.height()) / 2;
+    } else {
+        scale = dstSize.height() / srcImageSize.height();
+        translationX = (dstSize.width() - scale * srcImageSize.width()) / 2;
+    }
+    context.translate(translationX, translationY);
+    context.scale(FloatSize(scale, scale));
+}
+
+void ThemeCocoa::drawNamedImage(const String& name, GraphicsContext& context, const FloatRect& rect) const
+{
+    // We only handle one icon at the moment.
+    if (name == "wireless-playback") {
+        GraphicsContextStateSaver stateSaver(context);
+        context.setFillColor(Color::black);
+
+        FloatSize wirelessPlaybackSrcSize(32, 24.016);
+        fitContextToBox(context, wirelessPlaybackSrcSize, rect.size());
+
+        Path outline;
+        outline.moveTo(FloatPoint(24.066, 18));
+        outline.addLineTo(FloatPoint(22.111, 16));
+        outline.addLineTo(FloatPoint(30, 16));
+        outline.addLineTo(FloatPoint(30, 2));
+        outline.addLineTo(FloatPoint(2, 2));
+        outline.addLineTo(FloatPoint(2, 16));
+        outline.addLineTo(FloatPoint(9.908, 16));
+        outline.addLineTo(FloatPoint(7.953, 18));
+        outline.addLineTo(FloatPoint(0, 18));
+        outline.addLineTo(FloatPoint(0, 0));
+        outline.addLineTo(FloatPoint(32, 0));
+        outline.addLineTo(FloatPoint(32, 18));
+        outline.addLineTo(FloatPoint(24.066, 18));
+        outline.closeSubpath();
+        outline.moveTo(FloatPoint(26.917, 24.016));
+        outline.addLineTo(FloatPoint(5.040, 24.016));
+        outline.addLineTo(FloatPoint(15.978, 12.828));
+        outline.addLineTo(FloatPoint(26.917, 24.016));
+        outline.closeSubpath();
+
+        context.fillPath(outline);
+        return;
+    }
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/ThemeCocoaDrawNamedImage.mm>
+#endif
+
+    Theme::drawNamedImage(name, context, rect);
+}
+
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to