Attachment #207471 for bug #61276

View Details Raw Unified Return to Bug 61276

| Differences between



2013-07-25  Ruth Fong  <ruth_fong@apple.com>

        <input type=color> Mac UI behaviour
        <rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276

        Reviewed by NOBODY (OOPS!).

        * Configurations/FeatureDefines.xcconfig: Enabled INPUT_TYPE_COLOR.

2013-07-25  Oliver Hunt  <oliver@apple.com>

        More 32bit build fixes

Lines 98-104 ENABLE_ICONDATABASE_macosx = ENABLE_ICON Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig_sec1
- Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig -1 / +1 lines
98	ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;	98	ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
99	ENABLE_INDEXED_DATABASE = ;	99	ENABLE_INDEXED_DATABASE = ;
100	ENABLE_INPUT_SPEECH = ;	100	ENABLE_INPUT_SPEECH = ;
101	ENABLE_INPUT_TYPE_COLOR = ;	101	ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
102	ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));	102	ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));
103	ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;	103	ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
104	ENABLE_INPUT_TYPE_DATE_iphonesimulator = $(ENABLE_INPUT_TYPE_DATE_iphoneos);	104	ENABLE_INPUT_TYPE_DATE_iphonesimulator = $(ENABLE_INPUT_TYPE_DATE_iphoneos);



2013-07-25  Ruth Fong  <ruth_fong@apple.com>

        <input type=color> Mac UI behaviour
        <rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276

        Reviewed by NOBODY (OOPS!).

        * wtf/FeatureDefines.h: Enabled INPUT_TYPE_COLOR.

2013-07-25  Michael Brüning  <michael.bruning@digia.com>

        Fix Windows build after r153134.

Lines 503-509 Source/WTF/wtf/FeatureDefines.h_sec1
- Source/WTF/wtf/FeatureDefines.h -1 / +1 lines
503	#endif	503	#endif
504		504
505	#if !defined(ENABLE_INPUT_TYPE_COLOR)	505	#if !defined(ENABLE_INPUT_TYPE_COLOR)
506	#define ENABLE_INPUT_TYPE_COLOR 0	506	#define ENABLE_INPUT_TYPE_COLOR 1
507	#endif	507	#endif
508		508
509	#if !defined(ENABLE_INPUT_TYPE_DATE)	509	#if !defined(ENABLE_INPUT_TYPE_DATE)



2013-07-25  Ruth Fong  <ruth_fong@apple.com>

        <input type=color> Mac UI behaviour
        <rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276

        Reviewed by NOBODY (OOPS!).

        Tests to be added in a later patch.

        * Configurations/FeatureDefines.xcconfig: Enabled INPUT_TYPE_COLOR.
        * WebCore.exp.in:
        * WebCore.xcodeproj/project.pbxproj:

        * html/ColorInputType.cpp:
        (WebCore::ColorInputType::handleDOMActivateEvent): Reattaches the color picker if
          a color picker has already been shown for an element.
        (WebCore::ColorInputType::shouldResetOnDocumentActivation): Always returns true, needed to
          detach the color picker when caching a page.
        * html/ColorInputType.h:

        * html/HTMLInputElement.cpp:
        (WebCore::HTMLInputElement::documentDidResumeFromPageCache): For <input type='color'>,
          don't reset the element.
        (WebCore::HTMLInputElement::documentWillSuspendForPageCache): For <input type='color'>, call detach().
        * html/HTMLInputElement.h:

        * platform/ColorChooser.h:
        (WebCore::ColorChooser::reattachColorChooser): Added definition.

2013-07-25  Christophe Dumez  <ch.dumez@sisa.samsung.com>

        Unreviewed EFL build fix after r153315.



#endif // ENABLE(ICONDATABASE)

#if ENABLE(INPUT_TYPE_COLOR)
__ZN7WebCore5ColorC1EP7CGColor
__ZN7WebCore5ColorC1ERKN3WTF6StringE
__ZN7WebCore14ColorInputType6createEPNS_16HTMLInputElementE
__ZN7WebCore16HTMLInputElement25selectColorInColorChooserERKNS_5ColorE
#endif


Lines 99-105 ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_S Source/WebCore/Configurations/FeatureDefines.xcconfig_sec1
- Source/WebCore/Configurations/FeatureDefines.xcconfig -1 / +1 lines
99	ENABLE_INDEXED_DATABASE = ;	99	ENABLE_INDEXED_DATABASE = ;
100	ENABLE_INDIE_UI = ENABLE_INDIE_UI;	100	ENABLE_INDIE_UI = ENABLE_INDIE_UI;
101	ENABLE_INPUT_SPEECH = ;	101	ENABLE_INPUT_SPEECH = ;
102	ENABLE_INPUT_TYPE_COLOR = ;	102	ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
103	ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));	103	ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));
104	ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;	104	ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
105	ENABLE_INPUT_TYPE_DATE_iphonesimulator = $(ENABLE_INPUT_TYPE_DATE_iphoneos);	105	ENABLE_INPUT_TYPE_DATE_iphonesimulator = $(ENABLE_INPUT_TYPE_DATE_iphoneos);



		7AF11A5A12E727490061F23C /* InspectorRuntimeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AF11A5912E727490061F23C /* InspectorRuntimeAgent.h */; };
		7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
		7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
		7BE7427381FA906FBB4F0F2C /* JSSVGGraphicsElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */; };
		7C522D4B15B477E8009B7C95 /* InspectorOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C522D4915B477E8009B7C95 /* InspectorOverlay.cpp */; };
		7CC7E3D717208C0F003C5277 /* IDNScriptWhiteList.txt in Resources */ = {isa = PBXBuildFile; fileRef = 7CC7E3D617208C0F003C5277 /* IDNScriptWhiteList.txt */; };
		7CE30DA9171B63D200EC33E1 /* FrameSnapshottingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CE30DA7171B63D200EC33E1 /* FrameSnapshottingMac.mm */; };

		85136CA60AED665900F90A3D /* southWestResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C960AED665900F90A3D /* southWestResizeCursor.png */; };
		85136CA70AED665900F90A3D /* waitCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C970AED665900F90A3D /* waitCursor.png */; };
		85136CA80AED665900F90A3D /* westResizeCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 85136C980AED665900F90A3D /* westResizeCursor.png */; };
		85174EC2BCCAF17EAE3F46F8 /* JSSVGGraphicsElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */; };
		85183B420AA6926100F19FA3 /* DOMHTMLBRElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 85183B380AA6926100F19FA3 /* DOMHTMLBRElement.h */; };
		85183B430AA6926100F19FA3 /* DOMHTMLBRElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85183B390AA6926100F19FA3 /* DOMHTMLBRElement.mm */; };
		85183B440AA6926100F19FA3 /* DOMHTMLHeadingElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 85183B3A0AA6926100F19FA3 /* DOMHTMLHeadingElement.h */; };

		B2FA3D9B0AB75A6F000E5AC4 /* JSSVGGElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CB30AB75A6E000E5AC4 /* JSSVGGElement.h */; };
		B2FA3D9C0AB75A6F000E5AC4 /* JSSVGGradientElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CB40AB75A6E000E5AC4 /* JSSVGGradientElement.cpp */; };
		B2FA3D9D0AB75A6F000E5AC4 /* JSSVGGradientElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CB50AB75A6E000E5AC4 /* JSSVGGradientElement.h */; };
		85174EC2BCCAF17EAE3F46F8 /* JSSVGGraphicsElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */; };
		7BE7427381FA906FBB4F0F2C /* JSSVGGraphicsElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */; };
		B2FA3D9E0AB75A6F000E5AC4 /* JSSVGImageElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CB60AB75A6E000E5AC4 /* JSSVGImageElement.cpp */; };
		B2FA3D9F0AB75A6F000E5AC4 /* JSSVGImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CB70AB75A6E000E5AC4 /* JSSVGImageElement.h */; };
		B2FA3DA00AB75A6F000E5AC4 /* JSSVGLength.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CB80AB75A6E000E5AC4 /* JSSVGLength.cpp */; };

		BC23EE920DAED2BC009FDC91 /* CSSImageGeneratorValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC23EE910DAED2BC009FDC91 /* CSSImageGeneratorValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
		BC23F0DB0DAFF4A4009FDC91 /* GeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BC23F0DA0DAFF4A4009FDC91 /* GeneratedImage.h */; };
		BC2441C40E8B65D00055320F /* ScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2441C30E8B65D00055320F /* ScrollView.cpp */; };
		BC24AB4017A19631001411E7 /* ColorInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC24AB3F17A19631001411E7 /* ColorInputType.cpp */; };
		BC25B52A131C6D3900180E10 /* LocalizedStringsMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC25B528131C6D3900180E10 /* LocalizedStringsMac.cpp */; };
		BC274B2F140EBEB200EADFA6 /* CSSBorderImageSliceValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC274B2E140EBEB200EADFA6 /* CSSBorderImageSliceValue.h */; };
		BC274B31140EBED800EADFA6 /* CSSBorderImageSliceValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC274B30140EBED800EADFA6 /* CSSBorderImageSliceValue.cpp */; };

		FD06DFA5134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD06DFA3134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp */; };
		FD06DFA6134A4DEF006F5D7D /* DefaultAudioDestinationNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD06DFA4134A4DEF006F5D7D /* DefaultAudioDestinationNode.h */; };
		FD1660A513787C6D001FFA7B /* DenormalDisabler.h in Headers */ = {isa = PBXBuildFile; fileRef = FD1660A413787C6D001FFA7B /* DenormalDisabler.h */; };
		FD1AF1501656F15100C6D4F7 /* ShapeValue.h in Headers */ = {isa = PBXBuildFile; fileRef = FD1AF14E1656F12100C6D4F7 /* ShapeValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
		FD1762DF176686D900D836A8 /* UpSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1762DD176686D900D836A8 /* UpSampler.cpp */; };
		FD1762E0176686D900D836A8 /* UpSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = FD1762DE176686D900D836A8 /* UpSampler.h */; };
		FD1762E3176686EA00D836A8 /* DownSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1762E1176686EA00D836A8 /* DownSampler.cpp */; };
		FD1762E4176686EA00D836A8 /* DownSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = FD1762E2176686EA00D836A8 /* DownSampler.h */; };
		FD1AF1501656F15100C6D4F7 /* ShapeValue.h in Headers */ = {isa = PBXBuildFile; fileRef = FD1AF14E1656F12100C6D4F7 /* ShapeValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
		FD23A12513F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23A12313F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp */; };
		FD23A12613F5FA5900F67001 /* JSMediaElementAudioSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD23A12413F5FA5900F67001 /* JSMediaElementAudioSourceNode.h */; };
		FD2DBF1212B048A300ED98C6 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD2DBF0E12B048A300ED98C6 /* Accelerate.framework */; };

		5A574F23131DB93900471B88 /* RenderQuote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderQuote.h; sourceTree = "<group>"; };
		5A574F26131DB96D00471B88 /* QuotesData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = QuotesData.cpp; path = style/QuotesData.cpp; sourceTree = "<group>"; };
		5A574F27131DB96D00471B88 /* QuotesData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuotesData.h; path = style/QuotesData.h; sourceTree = "<group>"; };
		5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGraphicsElement.cpp; sourceTree = "<group>"; };
		5D21A80013ECE5DF00BB7064 /* WebVTTParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTParser.cpp; sourceTree = "<group>"; };
		5D21A80113ECE5DF00BB7064 /* WebVTTParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTParser.h; sourceTree = "<group>"; };
		5D4B8C5211E52C8B00BBB62F /* WebCore.exp.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebCore.exp.in; sourceTree = "<group>"; };

		93F9B79E0BA6032600854064 /* JSCDATASection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCDATASection.cpp; sourceTree = "<group>"; };
		93F9B79F0BA6032600854064 /* JSCDATASection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCDATASection.h; sourceTree = "<group>"; };
		93FDAFC90B11307400E2746F /* EditorInsertAction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EditorInsertAction.h; sourceTree = "<group>"; };
		950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGraphicsElement.h; sourceTree = "<group>"; };
		96ABA42214BCB80E00D56204 /* GraphicsContext3DOpenGLCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3DOpenGLCommon.cpp; sourceTree = "<group>"; };
		97059973107D975200A50A7C /* PolicyCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PolicyCallback.cpp; sourceTree = "<group>"; };
		97059974107D975200A50A7C /* PolicyCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyCallback.h; sourceTree = "<group>"; };

		B2FA3CB30AB75A6E000E5AC4 /* JSSVGGElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGElement.h; sourceTree = "<group>"; };
		B2FA3CB40AB75A6E000E5AC4 /* JSSVGGradientElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGradientElement.cpp; sourceTree = "<group>"; };
		B2FA3CB50AB75A6E000E5AC4 /* JSSVGGradientElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGradientElement.h; sourceTree = "<group>"; };
		5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGraphicsElement.cpp; sourceTree = "<group>"; };
		950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGraphicsElement.h; sourceTree = "<group>"; };
		B2FA3CB60AB75A6E000E5AC4 /* JSSVGImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGImageElement.cpp; sourceTree = "<group>"; };
		B2FA3CB70AB75A6E000E5AC4 /* JSSVGImageElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGImageElement.h; sourceTree = "<group>"; };
		B2FA3CB80AB75A6E000E5AC4 /* JSSVGLength.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGLength.cpp; sourceTree = "<group>"; };

		BC23EE910DAED2BC009FDC91 /* CSSImageGeneratorValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSImageGeneratorValue.h; sourceTree = "<group>"; };
		BC23F0DA0DAFF4A4009FDC91 /* GeneratedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneratedImage.h; sourceTree = "<group>"; };
		BC2441C30E8B65D00055320F /* ScrollView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollView.cpp; sourceTree = "<group>"; };
		BC24AB3F17A19631001411E7 /* ColorInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorInputType.cpp; sourceTree = "<group>"; };
		BC25B528131C6D3900180E10 /* LocalizedStringsMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalizedStringsMac.cpp; sourceTree = "<group>"; };
		BC274B2E140EBEB200EADFA6 /* CSSBorderImageSliceValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSBorderImageSliceValue.h; sourceTree = "<group>"; };
		BC274B30140EBED800EADFA6 /* CSSBorderImageSliceValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSBorderImageSliceValue.cpp; sourceTree = "<group>"; };

		FD08A886175D3926002CD360 /* ShapeOutsideInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShapeOutsideInfo.cpp; sourceTree = "<group>"; };
		FD08A887175D3926002CD360 /* ShapeOutsideInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeOutsideInfo.h; sourceTree = "<group>"; };
		FD1660A413787C6D001FFA7B /* DenormalDisabler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DenormalDisabler.h; sourceTree = "<group>"; };
		FD1AF14E1656F12100C6D4F7 /* ShapeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShapeValue.h; path = style/ShapeValue.h; sourceTree = "<group>"; };
		FD1762DD176686D900D836A8 /* UpSampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UpSampler.cpp; sourceTree = "<group>"; };
		FD1762DE176686D900D836A8 /* UpSampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpSampler.h; sourceTree = "<group>"; };
		FD1762E1176686EA00D836A8 /* DownSampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownSampler.cpp; sourceTree = "<group>"; };
		FD1762E2176686EA00D836A8 /* DownSampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownSampler.h; sourceTree = "<group>"; };
		FD1AF14E1656F12100C6D4F7 /* ShapeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShapeValue.h; path = style/ShapeValue.h; sourceTree = "<group>"; };
		FD23A12313F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaElementAudioSourceNode.cpp; sourceTree = "<group>"; };
		FD23A12413F5FA5900F67001 /* JSMediaElementAudioSourceNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaElementAudioSourceNode.h; sourceTree = "<group>"; };
		FD2DBF0E12B048A300ED98C6 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = "<absolute>"; };

				4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */,
				4ACBC0BD12713CBD0094F9B2 /* ClassList.h */,
				93C441FF0F813AE100C1A634 /* CollectionType.h */,
				BC24AB3F17A19631001411E7 /* ColorInputType.cpp */,
				F55B3D801251F12D003EF269 /* ColorInputType.h */,
				F55B3D811251F12D003EF269 /* DateInputType.cpp */,
				F55B3D821251F12D003EF269 /* DateInputType.h */,

				49E911CC0EF86D47009D0CAF /* SkewTransformOperation.cpp in Sources */,
				4150F9F212B6E0E70008C860 /* SliderThumbElement.cpp in Sources */,
				4B6FA6F70C39E4A100087011 /* SmartReplaceCF.cpp in Sources */,
				BC24AB4017A19631001411E7 /* ColorInputType.cpp in Sources */,
				E4AFD00B0DAF335400F5F55C /* SMILTime.cpp in Sources */,
				E4AFD00D0DAF335500F5F55C /* SMILTimeContainer.cpp in Sources */,
				510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */,

Lines 150-158 void ColorInputType::handleDOMActivateEv Source/WebCore/html/ColorInputType.cpp_sec1
- Source/WebCore/html/ColorInputType.cpp -3 / +11 lines
150	if (!ScriptController::processingUserGesture())	150	if (!ScriptController::processingUserGesture())
151	return;	151	return;
152		152
153	Chrome* chrome = this->chrome();	153	if (Chrome* chrome = this->chrome()) {
154	if (chrome && !m_chooser)	154	if (!m_chooser)
155	m_chooser = chrome->createColorChooser(this, valueAsColor());	155	m_chooser = chrome->createColorChooser(this, valueAsColor());
		156	else
		157	m_chooser->reattachColorChooser(valueAsColor());
		158	}
156		159
157	event->setDefaultHandled();	160	event->setDefaultHandled();
158	}	161	}
Lines 172-177 bool ColorInputType::typeMismatchFor(con Source/WebCore/html/ColorInputType.cpp_sec2
172	return !isValidColorString(value);	175	return !isValidColorString(value);
173	}	176	}
174		177
		178	bool ColorInputType::shouldResetOnDocumentActivation()
		179	{
		180	return true;
		181	}
		182
175	void ColorInputType::didChooseColor(const Color& color)	183	void ColorInputType::didChooseColor(const Color& color)
176	{	184	{
177	if (element()->isDisabledOrReadOnly() \|\| color == valueAsColor())	185	if (element()->isDisabledOrReadOnly() \|\| color == valueAsColor())

Lines 64-69 private: Source/WebCore/html/ColorInputType.h_sec1
- Source/WebCore/html/ColorInputType.h +1 lines
64	virtual void detach() OVERRIDE;	64	virtual void detach() OVERRIDE;
65	virtual bool shouldRespectListAttribute() OVERRIDE;	65	virtual bool shouldRespectListAttribute() OVERRIDE;
66	virtual bool typeMismatchFor(const String&) const OVERRIDE;	66	virtual bool typeMismatchFor(const String&) const OVERRIDE;
		67	virtual bool shouldResetOnDocumentActivation() OVERRIDE;
67		68
68	Color valueAsColor() const;	69	Color valueAsColor() const;
69	void endColorChooser();	70	void endColorChooser();

Lines 1482-1487 void HTMLInputElement::updateClearButton Source/WebCore/html/HTMLInputElement.cpp_sec1
- Source/WebCore/html/HTMLInputElement.cpp +16 lines
1482	void HTMLInputElement::documentDidResumeFromPageCache()	1482	void HTMLInputElement::documentDidResumeFromPageCache()
1483	{	1483	{
1484	ASSERT(needsSuspensionCallback());	1484	ASSERT(needsSuspensionCallback());
		1485
		1486	#if ENABLE(INPUT_TYPE_COLOR)
		1487	// <input type=color> uses documentWillSuspendForPageCache to detach the color picker UI,
		1488	// so it should not be reset when being loaded from page cache.
		1489	if (isColorControl())
		1490	return;
		1491	#endif
1485	reset();	1492	reset();
1486	}	1493	}
1487		1494
Lines 1963-1966 bool HTMLInputElement::setupDateTimeChoo Source/WebCore/html/HTMLInputElement.cpp_sec2
1963	}	1970	}
1964	#endif	1971	#endif
1965		1972
		1973	#if ENABLE(INPUT_TYPE_COLOR)
		1974	void HTMLInputElement::documentWillSuspendForPageCache()
		1975	{
		1976	if (!isColorControl())
		1977	return;
		1978	static_cast<InputType*>(m_inputType.get())->detach();
		1979	}
		1980	#endif // ENABLE(INPUT_TYPE_COLOR)
		1981
1966	} // namespace	1982	} // namespace

Lines 302-307 public: Source/WebCore/html/HTMLInputElement.h_sec1
- Source/WebCore/html/HTMLInputElement.h +4 lines
302	bool setupDateTimeChooserParameters(DateTimeChooserParameters&);	302	bool setupDateTimeChooserParameters(DateTimeChooserParameters&);
303	#endif	303	#endif
304		304
		305	#if ENABLE(INPUT_TYPE_COLOR)
		306	virtual void documentWillSuspendForPageCache() OVERRIDE;
		307	#endif
		308
305	protected:	309	protected:
306	HTMLInputElement(const QualifiedName&, Document, HTMLFormElement, bool createdByParser);	310	HTMLInputElement(const QualifiedName&, Document, HTMLFormElement, bool createdByParser);
307		311

Lines 40-45 class ColorChooser { Source/WebCore/platform/ColorChooser.h_sec1
- Source/WebCore/platform/ColorChooser.h +1 lines
40	public:	40	public:
41	virtual ~ColorChooser() { }	41	virtual ~ColorChooser() { }
42		42
		43	virtual void reattachColorChooser(const Color&) { }
43	virtual void setSelectedColor(const Color&) { }	44	virtual void setSelectedColor(const Color&) { }
44	virtual void endChooser() { }	45	virtual void endChooser() { }
45	};	46	};



2013-07-25  Ruth Fong  <ruth_fong@apple.com>

        <input type=color> Mac UI behaviour
        <rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276

        Implemented <input type='color'> on Mac using the native color picker. 

        Reviewed by NOBODY (OOPS!).

        Code for WebColorPickerMac is derived from Chromium's color_chooser_mac.mm:
        https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/cocoa/color_chooser_mac.mm

        * Configurations/FeatureDefines.xcconfig: Enabled INPUT_TYPE_COLOR.

        * UIProcess/API/mac/PageClientImpl.mm:
        (WebKit::PageClientImpl::createColorPicker): Replaced stub implementation
          and return a WebColorPickerMac object.

        * UIProcess/WebColorPicker.cpp:
        (WebKit::WebColorPicker::invalidate): Updated to call endChooser().
        (WebKit::WebColorPicker::showColorPicker): Added stub implementation.
        * UIProcess/WebColorPicker.h:

        * UIProcess/WebPageProxy.cpp:
        (WebKit::WebPageProxy::close): Removed invalidation of removed color picker objects.
        (WebKit::WebPageProxy::showColorChooser): Updated so that it works for
          multiple <input type='color'> elements on a page.
        (WebKit::WebPageProxy::didEndColorChooser): Removed cleanup of removed color picker objects.
        (WebKit::WebPageProxy::resetStateAfterProcessExited): Removed cleanup of removed color picker objects.
        * UIProcess/WebPageProxy.h:

        * UIProcess/mac/WebColorPickerMac.h: Added.
        * UIProcess/mac/WebColorPickerMac.mm: Added.
        (WebKit::WebColorPickerMac::create):
        (WebKit::WebColorPickerMac::~WebColorPickerMac):
        (WebKit::WebColorPickerMac::WebColorPickerMac):
        (WebKit::WebColorPickerMac::endChooser):
        (WebKit::WebColorPickerMac::setSelectedColor):
        (WebKit::WebColorPickerMac::didChooseColor):
        (WebKit::WebColorPickerMac::showColorPicker):
        WebColorPickerMac contains a reference to a WKColorPanelMac object
          and is responsible for maintaining the color picker UI.

        (-[WKColorPanelMac showPicker:withColor:]):
        (-[WKColorPanelMac dealloc]):
        (-[WKColorPanelMac windowWillClose:]):
        (-[WKColorPanelMac didChooseColor:]):
        (-[WKColorPanelMac setColor:]):
        WKColorPanelMac is a wrapper for a NSColorPanel object and 
          is responsible for the color picker UI.

        * WebKit2.xcodeproj/project.pbxproj:

        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
        (WebKit::WebChromeClient::createColorChooser): Updated to always create a 
          WebColorChooser object.

        * WebProcess/WebCoreSupport/WebColorChooser.cpp:
        (WebKit::WebColorChooser::reattachColorChooser): Sets the page's 
          active color chooser to the current object and pings the UIProcess
          to show the color picker.
        (WebKit::WebColorChooser::setSelectedColor): Only sets the color in the
          color picker if the WebColorChooser object is the active color element.
        * WebProcess/WebCoreSupport/WebColorChooser.h:

2013-07-25  Anders Carlsson  <andersca@apple.com>

        Remove lastModifiedDate from ResourceResponse

Lines 98-104 ENABLE_ICONDATABASE_macosx = ENABLE_ICON Source/WebKit2/Configurations/FeatureDefines.xcconfig_sec1
- Source/WebKit2/Configurations/FeatureDefines.xcconfig -1 / +1 lines
98	ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;	98	ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
99	ENABLE_INDEXED_DATABASE = ;	99	ENABLE_INDEXED_DATABASE = ;
100	ENABLE_INPUT_SPEECH = ;	100	ENABLE_INPUT_SPEECH = ;
101	ENABLE_INPUT_TYPE_COLOR = ;	101	ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
102	ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));	102	ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));
103	ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;	103	ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
104	ENABLE_INPUT_TYPE_DATE_iphonesimulator = $(ENABLE_INPUT_TYPE_DATE_iphoneos);	104	ENABLE_INPUT_TYPE_DATE_iphonesimulator = $(ENABLE_INPUT_TYPE_DATE_iphoneos);

Lines 39-44 WebColorPicker::~WebColorPicker() Source/WebKit2/UIProcess/WebColorPicker.cpp_sec1
- Source/WebKit2/UIProcess/WebColorPicker.cpp +12 lines
39	{	39	{
40	}	40	}
41		41
		42	void WebColorPicker::invalidate()
		43	{
		44	endChooser();
		45	m_client = 0;
		46	}
		47
42	void WebColorPicker::endChooser()	48	void WebColorPicker::endChooser()
43	{	49	{
44	if (!m_client)	50	if (!m_client)
Lines 55-60 void WebColorPicker::setSelectedColor(co Source/WebKit2/UIProcess/WebColorPicker.cpp_sec2
55	m_client->didChooseColor(color);	61	m_client->didChooseColor(color);
56	}	62	}
57		63
		64	void WebColorPicker::showColorPicker(const WebCore::Color& color)
		65	{
		66	ASSERT_NOT_REACHED();
		67	return;
		68	}
		69
58	} // namespace WebKit	70	} // namespace WebKit
59		71
60	#endif // ENABLE(INPUT_TYPE_COLOR)	72	#endif // ENABLE(INPUT_TYPE_COLOR)




    virtual ~WebColorPicker();

    void invalidate();

    virtual void endChooser();
    virtual void setSelectedColor(const WebCore::Color&);
    virtual void showColorPicker(const WebCore::Color&);

protected:
    explicit WebColorPicker(Client*);



        m_colorPicker->invalidate();
        m_colorPicker = nullptr;
    }

    if (m_colorPickerResultListener) {
        m_colorPickerResultListener->invalidate();
        m_colorPickerResultListener = nullptr;
    }
#endif

#if ENABLE(GEOLOCATION)

#if ENABLE(INPUT_TYPE_COLOR)
void WebPageProxy::showColorChooser(const WebCore::Color& initialColor, const IntRect& elementRect)
{
    ASSERT(!m_colorPicker);

    if (m_colorPickerResultListener) {
        m_colorPickerResultListener->invalidate();
        m_colorPickerResultListener = nullptr;
    }

    m_colorPickerResultListener = WebColorPickerResultListenerProxy::create(this);
    m_colorPicker = WebColorPicker::create(this);

    if (m_uiClient.showColorPicker(this, initialColor.serialized(), m_colorPickerResultListener.get()))
        return;

    m_colorPicker = m_pageClient->createColorPicker(this, initialColor, elementRect);
    if (!m_colorPicker)
        m_colorPicker = m_pageClient->createColorPicker(this, initialColor, elementRect);
    m_colorPicker->showColorPicker(initialColor);
}

void WebPageProxy::setColorChooserColor(const WebCore::Color& color)

    }

    m_process->send(Messages::WebPage::DidEndColorChooser(), m_pageID);

    m_colorPickerResultListener->invalidate();
    m_colorPickerResultListener = nullptr;

    m_uiClient.hideColorPicker(this);
}
#endif


        m_colorPicker->invalidate();
        m_colorPicker = nullptr;
    }

    if (m_colorPickerResultListener) {
        m_colorPickerResultListener->invalidate();
        m_colorPickerResultListener = nullptr;
    }
#endif

#if ENABLE(GEOLOCATION)

Lines 749-755 public: Source/WebKit2/UIProcess/WebPageProxy.h_sec1
- Source/WebKit2/UIProcess/WebPageProxy.h -1 / +1 lines
749	#if ENABLE(INPUT_TYPE_COLOR)	749	#if ENABLE(INPUT_TYPE_COLOR)
750	void setColorChooserColor(const WebCore::Color&);	750	void setColorChooserColor(const WebCore::Color&);
751	void endColorChooser();	751	void endColorChooser();
752	#endif	752	#endif // ENABLE(INPUT_TYPE_COLOR)
753		753
754	const WebLoaderClient& loaderClient() { return m_loaderClient; }	754	const WebLoaderClient& loaderClient() { return m_loaderClient; }
755		755



#import "WKStringCF.h"
#import "WKViewInternal.h"
#import "StringUtilities.h"
#import "WebColorPickerMac.h"
#import "WebContextMenuProxyMac.h"
#import "WebEditCommandProxy.h"
#import "WebPopupMenuProxyMac.h"

}

#if ENABLE(INPUT_TYPE_COLOR)
PassRefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy* page, const WebCore::Color& initialColor,  const WebCore::IntRect&)
{
    return WebColorPickerMac::create(page, initialColor);
    return 0;
}
#endif




/*
 * Copyright (c) 2013 The Chromium Authors. All rights reserved.
 * Copyright (C) 2013 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:
 *
 *    * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *    * 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.
 *    * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
 * OWNER 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.
 */

#ifndef WebColorPickerMac_h
#define WebColorPickerMac_h

#if ENABLE(INPUT_TYPE_COLOR)

#if USE(APPKIT)

#import "WebColorPicker.h"
#include <wtf/RetainPtr.h>

OBJC_CLASS NSColorWell;
OBJC_CLASS WKColorPanelMac;

namespace WebCore {
class Color;
}

namespace WebKit {
    
class WebColorPickerMac : public WebColorPicker {
public:        
    static PassRefPtr<WebColorPickerMac> create(WebColorPicker::Client*, const WebCore::Color&);
    ~WebColorPickerMac();

    virtual void endChooser() OVERRIDE;
    virtual void setSelectedColor(const WebCore::Color&) OVERRIDE;
    virtual void showColorPicker(const WebCore::Color&) OVERRIDE;
    
    void didChooseColor(const WebCore::Color&);

private:
    static WebColorPickerMac* open(WebColorPicker::Client*, const WebCore::Color&);
    WebColorPickerMac(WebColorPicker::Client*, const WebCore::Color&);
    RetainPtr<WKColorPanelMac> m_panel;
};

} // namespace WebKit

// A Listener class to act as a event target for NSColorPanel and send
// the results to the C++ class, WebColorPickerMac.
@interface WKColorPanelMac : NSObject<NSWindowDelegate> {
    
@private
    BOOL _lastChangedByUser;
    WebKit::WebColorPickerMac* _picker;
}

- (id)initWithPicker:(WebKit::WebColorPickerMac*)picker withColor:(NSColor *)color;
- (void)showPicker:(WebKit::WebColorPickerMac*)picker withColor:(NSColor *)color;
- (void)didChooseColor:(NSColorPanel *)panel;

// Sets color to the NSColorPanel as a non user change.
- (void)setColor:(NSColor *)color;

@end

#endif // ENABLE(INPUT_TYPE_COLOR)

#endif // USE(APPKIT)

#endif // WebContextMenuProxyMac_h



/* 
 * Copyright (c) 2013 The Chromium Authors. All rights reserved.
 * Copyright (C) 2013 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:
 *
 *    * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *    * 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.
 *    * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
 * OWNER 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 "WebColorPickerMac.h"

#if ENABLE(INPUT_TYPE_COLOR)

#if USE(APPKIT)

#import <WebCore/ColorMac.h>

namespace WebKit {

PassRefPtr<WebColorPickerMac> WebColorPickerMac::create(WebColorPicker::Client* client, const WebCore::Color& initialColor)
{
    return adoptRef(new WebColorPickerMac(client, initialColor));
}

WebColorPickerMac::~WebColorPickerMac()
{
    ASSERT(!m_panel);
}

WebColorPickerMac::WebColorPickerMac(WebColorPicker::Client* client, const WebCore::Color& initialColor)
    : WebColorPicker(client)
{
    m_panel = adoptNS([[WKColorPanelMac alloc] initWithPicker:this withColor:nsColor(initialColor)]);
}

void WebColorPickerMac::endChooser()
{
    m_panel = nullptr;
}

void WebColorPickerMac::setSelectedColor(const WebCore::Color& color)
{
    if (!m_client)
        return;
    
    if (!m_panel)
        return;

    [m_panel setColor:nsColor(color)];
}

void WebColorPickerMac::didChooseColor(const WebCore::Color& color)
{
    if (!m_client)
        return;
    
    m_client->didChooseColor(color);
}
void WebColorPickerMac::showColorPicker(const WebCore::Color& color)
{
    if (!m_client)
        return;

    if (!m_panel)
        m_panel = adoptNS([[WKColorPanelMac alloc] initWithPicker:this withColor:nsColor(color)]);

    [m_panel showPicker:this withColor:nsColor(color)];
}

} // namespace WebKit

using namespace WebKit;

@implementation WKColorPanelMac

- (id)initWithPicker:(WebColorPickerMac*)picker withColor:(NSColor *)color
{
    if (!(self = [super init]))
        return self;
    
    NSColorPanel *panel = [NSColorPanel sharedColorPanel];
    [panel setColor:color];
    
    [panel setShowsAlpha:NO];
    [panel setDelegate:self];
    
    _lastChangedByUser = YES;
    [panel setAction:@selector(didChooseColor:)];
    
    return self;
}

- (void)showPicker:(WebColorPickerMac*)picker withColor:(NSColor *)color
{
    _picker = picker;

    NSColorPanel *panel = [NSColorPanel sharedColorPanel];
    if ([panel color] != color)
        [panel setColor:color];
    [panel setTarget:self];
    [panel makeKeyAndOrderFront:nil];
}

- (void)dealloc
{
    NSColorPanel *panel = [NSColorPanel sharedColorPanel];
    if ([panel delegate] == self) {
        [panel setDelegate:nil];
        [panel setTarget:nil];
        [panel setAction:nil];
    }

    [super dealloc];
}

- (void)windowWillClose:(NSNotification *)notification
{
    _lastChangedByUser = YES;
    _picker->endChooser();
}

- (void)didChooseColor:(NSColorPanel *)panel
{
    // Check if the color changed programatically or through the color picker.
    if (!_lastChangedByUser) {
        _lastChangedByUser = YES;
        return;
    }
    
    _picker->didChooseColor(WebCore::colorFromNSColor([[panel color] colorUsingColorSpaceName:NSDeviceRGBColorSpace]));
}

- (void)setColor:(NSColor *)color
{
    _lastChangedByUser = NO;
    [[NSColorPanel sharedColorPanel] setColor:color];
}

@end

#endif // USE(APPKIT)

#endif // ENABLE(INPUT_TYPE_COLOR)



#if ENABLE(INPUT_TYPE_COLOR)
PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
{
    if (m_page->activeColorChooser())
        return nullptr;

    return adoptPtr(new WebColorChooser(m_page, client, initialColor));
}
#endif

Lines 69-78 void WebColorChooser::disconnectFromPage Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.cpp_sec1
- Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.cpp +12 lines
69	m_page = 0;	69	m_page = 0;
70	}	70	}
71		71
		72	void WebColorChooser::reattachColorChooser(const Color& color)
		73	{
		74	ASSERT(m_page);
		75	m_page->setActiveColorChooser(this);
		76
		77	ASSERT(m_colorChooserClient);
		78	WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::ShowColorChooser(color, m_colorChooserClient->elementRectRelativeToRootView()), m_page->pageID());
		79	}
		80
72	void WebColorChooser::setSelectedColor(const Color& color)	81	void WebColorChooser::setSelectedColor(const Color& color)
73	{	82	{
74	if (!m_page)	83	if (!m_page)
75	return;	84	return;
		85
		86	if (m_page->activeColorChooser() != this)
		87	return;
76		88
77	WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::SetColorChooserColor(color), m_page->pageID());	89	WebProcess::shared().parentProcessConnection()->send(Messages::WebPageProxy::SetColorChooserColor(color), m_page->pageID());
78	}	90	}

Lines 48-53 public: Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.h_sec1
- Source/WebKit2/WebProcess/WebCoreSupport/WebColorChooser.h +1 lines
48	void didEndChooser();	48	void didEndChooser();
49	void disconnectFromPage();	49	void disconnectFromPage();
50		50
		51	virtual void reattachColorChooser(const WebCore::Color&) OVERRIDE;
51	virtual void setSelectedColor(const WebCore::Color&) OVERRIDE;	52	virtual void setSelectedColor(const WebCore::Color&) OVERRIDE;
52	virtual void endChooser() OVERRIDE;	53	virtual void endChooser() OVERRIDE;
53		54



2013-07-25  Ruth Fong  <ruth_fong@apple.com>

        <input type=color> Mac UI behaviour
        <rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276

        Reviewed by NOBODY (OOPS!).

        * Configurations/FeatureDefines.xcconfig: Enabled INPUT_TYPE_COLOR.
        * WebCoreSupport/WebChromeClient.h:
        * WebCoreSupport/WebChromeClient.mm:
        (WebChromeClient::createColorPicker): Added stub implementation.

2013-05-05  Geoffrey Garen  <ggaren@apple.com>

        Rolled back in r149527 with crash fixed.

Lines 98-104 ENABLE_ICONDATABASE_macosx = ENABLE_ICON Source/WebKit/mac/Configurations/FeatureDefines.xcconfig_sec1
- Source/WebKit/mac/Configurations/FeatureDefines.xcconfig -1 / +1 lines
98	ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;	98	ENABLE_IFRAME_SEAMLESS = ENABLE_IFRAME_SEAMLESS;
99	ENABLE_INDEXED_DATABASE = ;	99	ENABLE_INDEXED_DATABASE = ;
100	ENABLE_INPUT_SPEECH = ;	100	ENABLE_INPUT_SPEECH = ;
101	ENABLE_INPUT_TYPE_COLOR = ;	101	ENABLE_INPUT_TYPE_COLOR = ENABLE_INPUT_TYPE_COLOR;
102	ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));	102	ENABLE_INPUT_TYPE_DATE = $(ENABLE_INPUT_TYPE_DATE_$(PLATFORM_NAME));
103	ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;	103	ENABLE_INPUT_TYPE_DATE_iphoneos = ENABLE_INPUT_TYPE_DATE;
104	ENABLE_INPUT_TYPE_DATE_iphonesimulator = $(ENABLE_INPUT_TYPE_DATE_iphoneos);	104	ENABLE_INPUT_TYPE_DATE_iphonesimulator = $(ENABLE_INPUT_TYPE_DATE_iphoneos);

Lines 129-134 public: Source/WebKit/mac/WebCoreSupport/WebChromeClient.h_sec1
- Source/WebKit/mac/WebCoreSupport/WebChromeClient.h +4 lines
129	virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) OVERRIDE;	129	virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) OVERRIDE;
130	virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect, bool behindText, bool entireLine) OVERRIDE;	130	virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect, bool behindText, bool entireLine) OVERRIDE;
131		131
		132	#if ENABLE(INPUT_TYPE_COLOR)
		133	virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE;
		134	#endif
		135
132	virtual WebCore::KeyboardUIMode keyboardUIMode() OVERRIDE;	136	virtual WebCore::KeyboardUIMode keyboardUIMode() OVERRIDE;
133		137
134	virtual NSResponder *firstResponder() OVERRIDE;	138	virtual NSResponder *firstResponder() OVERRIDE;



#import "WebViewInternal.h"
#import <Foundation/Foundation.h>
#import <WebCore/BlockExceptions.h>
#import <WebCore/ColorChooser.h>
#import <WebCore/Console.h>
#import <WebCore/ContextMenu.h>
#import <WebCore/ContextMenuController.h>

    END_BLOCK_OBJC_EXCEPTIONS;
}

#if ENABLE(INPUT_TYPE_COLOR)
PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
{
    // FIXME: Implement <input type='color'> for WK1 (Bug 119094).
    ASSERT_NOT_REACHED();
    return nullptr;
}
#endif

void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> chooser)
{
    BEGIN_BLOCK_OBJC_EXCEPTIONS;



2013-07-25  Ruth Fong  <ruth_fong@apple.com>

        <input type=color> Mac UI behaviour
        <rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276

        Reviewed by NOBODY (OOPS!).

        Updated tests to reflect <input type='color'> being implemented with a native color picker.

        * fast/forms/color/input-color-onchange-event-expected.txt:

        * platform/mac/TestExpectations: Enabled fast/form/color tests on Mac.

        * platform/mac/accessibility/color-well-expected.txt:
        * platform/mac/accessibility/role-subrole-roledescription-expected.txt:
        * platform/mac/accessibility/role-subrole-roledescription.html:

        * platform/mac/fast/forms/color/input-appearance-color-expected.txt: Updated test expectations 
          on Mac to reflect the fact that the list attribute for <input type='color'> is not yet supported.

2013-07-19  Filip Pizlo  <fpizlo@apple.com>

        fourthTier: String GetByVal out-of-bounds handling is so wrong

Lines 1-4 LayoutTests/fast/forms/color/input-color-onchange-event-expected.txt_sec1
- LayoutTests/fast/forms/color/input-color-onchange-event-expected.txt -1 / +2 lines
1	Test if change event fires properly when color chooser changes. Bug 66848	1	Test if change event fires properly when color chooser changes. Bug 66848
		2	To manually test this, click on the input color element in the top left corner and change the value from the color chooser. See if the number of "value changed" messages matches the number of times you changed the color.
2		3
3	On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".	4	On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
4		5



# Datalist is not yet enabled.
fast/forms/datalist

# Color input is not yet enabled.
fast/forms/color

# Times out only in non-wk2 Mac, possibly because of platform-specific behavior
# interfering with how the test is executed.
webkit.org/b/113220 fast/forms/select/popup-closes-on-blur.html [ Timeout Pass ]



On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".


Role of input type=color is: AXRole: AXColorWell
Value of empty color well: AXValue: rgb 0.00000 0.00000 0.00000 1
Value of good color well: AXValue: rgb 1.00000 0.00000 0.00000 1
Value of bad color well: AXValue: rgb 0.00000 0.00000 0.00000 1
PASS successfullyParsed is true

TEST COMPLETE



      AXRoleDescription: button
      
PASS: input[type='color']
      AXRole: AXColorWell
      AXSubrole: 
      AXRoleDescription: color well
      
PASS: input[type='checkbox']
      AXRole: AXCheckBox

Lines 61-67 LayoutTests/platform/mac/accessibility/role-subrole-roledescription.html_sec1
- LayoutTests/platform/mac/accessibility/role-subrole-roledescription.html -1 / +1 lines
61	<img data-role="AXImage" data-subrole="" data-roledescription="image" class="ex" alt="X" data-note="[alt='X']">	61	<img data-role="AXImage" data-subrole="" data-roledescription="image" class="ex" alt="X" data-note="[alt='X']">
62	<input type="button" value="X" data-role="AXButton" data-subrole="" data-roledescription="button" class="ex" data-note="[type='button']">	62	<input type="button" value="X" data-role="AXButton" data-subrole="" data-roledescription="button" class="ex" data-note="[type='button']">
63	<!-- skipped <menu><input type="button"></menu> -->	63	<!-- skipped <menu><input type="button"></menu> -->
64	<!-- http://webkit.org/b/109017 --><input type="color" value="X" data-role="AXTextField" data-subrole="" data-roledescription="text field" class="ex" data-note="[type='color']">	64	<!-- http://webkit.org/b/109017 --><input type="color" value="X" data-role="AXColorWell" data-subrole="" data-roledescription="color well" class="ex" data-note="[type='color']">
65	<input type="checkbox" data-role="AXCheckBox" data-subrole="" data-roledescription="check box" class="ex" data-note="[type='checkbox']">	65	<input type="checkbox" data-role="AXCheckBox" data-subrole="" data-roledescription="check box" class="ex" data-note="[type='checkbox']">
66	<!-- skipped <menu><input type="checkbox"></menu> -->	66	<!-- skipped <menu><input type="checkbox"></menu> -->
67	<!-- http://webkit.org/b/109017 --><input type="date" value="X" data-role="AXTextField" data-subrole="" data-roledescription="text field" class="ex" data-note="[type='date']">	67	<!-- http://webkit.org/b/109017 --><input type="date" value="X" data-role="AXTextField" data-subrole="" data-roledescription="text field" class="ex" data-note="[type='date']">



        RenderText {#text} at (0,0) size 456x18
          text run at (0,0) width 456: "List color controls have different appearance if ENABLE(DATALIST)."
        RenderBR {BR} at (456,14) size 0x0
        RenderBlock {INPUT} at (0,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#000000] [border: (1px solid #777777)]
        RenderBlock {INPUT} at (44,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#000000] [border: (1px solid #777777)]
        RenderBlock {INPUT} at (44,23) size 88x18 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x18
            RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#000000] [border: (1px solid #000000)]
        RenderText {#text} at (0,0) size 0x0
      RenderBlock {H3} at (0,99) size 784x22
        RenderText {#text} at (0,0) size 160x22
          text run at (0,0) width 160: "Different Font Sizes"
      RenderBlock (anonymous) at (0,139) size 784x41
        RenderText {#text} at (0,0) size 577x18
          text run at (0,0) width 577: "List color controls have different sizes depending on font sizes. Normal color controls don't."
        RenderBR {BR} at (577,14) size 0x0
        RenderBlock {INPUT} at (0,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (44,21) size 4x18
          text run at (44,21) width 4: " "
        RenderBlock {INPUT} at (48,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (92,21) size 4x18
          text run at (92,21) width 4: " "
        RenderBlock {INPUT} at (96,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (140,21) size 4x18
          text run at (140,21) width 4: " "
        RenderBlock {INPUT} at (144,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (188,21) size 4x18
          text run at (188,21) width 4: " "
        RenderBlock {INPUT} at (192,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (236,21) size 4x18
          text run at (236,21) width 4: " "
        RenderBlock {INPUT} at (240,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (44,27) size 4x18
          text run at (44,27) width 4: " "
        RenderBlock {INPUT} at (48,18) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (92,27) size 4x18
          text run at (92,27) width 4: " "
        RenderBlock {INPUT} at (96,18) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (140,27) size 4x18
          text run at (140,27) width 4: " "
        RenderBlock {INPUT} at (144,20) size 88x21 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x21
            RenderBlock {DIV} at (8,4) size 56x13 [bgcolor=#00FF00] [border: (1px solid #000000)]
        RenderText {#text} at (232,27) size 4x18
          text run at (232,27) width 4: " "
        RenderBlock {INPUT} at (236,23) size 88x18 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x18
            RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#00FF00] [border: (1px solid #000000)]
        RenderText {#text} at (324,27) size 4x18
          text run at (324,27) width 4: " "
        RenderBlock {INPUT} at (328,26) size 88x15 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x15
            RenderBlock {DIV} at (8,4) size 56x7 [bgcolor=#00FF00] [border: (1px solid #000000)]
        RenderText {#text} at (0,0) size 0x0
      RenderBlock {H3} at (0,198) size 784x22
        RenderText {#text} at (0,0) size 124x22
          text run at (0,0) width 124: "Various Colors"
      RenderBlock (anonymous) at (0,238) size 784x23
        RenderBlock {INPUT} at (0,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#FF0000] [border: (1px solid #777777)]
        RenderText {#text} at (44,3) size 4x18
          text run at (44,3) width 4: " "
        RenderBlock {INPUT} at (48,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (92,3) size 4x18
          text run at (92,3) width 4: " "
        RenderBlock {INPUT} at (96,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#0000FF] [border: (1px solid #777777)]
        RenderText {#text} at (140,3) size 4x18
          text run at (140,3) width 4: " "
        RenderBlock {INPUT} at (144,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#EC008C] [border: (1px solid #777777)]
        RenderText {#text} at (188,3) size 4x18
          text run at (188,3) width 4: " "
        RenderBlock {INPUT} at (192,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#40E0D0] [border: (1px solid #777777)]
        RenderText {#text} at (236,3) size 4x18
          text run at (236,3) width 4: " "
        RenderBlock {INPUT} at (240,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#FF0000] [border: (1px solid #777777)]
        RenderText {#text} at (284,3) size 4x18
          text run at (284,3) width 4: " "
        RenderBlock {INPUT} at (288,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
        RenderText {#text} at (332,3) size 4x18
          text run at (332,3) width 4: " "
        RenderBlock {INPUT} at (336,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#0000FF] [border: (1px solid #777777)]
        RenderText {#text} at (380,3) size 4x18
          text run at (380,3) width 4: " "
        RenderBlock {INPUT} at (384,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#EC008C] [border: (1px solid #777777)]
        RenderText {#text} at (428,3) size 4x18
          text run at (428,3) width 4: " "
        RenderBlock {INPUT} at (432,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 38x21
            RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#40E0D0] [border: (1px solid #777777)]
        RenderText {#text} at (236,9) size 4x18
          text run at (236,9) width 4: " "
        RenderBlock {INPUT} at (240,5) size 88x18 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x18
            RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#FF0000] [border: (1px solid #000000)]
        RenderText {#text} at (328,9) size 4x18
          text run at (328,9) width 4: " "
        RenderBlock {INPUT} at (332,5) size 88x18 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x18
            RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#00FF00] [border: (1px solid #000000)]
        RenderText {#text} at (420,9) size 4x18
          text run at (420,9) width 4: " "
        RenderBlock {INPUT} at (424,5) size 88x18 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x18
            RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#0000FF] [border: (1px solid #000000)]
        RenderText {#text} at (512,9) size 4x18
          text run at (512,9) width 4: " "
        RenderBlock {INPUT} at (516,5) size 88x18 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x18
            RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#EC008C] [border: (1px solid #000000)]
        RenderText {#text} at (604,9) size 4x18
          text run at (604,9) width 4: " "
        RenderBlock {INPUT} at (608,5) size 88x18 [bgcolor=#FFFFFF]
          RenderFlexibleBox {DIV} at (0,0) size 88x18
            RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#40E0D0] [border: (1px solid #000000)]
        RenderText {#text} at (0,0) size 0x0
      RenderBlock {H3} at (0,279) size 784x22
        RenderText {#text} at (0,0) size 117x22
          text run at (0,0) width 117: "Arbitrary Size"
      RenderBlock (anonymous) at (0,319) size 784x30
        RenderBlock {INPUT} at (0,0) size 100x30 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
          RenderFlexibleBox {DIV} at (3,1) size 94x28
            RenderBlock {DIV} at (2,4) size 90x20 [bgcolor=#FF0000] [border: (1px solid #777777)]

Return to Bug 61276

Lines 2517-2523 __ZNK7WebCore12IconDatabase9isEnabledEv Source/WebCore/WebCore.exp.in_sec1
- Source/WebCore/WebCore.exp.in +2 lines
2517	#endif // ENABLE(ICONDATABASE)	2517	#endif // ENABLE(ICONDATABASE)
2518		2518
2519	#if ENABLE(INPUT_TYPE_COLOR)	2519	#if ENABLE(INPUT_TYPE_COLOR)
		2520	__ZN7WebCore5ColorC1EP7CGColor
2520	__ZN7WebCore5ColorC1ERKN3WTF6StringE	2521	__ZN7WebCore5ColorC1ERKN3WTF6StringE
		2522	__ZN7WebCore14ColorInputType6createEPNS_16HTMLInputElementE
2521	__ZN7WebCore16HTMLInputElement25selectColorInColorChooserERKNS_5ColorE	2523	__ZN7WebCore16HTMLInputElement25selectColorInColorChooserERKNS_5ColorE
2522	#endif	2524	#endif
2523		2525

Lines 580-590 void WebPageProxy::close() Source/WebKit2/UIProcess/WebPageProxy.cpp_sec1
- Source/WebKit2/UIProcess/WebPageProxy.cpp -30 / +2 lines
580	m_colorPicker->invalidate();	580	m_colorPicker->invalidate();
581	m_colorPicker = nullptr;	581	m_colorPicker = nullptr;
582	}	582	}
583
584	if (m_colorPickerResultListener) {
585	m_colorPickerResultListener->invalidate();
586	m_colorPickerResultListener = nullptr;
587	}
588	#endif	583	#endif
589		584
590	#if ENABLE(GEOLOCATION)	585	#if ENABLE(GEOLOCATION)
Lines 2920-2941 void WebPageProxy::needTouchEvents(bool Source/WebKit2/UIProcess/WebPageProxy.cpp_sec2
2920	#if ENABLE(INPUT_TYPE_COLOR)	2915	#if ENABLE(INPUT_TYPE_COLOR)
2921	void WebPageProxy::showColorChooser(const WebCore::Color& initialColor, const IntRect& elementRect)	2916	void WebPageProxy::showColorChooser(const WebCore::Color& initialColor, const IntRect& elementRect)
2922	{	2917	{
2923	ASSERT(!m_colorPicker);
2924
2925	if (m_colorPickerResultListener) {
2926	m_colorPickerResultListener->invalidate();
2927	m_colorPickerResultListener = nullptr;
2928	}
2929
2930	m_colorPickerResultListener = WebColorPickerResultListenerProxy::create(this);
2931	m_colorPicker = WebColorPicker::create(this);
2932
2933	if (m_uiClient.showColorPicker(this, initialColor.serialized(), m_colorPickerResultListener.get()))
2934	return;
2935
2936	m_colorPicker = m_pageClient->createColorPicker(this, initialColor, elementRect);
2937	if (!m_colorPicker)	2918	if (!m_colorPicker)
2938	didEndColorChooser();	2919	m_colorPicker = m_pageClient->createColorPicker(this, initialColor, elementRect);
		2920	m_colorPicker->showColorPicker(initialColor);
2939	}	2921	}
2940		2922
2941	void WebPageProxy::setColorChooserColor(const WebCore::Color& color)	2923	void WebPageProxy::setColorChooserColor(const WebCore::Color& color)
Lines 2971-2981 void WebPageProxy::didEndColorChooser() Source/WebKit2/UIProcess/WebPageProxy.cpp_sec3
2971	}	2953	}
2972		2954
2973	m_process->send(Messages::WebPage::DidEndColorChooser(), m_pageID);	2955	m_process->send(Messages::WebPage::DidEndColorChooser(), m_pageID);
2974
2975	m_colorPickerResultListener->invalidate();
2976	m_colorPickerResultListener = nullptr;
2977
2978	m_uiClient.hideColorPicker(this);
2979	}	2956	}
2980	#endif	2957	#endif
2981		2958
Lines 3840-3850 void WebPageProxy::resetStateAfterProces Source/WebKit2/UIProcess/WebPageProxy.cpp_sec4
3840	m_colorPicker->invalidate();	3817	m_colorPicker->invalidate();
3841	m_colorPicker = nullptr;	3818	m_colorPicker = nullptr;
3842	}	3819	}
3843
3844	if (m_colorPickerResultListener) {
3845	m_colorPickerResultListener->invalidate();
3846	m_colorPickerResultListener = nullptr;
3847	}
3848	#endif	3820	#endif
3849		3821
3850	#if ENABLE(GEOLOCATION)	3822	#if ENABLE(GEOLOCATION)

Lines 661-669 bool WebChromeClient::paintCustomOverhan Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp_sec1
- Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp -3 lines
661	#if ENABLE(INPUT_TYPE_COLOR)	661	#if ENABLE(INPUT_TYPE_COLOR)
662	PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)	662	PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
663	{	663	{
664	if (m_page->activeColorChooser())
665	return nullptr;
666
667	return adoptPtr(new WebColorChooser(m_page, client, initialColor));	664	return adoptPtr(new WebColorChooser(m_page, client, initialColor));
668	}	665	}
669	#endif	666	#endif

Lines 1-3 Source/JavaScriptCore/ChangeLog_sec1
- Source/JavaScriptCore/ChangeLog +9 lines
		1	2013-07-25 Ruth Fong <ruth_fong@apple.com>
		2
		3	<input type=color> Mac UI behaviour
		4	<rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Configurations/FeatureDefines.xcconfig: Enabled INPUT_TYPE_COLOR.
		9
1	2013-07-25 Oliver Hunt <oliver@apple.com>	10	2013-07-25 Oliver Hunt <oliver@apple.com>
2		11
3	More 32bit build fixes	12	More 32bit build fixes

Lines 1-3 Source/WTF/ChangeLog_sec1
- Source/WTF/ChangeLog +9 lines
		1	2013-07-25 Ruth Fong <ruth_fong@apple.com>
		2
		3	<input type=color> Mac UI behaviour
		4	<rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* wtf/FeatureDefines.h: Enabled INPUT_TYPE_COLOR.
		9
1	2013-07-25 Michael Brüning <michael.bruning@digia.com>	10	2013-07-25 Michael Brüning <michael.bruning@digia.com>
2		11
3	Fix Windows build after r153134.	12	Fix Windows build after r153134.

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +29 lines
		1	2013-07-25 Ruth Fong <ruth_fong@apple.com>
		2
		3	<input type=color> Mac UI behaviour
		4	<rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Tests to be added in a later patch.
		9
		10	* Configurations/FeatureDefines.xcconfig: Enabled INPUT_TYPE_COLOR.
		11	* WebCore.exp.in:
		12	* WebCore.xcodeproj/project.pbxproj:
		13
		14	* html/ColorInputType.cpp:
		15	(WebCore::ColorInputType::handleDOMActivateEvent): Reattaches the color picker if
		16	a color picker has already been shown for an element.
		17	(WebCore::ColorInputType::shouldResetOnDocumentActivation): Always returns true, needed to
		18	detach the color picker when caching a page.
		19	* html/ColorInputType.h:
		20
		21	* html/HTMLInputElement.cpp:
		22	(WebCore::HTMLInputElement::documentDidResumeFromPageCache): For <input type='color'>,
		23	don't reset the element.
		24	(WebCore::HTMLInputElement::documentWillSuspendForPageCache): For <input type='color'>, call detach().
		25	* html/HTMLInputElement.h:
		26
		27	* platform/ColorChooser.h:
		28	(WebCore::ColorChooser::reattachColorChooser): Added definition.
		29
1	2013-07-25 Christophe Dumez <ch.dumez@sisa.samsung.com>	30	2013-07-25 Christophe Dumez <ch.dumez@sisa.samsung.com>
2		31
3	Unreviewed EFL build fix after r153315.	32	Unreviewed EFL build fix after r153315.

Lines 1-3 Source/WebKit2/ChangeLog_sec1
- Source/WebKit2/ChangeLog +65 lines
		1	2013-07-25 Ruth Fong <ruth_fong@apple.com>
		2
		3	<input type=color> Mac UI behaviour
		4	<rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276
		5
		6	Implemented <input type='color'> on Mac using the native color picker.
		7
		8	Reviewed by NOBODY (OOPS!).
		9
		10	Code for WebColorPickerMac is derived from Chromium's color_chooser_mac.mm:
		11	https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/cocoa/color_chooser_mac.mm
		12
		13	* Configurations/FeatureDefines.xcconfig: Enabled INPUT_TYPE_COLOR.
		14
		15	* UIProcess/API/mac/PageClientImpl.mm:
		16	(WebKit::PageClientImpl::createColorPicker): Replaced stub implementation
		17	and return a WebColorPickerMac object.
		18
		19	* UIProcess/WebColorPicker.cpp:
		20	(WebKit::WebColorPicker::invalidate): Updated to call endChooser().
		21	(WebKit::WebColorPicker::showColorPicker): Added stub implementation.
		22	* UIProcess/WebColorPicker.h:
		23
		24	* UIProcess/WebPageProxy.cpp:
		25	(WebKit::WebPageProxy::close): Removed invalidation of removed color picker objects.
		26	(WebKit::WebPageProxy::showColorChooser): Updated so that it works for
		27	multiple <input type='color'> elements on a page.
		28	(WebKit::WebPageProxy::didEndColorChooser): Removed cleanup of removed color picker objects.
		29	(WebKit::WebPageProxy::resetStateAfterProcessExited): Removed cleanup of removed color picker objects.
		30	* UIProcess/WebPageProxy.h:
		31
		32	* UIProcess/mac/WebColorPickerMac.h: Added.
		33	* UIProcess/mac/WebColorPickerMac.mm: Added.
		34	(WebKit::WebColorPickerMac::create):
		35	(WebKit::WebColorPickerMac::~WebColorPickerMac):
		36	(WebKit::WebColorPickerMac::WebColorPickerMac):
		37	(WebKit::WebColorPickerMac::endChooser):
		38	(WebKit::WebColorPickerMac::setSelectedColor):
		39	(WebKit::WebColorPickerMac::didChooseColor):
		40	(WebKit::WebColorPickerMac::showColorPicker):
		41	WebColorPickerMac contains a reference to a WKColorPanelMac object
		42	and is responsible for maintaining the color picker UI.
		43
		44	(-[WKColorPanelMac showPicker:withColor:]):
		45	(-[WKColorPanelMac dealloc]):
		46	(-[WKColorPanelMac windowWillClose:]):
		47	(-[WKColorPanelMac didChooseColor:]):
		48	(-[WKColorPanelMac setColor:]):
		49	WKColorPanelMac is a wrapper for a NSColorPanel object and
		50	is responsible for the color picker UI.
		51
		52	* WebKit2.xcodeproj/project.pbxproj:
		53
		54	* WebProcess/WebCoreSupport/WebChromeClient.cpp:
		55	(WebKit::WebChromeClient::createColorChooser): Updated to always create a
		56	WebColorChooser object.
		57
		58	* WebProcess/WebCoreSupport/WebColorChooser.cpp:
		59	(WebKit::WebColorChooser::reattachColorChooser): Sets the page's
		60	active color chooser to the current object and pings the UIProcess
		61	to show the color picker.
		62	(WebKit::WebColorChooser::setSelectedColor): Only sets the color in the
		63	color picker if the WebColorChooser object is the active color element.
		64	* WebProcess/WebCoreSupport/WebColorChooser.h:
65
1	2013-07-25 Anders Carlsson <andersca@apple.com>	66	2013-07-25 Anders Carlsson <andersca@apple.com>
2		67
3	Remove lastModifiedDate from ResourceResponse	68	Remove lastModifiedDate from ResourceResponse

Lines 57-66 public: Source/WebKit2/UIProcess/WebColorPicker.h_sec1
- Source/WebKit2/UIProcess/WebColorPicker.h -1 / +2 lines
57		57
58	virtual ~WebColorPicker();	58	virtual ~WebColorPicker();
59		59
60	void invalidate() { m_client = 0; }	60	void invalidate();
61		61
62	virtual void endChooser();	62	virtual void endChooser();
63	virtual void setSelectedColor(const WebCore::Color&);	63	virtual void setSelectedColor(const WebCore::Color&);
		64	virtual void showColorPicker(const WebCore::Color&);
64		65
65	protected:	66	protected:
66	explicit WebColorPicker(Client*);	67	explicit WebColorPicker(Client*);

Lines 39-44 Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm_sec1
- Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm -3 / +3 lines
39	#import "WKStringCF.h"	39	#import "WKStringCF.h"
40	#import "WKViewInternal.h"	40	#import "WKViewInternal.h"
41	#import "StringUtilities.h"	41	#import "StringUtilities.h"
		42	#import "WebColorPickerMac.h"
42	#import "WebContextMenuProxyMac.h"	43	#import "WebContextMenuProxyMac.h"
43	#import "WebEditCommandProxy.h"	44	#import "WebEditCommandProxy.h"
44	#import "WebPopupMenuProxyMac.h"	45	#import "WebPopupMenuProxyMac.h"
Lines 393-402 PassRefPtr<WebContextMenuProxy> PageClie Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm_sec2
393	}	394	}
394		395
395	#if ENABLE(INPUT_TYPE_COLOR)	396	#if ENABLE(INPUT_TYPE_COLOR)
396	PassRefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy*, const WebCore::Color&, const WebCore::IntRect&)	397	PassRefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy* page, const WebCore::Color& initialColor, const WebCore::IntRect&)
397	{	398	{
398	notImplemented();	399	return WebColorPickerMac::create(page, initialColor);
399	return 0;
400	}	400	}
401	#endif	401	#endif
402		402

Line 0 Source/WebKit2/UIProcess/mac/WebColorPickerMac.h_sec1
- Source/WebKit2/UIProcess/mac/WebColorPickerMac.h +92 lines
		1	/*
		2	* Copyright (c) 2013 The Chromium Authors. All rights reserved.
		3	* Copyright (C) 2013 Apple Inc. All rights reserved.
		4	*
		5	* Redistribution and use in source and binary forms, with or without
		6	* modification, are permitted provided that the following conditions are
		7	* met:
		8	*
		9	* * Redistributions of source code must retain the above copyright
		10	* notice, this list of conditions and the following disclaimer.
		11	* * Redistributions in binary form must reproduce the above
		12	* copyright notice, this list of conditions and the following disclaimer
		13	* in the documentation and/or other materials provided with the
		14	* distribution.
		15	* * Neither the name of Google Inc. nor the names of its
		16	* contributors may be used to endorse or promote products derived from
		17	* this software without specific prior written permission.
		18	*
		19	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		20	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		21	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		22	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		23	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		24	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		25	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		26	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		27	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		28	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		29	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		30	*/
		31
		32	#ifndef WebColorPickerMac_h
		33	#define WebColorPickerMac_h
		34
		35	#if ENABLE(INPUT_TYPE_COLOR)
		36
		37	#if USE(APPKIT)
		38
		39	#import "WebColorPicker.h"
		40	#include <wtf/RetainPtr.h>
		41
		42	OBJC_CLASS NSColorWell;
		43	OBJC_CLASS WKColorPanelMac;
		44
		45	namespace WebCore {
		46	class Color;
		47	}
		48
		49	namespace WebKit {
		50
		51	class WebColorPickerMac : public WebColorPicker {
		52	public:
		53	static PassRefPtr<WebColorPickerMac> create(WebColorPicker::Client*, const WebCore::Color&);
		54	~WebColorPickerMac();
		55
		56	virtual void endChooser() OVERRIDE;
		57	virtual void setSelectedColor(const WebCore::Color&) OVERRIDE;
		58	virtual void showColorPicker(const WebCore::Color&) OVERRIDE;
		59
		60	void didChooseColor(const WebCore::Color&);
		61
		62	private:
		63	static WebColorPickerMac* open(WebColorPicker::Client*, const WebCore::Color&);
		64	WebColorPickerMac(WebColorPicker::Client*, const WebCore::Color&);
65	RetainPtr<WKColorPanelMac> m_panel;
66	};
67
68	} // namespace WebKit
69
70	// A Listener class to act as a event target for NSColorPanel and send
71	// the results to the C++ class, WebColorPickerMac.
72	@interface WKColorPanelMac : NSObject<NSWindowDelegate> {
73
74	@private
75	BOOL _lastChangedByUser;
76	WebKit::WebColorPickerMac* _picker;
77	}
78
79	- (id)initWithPicker:(WebKit::WebColorPickerMac)picker withColor:(NSColor )color;
80	- (void)showPicker:(WebKit::WebColorPickerMac)picker withColor:(NSColor )color;
81	- (void)didChooseColor:(NSColorPanel *)panel;
82
83	// Sets color to the NSColorPanel as a non user change.
84	- (void)setColor:(NSColor *)color;
85
86	@end
87
88	#endif // ENABLE(INPUT_TYPE_COLOR)
89
90	#endif // USE(APPKIT)
91
92	#endif // WebContextMenuProxyMac_h

Lines 568-573 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec1
- Source/WebKit2/WebKit2.xcodeproj/project.pbxproj +8 lines
568	659C551E130006410025C0C2 /* InjectedBundlePageResourceLoadClient.cpp in Sources / = {isa = PBXBuildFile; fileRef = 6546A82913000164000CEB1C / InjectedBundlePageResourceLoadClient.cpp */; };	568	659C551E130006410025C0C2 /* InjectedBundlePageResourceLoadClient.cpp in Sources / = {isa = PBXBuildFile; fileRef = 6546A82913000164000CEB1C / InjectedBundlePageResourceLoadClient.cpp */; };
569	65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers / = {isa = PBXBuildFile; fileRef = 65B86F1812F11D7B00B7DD8A / WKBundleInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };	569	65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers / = {isa = PBXBuildFile; fileRef = 65B86F1812F11D7B00B7DD8A / WKBundleInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
570	6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers / = {isa = PBXBuildFile; fileRef = 6EE849C61368D92D0038D481 / WKInspectorPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };	570	6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers / = {isa = PBXBuildFile; fileRef = 6EE849C61368D92D0038D481 / WKInspectorPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
		571	728E86F11795188C0087879E /* WebColorPickerMac.h in Headers / = {isa = PBXBuildFile; fileRef = 728E86EF1795188C0087879E / WebColorPickerMac.h */; };
		572	728E86F21795188C0087879E /* WebColorPickerMac.mm in Sources / = {isa = PBXBuildFile; fileRef = 728E86F01795188C0087879E / WebColorPickerMac.mm */; };
571	762B748D120BC75C00819339 /* WKPreferencesPrivate.h in Headers / = {isa = PBXBuildFile; fileRef = 762B7484120BBA2D00819339 / WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };	573	762B748D120BC75C00819339 /* WKPreferencesPrivate.h in Headers / = {isa = PBXBuildFile; fileRef = 762B7484120BBA2D00819339 / WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
572	7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources / = {isa = PBXBuildFile; fileRef = 7801C095142290C400FAF9AF / WebHitTestResult.cpp */; };	574	7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources / = {isa = PBXBuildFile; fileRef = 7801C095142290C400FAF9AF / WebHitTestResult.cpp */; };
573	7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers / = {isa = PBXBuildFile; fileRef = 7801C096142290C400FAF9AF / WebHitTestResult.h */; };	575	7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers / = {isa = PBXBuildFile; fileRef = 7801C096142290C400FAF9AF / WebHitTestResult.h */; };
Lines 2053-2058 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec2
2053	65B86F1812F11D7B00B7DD8A /* WKBundleInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleInspector.h; sourceTree = "<group>"; };	2055	65B86F1812F11D7B00B7DD8A /* WKBundleInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleInspector.h; sourceTree = "<group>"; };
2054	6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = com.apple.WebProcess.sb.in; path = WebProcess/com.apple.WebProcess.sb.in; sourceTree = "<group>"; };	2056	6D8A91A511F0EFD100DD01FE /* com.apple.WebProcess.sb.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = com.apple.WebProcess.sb.in; path = WebProcess/com.apple.WebProcess.sb.in; sourceTree = "<group>"; };
2055	6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKInspectorPrivateMac.h; path = mac/WKInspectorPrivateMac.h; sourceTree = "<group>"; };	2057	6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKInspectorPrivateMac.h; path = mac/WKInspectorPrivateMac.h; sourceTree = "<group>"; };
		2058	728E86EF1795188C0087879E /* WebColorPickerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebColorPickerMac.h; sourceTree = "<group>"; };
		2059	728E86F01795188C0087879E /* WebColorPickerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebColorPickerMac.mm; sourceTree = "<group>"; };
2056	762B7481120BBA0100819339 /* FontSmoothingLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSmoothingLevel.h; sourceTree = "<group>"; };	2060	762B7481120BBA0100819339 /* FontSmoothingLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSmoothingLevel.h; sourceTree = "<group>"; };
2057	762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };	2061	762B7484120BBA2D00819339 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
2058	7801C095142290C400FAF9AF /* WebHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHitTestResult.cpp; sourceTree = "<group>"; };	2062	7801C095142290C400FAF9AF /* WebHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHitTestResult.cpp; sourceTree = "<group>"; };
Lines 4909-4914 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec3
4909	1AA417ED12C00D87002BE67B /* TextCheckerMac.mm */,	4913	1AA417ED12C00D87002BE67B /* TextCheckerMac.mm */,
4910	1AF05D8514688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.h */,	4914	1AF05D8514688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.h */,
4911	1AF05D8414688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.mm */,	4915	1AF05D8414688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.mm */,
		4916	728E86EF1795188C0087879E /* WebColorPickerMac.h */,
		4917	728E86F01795188C0087879E /* WebColorPickerMac.mm */,
4912	1A1C648611F415B700553C19 /* WebContextMac.mm */,	4918	1A1C648611F415B700553C19 /* WebContextMac.mm */,
4913	51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */,	4919	51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */,
4914	51ACBB9F127A8F2C00D203B9 /* WebContextMenuProxyMac.mm */,	4920	51ACBB9F127A8F2C00D203B9 /* WebContextMenuProxyMac.mm */,
Lines 5837-5842 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec4
5837	BC04EFFC16E65AFB00E336F0 /* WKWebProcessPlugInPrivate.h in Headers */,	5843	BC04EFFC16E65AFB00E336F0 /* WKWebProcessPlugInPrivate.h in Headers */,
5838	BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */,	5844	BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */,
5839	BCBECDE816B6416800047A1A /* XPCServiceEntryPoint.h in Headers */,	5845	BCBECDE816B6416800047A1A /* XPCServiceEntryPoint.h in Headers */,
		5846	728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */,
5840	);	5847	);
5841	runOnlyForDeploymentPostprocessing = 0;	5848	runOnlyForDeploymentPostprocessing = 0;
5842	};	5849	};
Lines 7091-7096 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec5
7091	BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */,	7098	BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */,
7092	BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */,	7099	BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */,
7093	BCBECDE716B6416800047A1A /* XPCServiceEntryPoint.mm in Sources */,	7100	BCBECDE716B6416800047A1A /* XPCServiceEntryPoint.mm in Sources */,
		7101	728E86F21795188C0087879E /* WebColorPickerMac.mm in Sources */,
7094	);	7102	);
7095	runOnlyForDeploymentPostprocessing = 0;	7103	runOnlyForDeploymentPostprocessing = 0;
7096	};	7104	};

Lines 1-3 Source/WebKit/mac/ChangeLog_sec1
- Source/WebKit/mac/ChangeLog +12 lines
		1	2013-07-25 Ruth Fong <ruth_fong@apple.com>
		2
		3	<input type=color> Mac UI behaviour
		4	<rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Configurations/FeatureDefines.xcconfig: Enabled INPUT_TYPE_COLOR.
		9	* WebCoreSupport/WebChromeClient.h:
		10	* WebCoreSupport/WebChromeClient.mm:
		11	(WebChromeClient::createColorPicker): Added stub implementation.
		12
1	2013-05-05 Geoffrey Garen <ggaren@apple.com>	13	2013-05-05 Geoffrey Garen <ggaren@apple.com>
2		14
3	Rolled back in r149527 with crash fixed.	15	Rolled back in r149527 with crash fixed.

Lines 54-59 Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm_sec1
- Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm +10 lines
54	#import "WebViewInternal.h"	54	#import "WebViewInternal.h"
55	#import <Foundation/Foundation.h>	55	#import <Foundation/Foundation.h>
56	#import <WebCore/BlockExceptions.h>	56	#import <WebCore/BlockExceptions.h>
		57	#import <WebCore/ColorChooser.h>
57	#import <WebCore/Console.h>	58	#import <WebCore/Console.h>
58	#import <WebCore/ContextMenu.h>	59	#import <WebCore/ContextMenu.h>
59	#import <WebCore/ContextMenuController.h>	60	#import <WebCore/ContextMenuController.h>
Lines 721-726 void WebChromeClient::paintCustomHighlig Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm_sec2
721	END_BLOCK_OBJC_EXCEPTIONS;	722	END_BLOCK_OBJC_EXCEPTIONS;
722	}	723	}
723		724
		725	#if ENABLE(INPUT_TYPE_COLOR)
		726	PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
		727	{
		728	// FIXME: Implement <input type='color'> for WK1 (Bug 119094).
		729	ASSERT_NOT_REACHED();
		730	return nullptr;
		731	}
		732	#endif
		733
724	void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> chooser)	734	void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> chooser)
725	{	735	{
726	BEGIN_BLOCK_OBJC_EXCEPTIONS;	736	BEGIN_BLOCK_OBJC_EXCEPTIONS;

Lines 1-3 LayoutTests/ChangeLog_sec1
- LayoutTests/ChangeLog +20 lines
		1	2013-07-25 Ruth Fong <ruth_fong@apple.com>
		2
		3	<input type=color> Mac UI behaviour
		4	<rdar://problem/10269922> and https://bugs.webkit.org/show_bug.cgi?id=61276
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Updated tests to reflect <input type='color'> being implemented with a native color picker.
		9
		10	* fast/forms/color/input-color-onchange-event-expected.txt:
		11
		12	* platform/mac/TestExpectations: Enabled fast/form/color tests on Mac.
		13
		14	* platform/mac/accessibility/color-well-expected.txt:
		15	* platform/mac/accessibility/role-subrole-roledescription-expected.txt:
		16	* platform/mac/accessibility/role-subrole-roledescription.html:
		17
		18	* platform/mac/fast/forms/color/input-appearance-color-expected.txt: Updated test expectations
		19	on Mac to reflect the fact that the list attribute for <input type='color'> is not yet supported.
		20
1	2013-07-19 Filip Pizlo <fpizlo@apple.com>	21	2013-07-19 Filip Pizlo <fpizlo@apple.com>
2		22
3	fourthTier: String GetByVal out-of-bounds handling is so wrong	23	fourthTier: String GetByVal out-of-bounds handling is so wrong

Lines 159-167 webkit.org/b/61827 fast/events/drag-imag LayoutTests/platform/mac/TestExpectations_sec1
- LayoutTests/platform/mac/TestExpectations -3 lines
159	# Datalist is not yet enabled.	159	# Datalist is not yet enabled.
160	fast/forms/datalist	160	fast/forms/datalist
161		161
162	# Color input is not yet enabled.
163	fast/forms/color
164
165	# Times out only in non-wk2 Mac, possibly because of platform-specific behavior	162	# Times out only in non-wk2 Mac, possibly because of platform-specific behavior
166	# interfering with how the test is executed.	163	# interfering with how the test is executed.
167	webkit.org/b/113220 fast/forms/select/popup-closes-on-blur.html [ Timeout Pass ]	164	webkit.org/b/113220 fast/forms/select/popup-closes-on-blur.html [ Timeout Pass ]

Lines 205-213 PASS: input[type='button'] LayoutTests/platform/mac/accessibility/role-subrole-roledescription-expected.txt_sec1
- LayoutTests/platform/mac/accessibility/role-subrole-roledescription-expected.txt -2 / +2 lines
205	AXRoleDescription: button	205	AXRoleDescription: button
206		206
207	PASS: input[type='color']	207	PASS: input[type='color']
208	AXRole: AXTextField	208	AXRole: AXColorWell
209	AXSubrole:	209	AXSubrole:
210	AXRoleDescription: text field	210	AXRoleDescription: color well
211		211
212	PASS: input[type='checkbox']	212	PASS: input[type='checkbox']
213	AXRole: AXCheckBox	213	AXRole: AXCheckBox

Lines 10-115 layer at (0,0) size 800x600 LayoutTests/platform/mac/fast/forms/color/input-appearance-color-expected.txt_sec1
- LayoutTests/platform/mac/fast/forms/color/input-appearance-color-expected.txt -74 / +74 lines
10	RenderText {#text} at (0,0) size 456x18	10	RenderText {#text} at (0,0) size 456x18
11	text run at (0,0) width 456: "List color controls have different appearance if ENABLE(DATALIST)."	11	text run at (0,0) width 456: "List color controls have different appearance if ENABLE(DATALIST)."
12	RenderBR {BR} at (456,14) size 0x0	12	RenderBR {BR} at (456,14) size 0x0
13	RenderBlock {INPUT} at (0,18) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]	13	RenderBlock {INPUT} at (0,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		14	RenderFlexibleBox {DIV} at (3,1) size 38x21
		15	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#000000] [border: (1px solid #777777)]
		16	RenderBlock {INPUT} at (44,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
14	RenderFlexibleBox {DIV} at (3,1) size 38x21	17	RenderFlexibleBox {DIV} at (3,1) size 38x21
15	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#000000] [border: (1px solid #777777)]	18	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#000000] [border: (1px solid #777777)]
16	RenderBlock {INPUT} at (44,23) size 88x18 [bgcolor=#FFFFFF]
17	RenderFlexibleBox {DIV} at (0,0) size 88x18
18	RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#000000] [border: (1px solid #000000)]
19	RenderText {#text} at (0,0) size 0x0	19	RenderText {#text} at (0,0) size 0x0
20	RenderBlock {H3} at (0,99) size 784x22	20	RenderBlock {H3} at (0,99) size 784x22
21	RenderText {#text} at (0,0) size 160x22	21	RenderText {#text} at (0,0) size 160x22
22	text run at (0,0) width 160: "Different Font Sizes"	22	text run at (0,0) width 160: "Different Font Sizes"
23	RenderBlock (anonymous) at (0,139) size 784x45	23	RenderBlock (anonymous) at (0,139) size 784x41
24	RenderText {#text} at (0,0) size 577x18	24	RenderText {#text} at (0,0) size 577x18
25	text run at (0,0) width 577: "List color controls have different sizes depending on font sizes. Normal color controls don't."	25	text run at (0,0) width 577: "List color controls have different sizes depending on font sizes. Normal color controls don't."
26	RenderBR {BR} at (577,14) size 0x0	26	RenderBR {BR} at (577,14) size 0x0
27	RenderBlock {INPUT} at (0,18) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]	27	RenderBlock {INPUT} at (0,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		28	RenderFlexibleBox {DIV} at (3,1) size 38x21
		29	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
		30	RenderText {#text} at (44,21) size 4x18
		31	text run at (44,21) width 4: " "
		32	RenderBlock {INPUT} at (48,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		33	RenderFlexibleBox {DIV} at (3,1) size 38x21
		34	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
		35	RenderText {#text} at (92,21) size 4x18
		36	text run at (92,21) width 4: " "
		37	RenderBlock {INPUT} at (96,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		38	RenderFlexibleBox {DIV} at (3,1) size 38x21
		39	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
		40	RenderText {#text} at (140,21) size 4x18
		41	text run at (140,21) width 4: " "
		42	RenderBlock {INPUT} at (144,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		43	RenderFlexibleBox {DIV} at (3,1) size 38x21
		44	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
		45	RenderText {#text} at (188,21) size 4x18
		46	text run at (188,21) width 4: " "
		47	RenderBlock {INPUT} at (192,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		48	RenderFlexibleBox {DIV} at (3,1) size 38x21
		49	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
		50	RenderText {#text} at (236,21) size 4x18
		51	text run at (236,21) width 4: " "
		52	RenderBlock {INPUT} at (240,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
28	RenderFlexibleBox {DIV} at (3,1) size 38x21	53	RenderFlexibleBox {DIV} at (3,1) size 38x21
29	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]	54	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
30	RenderText {#text} at (44,27) size 4x18
31	text run at (44,27) width 4: " "
32	RenderBlock {INPUT} at (48,18) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]
33	RenderFlexibleBox {DIV} at (3,1) size 38x21
34	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
35	RenderText {#text} at (92,27) size 4x18
36	text run at (92,27) width 4: " "
37	RenderBlock {INPUT} at (96,18) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]
38	RenderFlexibleBox {DIV} at (3,1) size 38x21
39	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
40	RenderText {#text} at (140,27) size 4x18
41	text run at (140,27) width 4: " "
42	RenderBlock {INPUT} at (144,20) size 88x21 [bgcolor=#FFFFFF]
43	RenderFlexibleBox {DIV} at (0,0) size 88x21
44	RenderBlock {DIV} at (8,4) size 56x13 [bgcolor=#00FF00] [border: (1px solid #000000)]
45	RenderText {#text} at (232,27) size 4x18
46	text run at (232,27) width 4: " "
47	RenderBlock {INPUT} at (236,23) size 88x18 [bgcolor=#FFFFFF]
48	RenderFlexibleBox {DIV} at (0,0) size 88x18
49	RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#00FF00] [border: (1px solid #000000)]
50	RenderText {#text} at (324,27) size 4x18
51	text run at (324,27) width 4: " "
52	RenderBlock {INPUT} at (328,26) size 88x15 [bgcolor=#FFFFFF]
53	RenderFlexibleBox {DIV} at (0,0) size 88x15
54	RenderBlock {DIV} at (8,4) size 56x7 [bgcolor=#00FF00] [border: (1px solid #000000)]
55	RenderText {#text} at (0,0) size 0x0	55	RenderText {#text} at (0,0) size 0x0
56	RenderBlock {H3} at (0,202) size 784x22	56	RenderBlock {H3} at (0,198) size 784x22
57	RenderText {#text} at (0,0) size 124x22	57	RenderText {#text} at (0,0) size 124x22
58	text run at (0,0) width 124: "Various Colors"	58	text run at (0,0) width 124: "Various Colors"
59	RenderBlock (anonymous) at (0,242) size 784x27	59	RenderBlock (anonymous) at (0,238) size 784x23
60	RenderBlock {INPUT} at (0,0) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]	60	RenderBlock {INPUT} at (0,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		61	RenderFlexibleBox {DIV} at (3,1) size 38x21
		62	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#FF0000] [border: (1px solid #777777)]
		63	RenderText {#text} at (44,3) size 4x18
		64	text run at (44,3) width 4: " "
		65	RenderBlock {INPUT} at (48,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		66	RenderFlexibleBox {DIV} at (3,1) size 38x21
		67	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
		68	RenderText {#text} at (92,3) size 4x18
		69	text run at (92,3) width 4: " "
		70	RenderBlock {INPUT} at (96,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		71	RenderFlexibleBox {DIV} at (3,1) size 38x21
		72	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#0000FF] [border: (1px solid #777777)]
		73	RenderText {#text} at (140,3) size 4x18
		74	text run at (140,3) width 4: " "
		75	RenderBlock {INPUT} at (144,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		76	RenderFlexibleBox {DIV} at (3,1) size 38x21
		77	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#EC008C] [border: (1px solid #777777)]
		78	RenderText {#text} at (188,3) size 4x18
		79	text run at (188,3) width 4: " "
		80	RenderBlock {INPUT} at (192,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
		81	RenderFlexibleBox {DIV} at (3,1) size 38x21
		82	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#40E0D0] [border: (1px solid #777777)]
		83	RenderText {#text} at (236,3) size 4x18
		84	text run at (236,3) width 4: " "
		85	RenderBlock {INPUT} at (240,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
61	RenderFlexibleBox {DIV} at (3,1) size 38x21	86	RenderFlexibleBox {DIV} at (3,1) size 38x21
62	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#FF0000] [border: (1px solid #777777)]	87	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#FF0000] [border: (1px solid #777777)]
63	RenderText {#text} at (44,9) size 4x18	88	RenderText {#text} at (284,3) size 4x18
64	text run at (44,9) width 4: " "	89	text run at (284,3) width 4: " "
65	RenderBlock {INPUT} at (48,0) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]	90	RenderBlock {INPUT} at (288,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
66	RenderFlexibleBox {DIV} at (3,1) size 38x21	91	RenderFlexibleBox {DIV} at (3,1) size 38x21
67	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]	92	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#00FF00] [border: (1px solid #777777)]
68	RenderText {#text} at (92,9) size 4x18	93	RenderText {#text} at (332,3) size 4x18
69	text run at (92,9) width 4: " "	94	text run at (332,3) width 4: " "
70	RenderBlock {INPUT} at (96,0) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]	95	RenderBlock {INPUT} at (336,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
71	RenderFlexibleBox {DIV} at (3,1) size 38x21	96	RenderFlexibleBox {DIV} at (3,1) size 38x21
72	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#0000FF] [border: (1px solid #777777)]	97	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#0000FF] [border: (1px solid #777777)]
73	RenderText {#text} at (140,9) size 4x18	98	RenderText {#text} at (380,3) size 4x18
74	text run at (140,9) width 4: " "	99	text run at (380,3) width 4: " "
75	RenderBlock {INPUT} at (144,0) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]	100	RenderBlock {INPUT} at (384,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
76	RenderFlexibleBox {DIV} at (3,1) size 38x21	101	RenderFlexibleBox {DIV} at (3,1) size 38x21
77	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#EC008C] [border: (1px solid #777777)]	102	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#EC008C] [border: (1px solid #777777)]
78	RenderText {#text} at (188,9) size 4x18	103	RenderText {#text} at (428,3) size 4x18
79	text run at (188,9) width 4: " "	104	text run at (428,3) width 4: " "
80	RenderBlock {INPUT} at (192,0) size 44x23 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]	105	RenderBlock {INPUT} at (432,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
81	RenderFlexibleBox {DIV} at (3,1) size 38x21	106	RenderFlexibleBox {DIV} at (3,1) size 38x21
82	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#40E0D0] [border: (1px solid #777777)]	107	RenderBlock {DIV} at (2,4) size 34x13 [bgcolor=#40E0D0] [border: (1px solid #777777)]
83	RenderText {#text} at (236,9) size 4x18
84	text run at (236,9) width 4: " "
85	RenderBlock {INPUT} at (240,5) size 88x18 [bgcolor=#FFFFFF]
86	RenderFlexibleBox {DIV} at (0,0) size 88x18
87	RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#FF0000] [border: (1px solid #000000)]
88	RenderText {#text} at (328,9) size 4x18
89	text run at (328,9) width 4: " "
90	RenderBlock {INPUT} at (332,5) size 88x18 [bgcolor=#FFFFFF]
91	RenderFlexibleBox {DIV} at (0,0) size 88x18
92	RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#00FF00] [border: (1px solid #000000)]
93	RenderText {#text} at (420,9) size 4x18
94	text run at (420,9) width 4: " "
95	RenderBlock {INPUT} at (424,5) size 88x18 [bgcolor=#FFFFFF]
96	RenderFlexibleBox {DIV} at (0,0) size 88x18
97	RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#0000FF] [border: (1px solid #000000)]
98	RenderText {#text} at (512,9) size 4x18
99	text run at (512,9) width 4: " "
100	RenderBlock {INPUT} at (516,5) size 88x18 [bgcolor=#FFFFFF]
101	RenderFlexibleBox {DIV} at (0,0) size 88x18
102	RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#EC008C] [border: (1px solid #000000)]
103	RenderText {#text} at (604,9) size 4x18
104	text run at (604,9) width 4: " "
105	RenderBlock {INPUT} at (608,5) size 88x18 [bgcolor=#FFFFFF]
106	RenderFlexibleBox {DIV} at (0,0) size 88x18
107	RenderBlock {DIV} at (8,4) size 56x10 [bgcolor=#40E0D0] [border: (1px solid #000000)]
108	RenderText {#text} at (0,0) size 0x0	108	RenderText {#text} at (0,0) size 0x0
109	RenderBlock {H3} at (0,287) size 784x22	109	RenderBlock {H3} at (0,279) size 784x22
110	RenderText {#text} at (0,0) size 117x22	110	RenderText {#text} at (0,0) size 117x22
111	text run at (0,0) width 117: "Arbitrary Size"	111	text run at (0,0) width 117: "Arbitrary Size"
112	RenderBlock (anonymous) at (0,327) size 784x30	112	RenderBlock (anonymous) at (0,319) size 784x30
113	RenderBlock {INPUT} at (0,0) size 100x30 [bgcolor=#FFFFFF] [border: (2px inset #000000) none (2px inset #000000)]	113	RenderBlock {INPUT} at (0,0) size 100x30 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)]
114	RenderFlexibleBox {DIV} at (3,1) size 94x28	114	RenderFlexibleBox {DIV} at (3,1) size 94x28
115	RenderBlock {DIV} at (2,4) size 90x20 [bgcolor=#FF0000] [border: (1px solid #777777)]	115	RenderBlock {DIV} at (2,4) size 90x20 [bgcolor=#FF0000] [border: (1px solid #777777)]