Changeset 92533 in webkit
- Timestamp:
- Aug 5, 2011 6:06:43 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 deleted
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r92532 r92533 1 2011-08-05 Kent Tamura <tkent@chromium.org> 2 3 Unreviewed, rolling out r92477. 4 http://trac.webkit.org/changeset/92477 5 https://bugs.webkit.org/show_bug.cgi?id=62619 6 7 Layering violation. We should not use WebCore/dom/ in 8 WebCore/platform/. 9 10 * WebCore.exp.in: 11 * WebCore.xcodeproj/project.pbxproj: 12 * html/ColorInputType.cpp: 13 (WebCore::ColorInputType::valueChanged): 14 * html/ColorInputType.h: 15 * html/FileInputType.cpp: 16 (WebCore::FileInputType::chrome): 17 * html/FileInputType.h: 18 * html/HTMLInputElement.cpp: 19 (WebCore::HTMLInputElement::detach): 20 * html/InputType.cpp: 21 * html/InputType.h: 22 * loader/EmptyClients.h: 23 * loader/FrameLoader.cpp: 24 (WebCore::FrameLoader::transitionToCommitted): 25 * page/Chrome.cpp: 26 * page/Chrome.h: 27 * page/ChromeClient.h: 28 * platform/ColorChooser.cpp: Removed. 29 * platform/ColorChooser.h: Removed. 30 1 31 2011-08-05 Darin Adler <darin@apple.com> 2 32 -
trunk/Source/WebCore/WebCore.exp.in
r92492 r92533 1942 1942 __ZN7WebCore14ResourceHandle12releaseProxyEv 1943 1943 #endif 1944 1945 #if ENABLE(INPUT_COLOR)1946 __ZN7WebCore12ColorChooser7chooserEv1947 __ZNK7WebCore12ColorChooser13colorSelectedERKNS_5ColorE1948 #endif -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r92492 r92533 5330 5330 C105DA620F3AA68F001DD44F /* TextEncodingDetectorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */; }; 5331 5331 C105DA640F3AA6B8001DD44F /* TextEncodingDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */; }; 5332 C330A22213EC196B0000B45B /* ColorChooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C330A22013EC196B0000B45B /* ColorChooser.cpp */; };5333 C330A22313EC196B0000B45B /* ColorChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = C330A22113EC196B0000B45B /* ColorChooser.h */; settings = {ATTRIBUTES = (Private, ); }; };5334 5332 C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50B561412119D23008B46E0 /* GroupSettings.cpp */; }; 5335 5333 C50B561712119D23008B46E0 /* GroupSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C50B561512119D23008B46E0 /* GroupSettings.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 12036 12034 C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingDetectorICU.cpp; sourceTree = "<group>"; }; 12037 12035 C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextEncodingDetector.h; sourceTree = "<group>"; }; 12038 C330A22013EC196B0000B45B /* ColorChooser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorChooser.cpp; sourceTree = "<group>"; };12039 C330A22113EC196B0000B45B /* ColorChooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorChooser.h; sourceTree = "<group>"; };12040 12036 C50B561412119D23008B46E0 /* GroupSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GroupSettings.cpp; sourceTree = "<group>"; }; 12041 12037 C50B561512119D23008B46E0 /* GroupSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupSettings.h; sourceTree = "<group>"; }; … … 19025 19021 89D08D9E12228451001241DF /* AsyncFileSystemCallbacks.h */, 19026 19022 51E1ECB10C91C55600DC255B /* AutodrainedPool.h */, 19027 C330A22013EC196B0000B45B /* ColorChooser.cpp */,19028 C330A22113EC196B0000B45B /* ColorChooser.h */,19029 19023 BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */, 19030 19024 41D015C90F4B5C71004A662F /* ContentType.cpp */, … … 20523 20517 93C442000F813AE100C1A634 /* CollectionType.h in Headers */, 20524 20518 B27535670B053814002CE64F /* Color.h in Headers */, 20525 C330A22313EC196B0000B45B /* ColorChooser.h in Headers */,20526 20519 B22279630D00BF220071B782 /* ColorDistance.h in Headers */, 20527 20520 F55B3DB41251F12D003EF269 /* ColorInputType.h in Headers */, … … 23809 23802 B27535660B053814002CE64F /* Color.cpp in Sources */, 23810 23803 0FCF33240F2B9715004B6795 /* ColorCG.cpp in Sources */, 23811 C330A22213EC196B0000B45B /* ColorChooser.cpp in Sources */,23812 23804 1ABA76C911D20E47004C201C /* ColorData.cpp in Sources */, 23813 23805 B22279620D00BF220071B782 /* ColorDistance.cpp in Sources */, -
trunk/Source/WebCore/html/ColorInputType.cpp
r92477 r92533 32 32 #include "ColorInputType.h" 33 33 34 #include "Chrome.h"35 34 #include "Color.h" 36 35 #include "HTMLDivElement.h" 37 36 #include "HTMLInputElement.h" 38 #include "MouseEvent.h"39 #include "ScriptController.h"40 37 #include "ShadowRoot.h" 41 38 #include <wtf/PassOwnPtr.h> … … 64 61 return adoptPtr(new ColorInputType(element)); 65 62 } 66 67 ColorInputType::~ColorInputType()68 {69 closeColorChooserIfCurrentClient();70 }71 63 72 64 bool ColorInputType::isColorControl() const … … 101 93 } 102 94 103 Color ColorInputType::valueAsColor() const104 {105 return Color(element()->value());106 }107 108 void ColorInputType::setValueAsColor(const Color& color) const109 {110 element()->setValue(color.serialized(), true);111 }112 113 95 void ColorInputType::createShadowSubtree() 114 96 { … … 130 112 { 131 113 updateColorSwatch(); 132 if (ColorChooser::chooser()->client() == this) {133 if (Chrome* chrome = this->chrome())134 chrome->setSelectedColorInColorChooser(valueAsColor());135 }136 }137 138 void ColorInputType::handleClickEvent(MouseEvent* event)139 {140 if (event->isSimulated())141 return;142 143 if (element()->disabled() || element()->readOnly())144 return;145 146 if (Chrome* chrome = this->chrome()) {147 ColorChooser::chooser()->connectClient(this);148 chrome->openColorChooser(ColorChooser::chooser(), valueAsColor());149 }150 event->setDefaultHandled();151 }152 153 void ColorInputType::handleDOMActivateEvent(Event* event)154 {155 if (element()->disabled() || element()->readOnly() || !element()->renderer())156 return;157 158 if (!ScriptController::processingUserGesture())159 return;160 161 if (Chrome* chrome = this->chrome()) {162 ColorChooser::chooser()->connectClient(this);163 chrome->openColorChooser(ColorChooser::chooser(), valueAsColor());164 }165 event->setDefaultHandled();166 }167 168 void ColorInputType::detach()169 {170 closeColorChooserIfCurrentClient();171 }172 173 void ColorInputType::colorSelected(const Color& color)174 {175 if (element()->disabled() || element()->readOnly())176 return;177 setValueAsColor(color);178 }179 180 void ColorInputType::closeColorChooserIfClientIsInDocument(Document* document)181 {182 if (element()->document() == document)183 closeColorChooserIfCurrentClient();184 114 } 185 115 … … 200 130 } 201 131 202 void ColorInputType::closeColorChooserIfCurrentClient()203 {204 if (ColorChooser::chooser()->client() == this) {205 if (Chrome* chrome = this->chrome())206 chrome->closeColorChooser();207 }208 }209 210 132 } // namespace WebCore 211 133 -
trunk/Source/WebCore/html/ColorInputType.h
r92477 r92533 32 32 #define ColorInputType_h 33 33 34 #include "ColorChooser.h" 35 #include "InputType.h" 34 #include "BaseButtonInputType.h" 36 35 37 36 #if ENABLE(INPUT_COLOR) … … 39 38 namespace WebCore { 40 39 41 class ColorInputType : public InputType , private ColorChooserClient{40 class ColorInputType : public InputType { 42 41 public: 43 42 static PassOwnPtr<InputType> create(HTMLInputElement*); … … 45 44 private: 46 45 ColorInputType(HTMLInputElement* element) : InputType(element) { } 47 virtual ~ColorInputType();48 46 virtual bool isColorControl() const; 49 47 virtual const AtomicString& formControlType() const; … … 51 49 virtual String fallbackValue(); 52 50 virtual String sanitizeValue(const String&); 53 virtual Color valueAsColor() const;54 virtual void setValueAsColor(const Color&) const;55 51 virtual void createShadowSubtree(); 56 52 virtual void valueChanged(); 57 virtual void handleClickEvent(MouseEvent*);58 virtual void handleDOMActivateEvent(Event*);59 virtual void detach();60 61 // ColorChooserClient implementation.62 virtual void colorSelected(const Color&);63 virtual void closeColorChooserIfClientIsInDocument(Document*);64 53 65 54 void updateColorSwatch(); 66 55 HTMLElement* shadowColorSwatch() const; 67 void closeColorChooserIfCurrentClient() const;68 56 }; 69 57 -
trunk/Source/WebCore/html/FileInputType.cpp
r92477 r92533 34 34 #include "Icon.h" 35 35 #include "LocalizedStrings.h" 36 #include "Page.h" 36 37 #include "RenderFileUploadControl.h" 37 38 #include "ScriptController.h" … … 333 334 } 334 335 336 Chrome* FileInputType::chrome() const 337 { 338 if (Page* page = element()->document()->page()) 339 return page->chrome(); 340 return 0; 341 } 342 335 343 void FileInputType::receiveDroppedFiles(const Vector<String>& paths) 336 344 { -
trunk/Source/WebCore/html/FileInputType.h
r92477 r92533 40 40 namespace WebCore { 41 41 42 class Chrome; 42 43 class FileList; 43 44 … … 77 78 #endif 78 79 void requestIcon(const Vector<String>&); 80 Chrome* chrome() const; 79 81 80 82 RefPtr<FileList> m_fileList; -
trunk/Source/WebCore/html/HTMLInputElement.cpp
r92480 r92533 884 884 HTMLTextFormControlElement::detach(); 885 885 setFormControlValueMatchesRenderer(false); 886 m_inputType->detach();887 886 } 888 887 -
trunk/Source/WebCore/html/InputType.cpp
r92477 r92533 49 49 #include "MonthInputType.h" 50 50 #include "NumberInputType.h" 51 #include "Page.h"52 51 #include "PasswordInputType.h" 53 52 #include "RadioInputType.h" … … 397 396 } 398 397 399 Chrome* InputType::chrome() const400 {401 if (Page* page = element()->document()->page())402 return page->chrome();403 return 0;404 }405 406 398 bool InputType::canSetStringValue() const 407 399 { … … 429 421 430 422 void InputType::attach() 431 {432 }433 434 void InputType::detach()435 423 { 436 424 } -
trunk/Source/WebCore/html/InputType.h
r92477 r92533 42 42 43 43 class BeforeTextInsertedEvent; 44 class Chrome;45 class Color;46 44 class DateComponents; 47 45 class Event; … … 94 92 #if ENABLE(INPUT_COLOR) 95 93 virtual bool isColorControl() const; 96 #endif 94 #endif // ENABLE(INPUT_COLOR) 97 95 virtual bool isCheckbox() const; 98 96 virtual bool isEmailField() const; … … 208 206 virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) const; 209 207 virtual void attach(); 210 virtual void detach();211 208 virtual void minOrMaxAttributeChanged(); 212 209 virtual void altAttributeChanged(); … … 264 261 // We can't make this a static const data member because VC++ doesn't like it. 265 262 static double defaultStepBase() { return 0.0; } 266 Chrome* chrome() const;267 263 268 264 private: -
trunk/Source/WebCore/loader/EmptyClients.h
r92492 r92533 196 196 #endif 197 197 198 #if ENABLE(INPUT_COLOR)199 void openColorChooser(ColorChooser*, const Color&) { }200 void closeColorChooser() { }201 void setSelectedColorInColorChooser(const Color&) { }202 #endif203 204 198 virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { } 205 199 virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*) { } -
trunk/Source/WebCore/loader/FrameLoader.cpp
r92477 r92533 101 101 #include <wtf/text/WTFString.h> 102 102 103 #if ENABLE(INPUT_COLOR)104 #include "ColorChooser.h"105 #endif106 107 103 #if ENABLE(SHARED_WORKERS) 108 104 #include "SharedWorkerRepository.h" … … 1820 1816 if (m_frame->view()) 1821 1817 m_frame->view()->scrollAnimator()->cancelAnimations(); 1822 1823 #if ENABLE(INPUT_COLOR)1824 if (m_frame->document())1825 ColorChooser::chooser()->closeColorChooserIfClientIsInDocument(m_frame->document());1826 #endif1827 1818 1828 1819 m_client->setCopiesOnScroll(); -
trunk/Source/WebCore/page/Chrome.cpp
r92477 r92533 53 53 #endif 54 54 55 #if ENABLE(INPUT_COLOR)56 #include "ColorChooser.h"57 #endif58 59 55 namespace WebCore { 60 56 … … 472 468 #endif 473 469 474 #if ENABLE(INPUT_COLOR)475 void Chrome::openColorChooser(ColorChooser* colorChooser, const Color& initialColor)476 {477 m_client->openColorChooser(colorChooser, initialColor);478 }479 480 void Chrome::closeColorChooser()481 {482 m_client->closeColorChooser();483 }484 485 void Chrome::setSelectedColorInColorChooser(const Color& color)486 {487 m_client->setSelectedColorInColorChooser(color);488 }489 #endif490 491 470 void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser) 492 471 { -
trunk/Source/WebCore/page/Chrome.h
r92477 r92533 37 37 38 38 class ChromeClient; 39 #if ENABLE(INPUT_COLOR)40 class ColorChooser;41 #endif42 39 class FileChooser; 43 40 class FileIconLoader; … … 158 155 void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*); 159 156 160 #if ENABLE(INPUT_COLOR)161 void openColorChooser(ColorChooser*, const Color&);162 void closeColorChooser();163 void setSelectedColorInColorChooser(const Color&);164 #endif165 166 157 void runOpenPanel(Frame*, PassRefPtr<FileChooser>); 167 158 void loadIconForFiles(const Vector<String>&, FileIconLoader*); -
trunk/Source/WebCore/page/ChromeClient.h
r92477 r92533 72 72 #endif 73 73 74 #if ENABLE(INPUT_COLOR)75 class ColorChooser;76 #endif77 78 74 #if ENABLE(NOTIFICATIONS) 79 75 class NotificationPresenter; … … 235 231 virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) = 0; 236 232 virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) = 0; 237 238 #if ENABLE(INPUT_COLOR)239 virtual void openColorChooser(ColorChooser*, const Color&) = 0;240 virtual void closeColorChooser() = 0;241 virtual void setSelectedColorInColorChooser(const Color&) = 0;242 #endif243 233 244 234 virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
Note: See TracChangeset
for help on using the changeset viewer.