Changeset 92533 in webkit


Ignore:
Timestamp:
Aug 5, 2011 6:06:43 PM (13 years ago)
Author:
tkent@chromium.org
Message:

Unreviewed, rolling out r92477.
​http://trac.webkit.org/changeset/92477
​https://bugs.webkit.org/show_bug.cgi?id=62619

Layering violation. We should not use WebCore/dom/ in
WebCore/platform/.

  • WebCore.exp.in:
  • WebCore.xcodeproj/project.pbxproj:
  • html/ColorInputType.cpp:

(WebCore::ColorInputType::valueChanged):

  • html/ColorInputType.h:
  • html/FileInputType.cpp:

(WebCore::FileInputType::chrome):

  • html/FileInputType.h:
  • html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::detach):

  • html/InputType.cpp:
  • html/InputType.h:
  • loader/EmptyClients.h:
  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::transitionToCommitted):

  • page/Chrome.cpp:
  • page/Chrome.h:
  • page/ChromeClient.h:
  • platform/ColorChooser.cpp: Removed.
  • platform/ColorChooser.h: Removed.
Location:
trunk/Source/WebCore
Files:
2 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r92532 r92533  
     12011-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
    1312011-08-05  Darin Adler  <darin@apple.com>
    232

  • trunk/Source/WebCore/WebCore.exp.in

    r92492 r92533  
    19421942__ZN7WebCore14ResourceHandle12releaseProxyEv
    19431943#endif
    1944 
    1945 #if ENABLE(INPUT_COLOR)
    1946 __ZN7WebCore12ColorChooser7chooserEv
    1947 __ZNK7WebCore12ColorChooser13colorSelectedERKNS_5ColorE
    1948 #endif

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r92492 r92533  
    53305330                C105DA620F3AA68F001DD44F /* TextEncodingDetectorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */; };
    53315331                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, ); }; };
    53345332                C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50B561412119D23008B46E0 /* GroupSettings.cpp */; };
    53355333                C50B561712119D23008B46E0 /* GroupSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C50B561512119D23008B46E0 /* GroupSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1203612034                C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingDetectorICU.cpp; sourceTree = "<group>"; };
    1203712035                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>"; };
    1204012036                C50B561412119D23008B46E0 /* GroupSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GroupSettings.cpp; sourceTree = "<group>"; };
    1204112037                C50B561512119D23008B46E0 /* GroupSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupSettings.h; sourceTree = "<group>"; };
    … …  
    1902519021                                89D08D9E12228451001241DF /* AsyncFileSystemCallbacks.h */,
    1902619022                                51E1ECB10C91C55600DC255B /* AutodrainedPool.h */,
    19027                                 C330A22013EC196B0000B45B /* ColorChooser.cpp */,
    19028                                 C330A22113EC196B0000B45B /* ColorChooser.h */,
    1902919023                                BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */,
    1903019024                                41D015C90F4B5C71004A662F /* ContentType.cpp */,
    … …  
    2052320517                                93C442000F813AE100C1A634 /* CollectionType.h in Headers */,
    2052420518                                B27535670B053814002CE64F /* Color.h in Headers */,
    20525                                 C330A22313EC196B0000B45B /* ColorChooser.h in Headers */,
    2052620519                                B22279630D00BF220071B782 /* ColorDistance.h in Headers */,
    2052720520                                F55B3DB41251F12D003EF269 /* ColorInputType.h in Headers */,
    … …  
    2380923802                                B27535660B053814002CE64F /* Color.cpp in Sources */,
    2381023803                                0FCF33240F2B9715004B6795 /* ColorCG.cpp in Sources */,
    23811                                 C330A22213EC196B0000B45B /* ColorChooser.cpp in Sources */,
    2381223804                                1ABA76C911D20E47004C201C /* ColorData.cpp in Sources */,
    2381323805                                B22279620D00BF220071B782 /* ColorDistance.cpp in Sources */,

  • trunk/Source/WebCore/html/ColorInputType.cpp

    r92477 r92533  
    3232#include "ColorInputType.h"
    3333
    34 #include "Chrome.h"
    3534#include "Color.h"
    3635#include "HTMLDivElement.h"
    3736#include "HTMLInputElement.h"
    38 #include "MouseEvent.h"
    39 #include "ScriptController.h"
    4037#include "ShadowRoot.h"
    4138#include <wtf/PassOwnPtr.h>
    … …  
    6461    return adoptPtr(new ColorInputType(element));
    6562}
    66 
    67 ColorInputType::~ColorInputType()
    68 {
    69     closeColorChooserIfCurrentClient();
    70 }   
    7163
    7264bool ColorInputType::isColorControl() const
    … …  
    10193}
    10294
    103 Color ColorInputType::valueAsColor() const
    104 {
    105     return Color(element()->value());
    106 }
    107 
    108 void ColorInputType::setValueAsColor(const Color& color) const
    109 {
    110     element()->setValue(color.serialized(), true);
    111 }
    112 
    11395void ColorInputType::createShadowSubtree()
    11496{
    … …  
    130112{
    131113    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();
    184114}
    185115
    … …  
    200130}
    201131
    202 void ColorInputType::closeColorChooserIfCurrentClient()
    203 {
    204     if (ColorChooser::chooser()->client() == this) {
    205         if (Chrome* chrome = this->chrome())
    206             chrome->closeColorChooser();
    207     }
    208 }
    209 
    210132} // namespace WebCore
    211133

  • trunk/Source/WebCore/html/ColorInputType.h

    r92477 r92533  
    3232#define ColorInputType_h
    3333
    34 #include "ColorChooser.h"
    35 #include "InputType.h"
     34#include "BaseButtonInputType.h"
    3635
    3736#if ENABLE(INPUT_COLOR)
    … …  
    3938namespace WebCore {
    4039
    41 class ColorInputType : public InputType, private ColorChooserClient {
     40class ColorInputType : public InputType {
    4241public:
    4342    static PassOwnPtr<InputType> create(HTMLInputElement*);
    … …  
    4544private:
    4645    ColorInputType(HTMLInputElement* element) : InputType(element) { }
    47     virtual ~ColorInputType();
    4846    virtual bool isColorControl() const;
    4947    virtual const AtomicString& formControlType() const;
    … …  
    5149    virtual String fallbackValue();
    5250    virtual String sanitizeValue(const String&);
    53     virtual Color valueAsColor() const;
    54     virtual void setValueAsColor(const Color&) const;
    5551    virtual void createShadowSubtree();
    5652    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*);
    6453
    6554    void updateColorSwatch();
    6655    HTMLElement* shadowColorSwatch() const;
    67     void closeColorChooserIfCurrentClient() const;
    6856};
    6957

  • trunk/Source/WebCore/html/FileInputType.cpp

    r92477 r92533  
    3434#include "Icon.h"
    3535#include "LocalizedStrings.h"
     36#include "Page.h"
    3637#include "RenderFileUploadControl.h"
    3738#include "ScriptController.h"
    … …  
    333334}
    334335
     336Chrome* FileInputType::chrome() const
     337{
     338    if (Page* page = element()->document()->page())
     339        return page->chrome();
     340    return 0;
     341}
     342
    335343void FileInputType::receiveDroppedFiles(const Vector<String>& paths)
    336344{

  • trunk/Source/WebCore/html/FileInputType.h

    r92477 r92533  
    4040namespace WebCore {
    4141
     42class Chrome;
    4243class FileList;
    4344
    … …  
    7778#endif
    7879    void requestIcon(const Vector<String>&);
     80    Chrome* chrome() const;
    7981
    8082    RefPtr<FileList> m_fileList;

  • trunk/Source/WebCore/html/HTMLInputElement.cpp

    r92480 r92533  
    884884    HTMLTextFormControlElement::detach();
    885885    setFormControlValueMatchesRenderer(false);
    886     m_inputType->detach();
    887886}
    888887

  • trunk/Source/WebCore/html/InputType.cpp

    r92477 r92533  
    4949#include "MonthInputType.h"
    5050#include "NumberInputType.h"
    51 #include "Page.h"
    5251#include "PasswordInputType.h"
    5352#include "RadioInputType.h"
    … …  
    397396}
    398397
    399 Chrome* InputType::chrome() const
    400 {
    401     if (Page* page = element()->document()->page())
    402         return page->chrome();
    403     return 0;
    404 }
    405 
    406398bool InputType::canSetStringValue() const
    407399{
    … …  
    429421
    430422void InputType::attach()
    431 {
    432 }
    433 
    434 void InputType::detach()
    435423{
    436424}

  • trunk/Source/WebCore/html/InputType.h

    r92477 r92533  
    4242
    4343class BeforeTextInsertedEvent;
    44 class Chrome;
    45 class Color;
    4644class DateComponents;
    4745class Event;
    … …  
    9492#if ENABLE(INPUT_COLOR)
    9593    virtual bool isColorControl() const;
    96 #endif
     94#endif // ENABLE(INPUT_COLOR)
    9795    virtual bool isCheckbox() const;
    9896    virtual bool isEmailField() const;
    … …  
    208206    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) const;
    209207    virtual void attach();
    210     virtual void detach();
    211208    virtual void minOrMaxAttributeChanged();
    212209    virtual void altAttributeChanged();
    … …  
    264261    // We can't make this a static const data member because VC++ doesn't like it.
    265262    static double defaultStepBase() { return 0.0; }
    266     Chrome* chrome() const;
    267263
    268264private:

  • trunk/Source/WebCore/loader/EmptyClients.h

    r92492 r92533  
    196196#endif
    197197
    198 #if ENABLE(INPUT_COLOR)
    199     void openColorChooser(ColorChooser*, const Color&) { }
    200     void closeColorChooser() { }
    201     void setSelectedColorInColorChooser(const Color&) { }
    202 #endif
    203 
    204198    virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) { }
    205199    virtual void loadIconForFiles(const Vector<String>&, FileIconLoader*) { }

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r92477 r92533  
    101101#include <wtf/text/WTFString.h>
    102102
    103 #if ENABLE(INPUT_COLOR)
    104 #include "ColorChooser.h"
    105 #endif
    106 
    107103#if ENABLE(SHARED_WORKERS)
    108104#include "SharedWorkerRepository.h"
    … …  
    18201816    if (m_frame->view())
    18211817        m_frame->view()->scrollAnimator()->cancelAnimations();
    1822 
    1823 #if ENABLE(INPUT_COLOR)
    1824     if (m_frame->document())
    1825         ColorChooser::chooser()->closeColorChooserIfClientIsInDocument(m_frame->document());
    1826 #endif
    18271818
    18281819    m_client->setCopiesOnScroll();

  • trunk/Source/WebCore/page/Chrome.cpp

    r92477 r92533  
    5353#endif
    5454
    55 #if ENABLE(INPUT_COLOR)
    56 #include "ColorChooser.h"
    57 #endif
    58 
    5955namespace WebCore {
    6056
    … …  
    472468#endif
    473469
    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 #endif
    490 
    491470void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
    492471{

  • trunk/Source/WebCore/page/Chrome.h

    r92477 r92533  
    3737
    3838    class ChromeClient;
    39 #if ENABLE(INPUT_COLOR)
    40     class ColorChooser;
    41 #endif
    4239    class FileChooser;
    4340    class FileIconLoader;
    … …  
    158155        void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*);
    159156
    160 #if ENABLE(INPUT_COLOR)
    161         void openColorChooser(ColorChooser*, const Color&);
    162         void closeColorChooser();
    163         void setSelectedColorInColorChooser(const Color&);
    164 #endif
    165 
    166157        void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
    167158        void loadIconForFiles(const Vector<String>&, FileIconLoader*);

  • trunk/Source/WebCore/page/ChromeClient.h

    r92477 r92533  
    7272#endif
    7373
    74 #if ENABLE(INPUT_COLOR)
    75     class ColorChooser;
    76 #endif
    77 
    7874#if ENABLE(NOTIFICATIONS)
    7975    class NotificationPresenter;
    … …  
    235231        virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) = 0;
    236232        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 #endif
    243233
    244234        virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
Note: See TracChangeset for help on using the changeset viewer.