Changeset 24652 in webkit


Ignore:
Timestamp:
Jul 26, 2007 2:35:56 PM (17 years ago)
Author:
tristan
Message:

Reviewed by Adele Peterson.


<rdar://problem/5359921> WebCore should maintain a dirty flag for confirmation on unsaved changes

  • bindings/objc/DOMHTML.mm: (-[DOMHTMLInputElement _isUserEdited]): (-[DOMHTMLTextAreaElement _isUserEdited]): Renamed _isEdited to _isUserEdited since the functionality is now different


  • bindings/objc/DOMPrivate.h: Renamed _isEdited to _isUserEdited.


  • rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::RenderTextControl): Defaulted m_userEdited to false


(WebCore::RenderTextControl::updateFromElement):
Set m_userEdited to false, since the change wasn't triggered first by an edit


(WebCore::RenderTextControl::subtreeHasChanged):
Set m_userEdited to true, since it has been touched by the user


  • rendering/RenderTextControl.h: (WebCore::RenderTextControl::isUserEdited): (WebCore::RenderTextControl::setUserEdited): Added two new methods to set/return the userEdited boolean value.
Location:
trunk/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r24651 r24652  
     12007-07-26  Tristan O'Tierney  <tristan@apple.com>
     2
     3        Reviewed by Adele Peterson.
     4       
     5        <rdar://problem/5359921> WebCore should maintain a dirty flag for confirmation on unsaved changes
     6
     7        * bindings/objc/DOMHTML.mm:
     8        (-[DOMHTMLInputElement _isUserEdited]):
     9        (-[DOMHTMLTextAreaElement _isUserEdited]):
     10        Renamed _isEdited to _isUserEdited since the functionality is now different
     11       
     12        * bindings/objc/DOMPrivate.h:
     13        Renamed _isEdited to _isUserEdited.
     14       
     15        * rendering/RenderTextControl.cpp:
     16        (WebCore::RenderTextControl::RenderTextControl):
     17        Defaulted m_userEdited to false
     18       
     19        (WebCore::RenderTextControl::updateFromElement):
     20        Set m_userEdited to false, since the change wasn't triggered first by an edit
     21       
     22        (WebCore::RenderTextControl::subtreeHasChanged):
     23        Set m_userEdited to true, since it has been touched by the user
     24       
     25        * rendering/RenderTextControl.h:
     26        (WebCore::RenderTextControl::isUserEdited):
     27        (WebCore::RenderTextControl::setUserEdited):
     28        Added two new methods to set/return the userEdited boolean value.
     29       
    1302007-07-26  Geoffrey Garen  <ggaren@apple.com>
    231

  • trunk/WebCore/bindings/objc/DOMHTML.mm

    r24415 r24652  
    167167
    168168@implementation DOMHTMLInputElement (FormPromptAdditions)
    169 - (BOOL)_isEdited
     169- (BOOL)_isUserEdited
    170170{
    171171    WebCore::RenderObject *renderer = [self _node]->renderer();
    172172    if (renderer && [self _isTextField])
    173         return renderer->isEdited();
     173        return static_cast<WebCore::RenderTextControl *>(renderer)->isUserEdited();
    174174   
    175175    return NO;
    … …  
    178178
    179179@implementation DOMHTMLTextAreaElement (FormPromptAdditions)
    180 - (BOOL)_isEdited
     180- (BOOL)_isUserEdited
    181181{
    182182    WebCore::RenderObject *renderer = [self _node]->renderer();
    183183    if (renderer)
    184         return renderer->isEdited();
     184        return static_cast<WebCore::RenderTextControl *>(renderer)->isUserEdited();
    185185   
    186186    return NO;

  • trunk/WebCore/bindings/objc/DOMPrivate.h

    r23799 r24652  
    115115// or javascript
    116116@interface DOMHTMLInputElement (FormPromptAdditions)
    117 - (BOOL)_isEdited;
     117- (BOOL)_isUserEdited;
    118118@end
    119119
    120120@interface DOMHTMLTextAreaElement (FormPromptAdditions)
    121 - (BOOL)_isEdited;
     121- (BOOL)_isUserEdited;
    122122@end
    123123

  • trunk/WebCore/rendering/RenderTextControl.cpp

    r24481 r24652  
    5959    , m_multiLine(multiLine)
    6060    , m_placeholderVisible(false)
     61    , m_userEdited(false)
    6162    , m_searchPopup(0)
    6263    , m_searchPopupIsVisible(false)
    … …  
    385386                frame->editor()->clearUndoRedoOperations();
    386387            m_dirty = false;
     388            m_userEdited = false;
    387389        }
    388390        element->setValueMatchesRenderer();
    … …  
    503505    bool wasDirty = m_dirty;
    504506    m_dirty = true;
     507    m_userEdited = true;
    505508    HTMLGenericFormElement* element = static_cast<HTMLGenericFormElement*>(node());
    506509    if (m_multiLine) {

  • trunk/WebCore/rendering/RenderTextControl.h

    r24481 r24652  
    5757    virtual bool isTextField() const { return !m_multiLine; }
    5858    virtual bool isTextArea() const { return m_multiLine; }
     59   
     60    bool isUserEdited() const { return m_userEdited; }
     61    void setUserEdited(bool isUserEdited) { m_userEdited = isUserEdited; }
    5962
    6063    int selectionStart();
    … …  
    136139    bool m_multiLine;
    137140    bool m_placeholderVisible;
     141    bool m_userEdited;
    138142
    139143    RefPtr<SearchPopupMenu> m_searchPopup;
Note: See TracChangeset for help on using the changeset viewer.