RS by Geoff.

        Renamed menuListIsDetaching to disconnectMenuList,
        uploadControlDetaching to disconnectUploadControl, and fileChooserDetachingSoon to disconnectFileChooser.
        These names match similar methods in WebCore a little better.

        * platform/FileChooser.h:
        * platform/PopupMenu.h: (WebCore::PopupMenu::disconnectMenuList):
        * platform/mac/FileChooserMac.mm: (-[OpenPanelController disconnectFileChooser]):
        (WebCore::FileChooser::disconnectUploadControl):
        * platform/win/TemporaryLinkStubs.cpp: (FileChooser::disconnectUploadControl):
        * rendering/RenderFileUploadControl.cpp: (WebCore::RenderFileUploadControl::~RenderFileUploadControl):
        * rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::~RenderMenuList):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17024 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 735303078c442eb19d2be2a5db2b24352a9f2ef9..27a37a52ae354f5e7ebab8fc8d3e54aef357c286 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2006-10-12  Adele Peterson  <adele@apple.com>
+
+        RS by Geoff.
+
+        Renamed menuListIsDetaching to disconnectMenuList, 
+        uploadControlDetaching to disconnectUploadControl, and fileChooserDetachingSoon to disconnectFileChooser.  
+        These names match similar methods in WebCore a little better.
+
+        * platform/FileChooser.h:
+        * platform/PopupMenu.h: (WebCore::PopupMenu::disconnectMenuList):
+        * platform/mac/FileChooserMac.mm: (-[OpenPanelController disconnectFileChooser]):
+        (WebCore::FileChooser::disconnectUploadControl):
+        * platform/win/TemporaryLinkStubs.cpp: (FileChooser::disconnectUploadControl):
+        * rendering/RenderFileUploadControl.cpp: (WebCore::RenderFileUploadControl::~RenderFileUploadControl):
+        * rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::~RenderMenuList):
+
 2006-10-12  Adele Peterson  <adele@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/platform/FileChooser.h b/WebCore/platform/FileChooser.h
index 0124ba7ee3f73434d1eaac6c71533f67822836fd..457419712c4e0b7ad922cbfc5a91978e5db94c7c 100644 (file)
--- a/WebCore/platform/FileChooser.h
+++ b/WebCore/platform/FileChooser.h
@@ -53,7 +53,7 @@ public:
     RenderFileUploadControl* uploadControl() const { return m_uploadControl; }
     Document* document() { return m_document; }
     
-    void uploadControlDetaching();
+    void disconnectUploadControl();
 
     void chooseFile(const String& filename);
     

diff --git a/WebCore/platform/PopupMenu.h b/WebCore/platform/PopupMenu.h
index fde0de29bef3c24ab7973b9d3f76ea1ea9d47bb4..1dc88d1e12df717aed4b34b2082f068b7f4a6cd5 100644 (file)
--- a/WebCore/platform/PopupMenu.h
+++ b/WebCore/platform/PopupMenu.h
@@ -47,7 +47,7 @@ public:
     static PassRefPtr<PopupMenu> create(RenderMenuList* menuList);
     ~PopupMenu();
     
-    void menuListIsDetaching() { m_menuList = 0; }
+    void disconnectMenuList() { m_menuList = 0; }
 
     void clear();
     void populate();

diff --git a/WebCore/platform/mac/FileChooserMac.mm b/WebCore/platform/mac/FileChooserMac.mm
index d8540235ba088c2322282630d6e3b6a045284ca9..854baf66e348236052a553db5326210372ea3bf2 100644 (file)
--- a/WebCore/platform/mac/FileChooserMac.mm
+++ b/WebCore/platform/mac/FileChooserMac.mm
@@ -38,7 +38,7 @@ using namespace WebCore;
     WebCoreFrameBridge *_bridge;
 }
 - (id)initWithFileChooser:(FileChooser *)fileChooser;
-- (void)fileChooserDetachingSoon;
+- (void)disconnectFileChooser;
 - (void)beginSheet;
 @end
 
@@ -54,7 +54,7 @@ using namespace WebCore;
     return self;
 }
 
-- (void)fileChooserDetachingSoon
+- (void)disconnectFileChooser
 {
     _fileChooser = 0;
 }
@@ -123,10 +123,10 @@ String FileChooser::basenameForWidth(int width) const
             toWidth:width withFont:m_uploadControl->style()->font().primaryFont()->getNSFont()];
 }
 
-void FileChooser::uploadControlDetaching()
+void FileChooser::disconnectUploadControl()
 {
     if (m_controller)
-        [m_controller fileChooserDetachingSoon];
+        [m_controller disconnectFileChooser];
 }
 
 void FileChooser::chooseFile(const String& filename)

diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp
index 42f5ab7748d7427315229973a09d2c4c5d289b7c..de57b78a3a00443a51cd515419f089ce0f365e6d 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -134,7 +134,7 @@ FileChooser::~FileChooser() { notImplemented(); }
 PassRefPtr<FileChooser> FileChooser::create(Document*, RenderFileUploadControl*) { notImplemented(); return 0; }
 void FileChooser::openFileChooser() { notImplemented(); }
 String FileChooser::basenameForWidth(int width) const { notImplemented(); return String(); }
-void FileChooser::uploadControlDetaching() { notImplemented(); }
+void FileChooser::disconnectUploadControl() { notImplemented(); }
 void FileChooser::chooseFile(const String& filename) { notImplemented(); }
 
 Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; }

diff --git a/WebCore/rendering/RenderFileUploadControl.cpp b/WebCore/rendering/RenderFileUploadControl.cpp
index 3b0bbf3c0525edf149344a30f554679132317804..6419147a767f10398ca66916c3145dd60f143529 100644 (file)
--- a/WebCore/rendering/RenderFileUploadControl.cpp
+++ b/WebCore/rendering/RenderFileUploadControl.cpp
@@ -73,7 +73,7 @@ RenderFileUploadControl::~RenderFileUploadControl()
     if (m_button)
         m_button->detach();
     if (m_fileChooser) {
-        m_fileChooser->uploadControlDetaching();
+        m_fileChooser->disconnectUploadControl();
     }
 }
 

diff --git a/WebCore/rendering/RenderMenuList.cpp b/WebCore/rendering/RenderMenuList.cpp
index 83df75febe96f9fa6676378a0c7c169670bef993..42a3cfb52e809100f9b63d9f5c077a1b5a04849a 100644 (file)
--- a/WebCore/rendering/RenderMenuList.cpp
+++ b/WebCore/rendering/RenderMenuList.cpp
@@ -55,7 +55,7 @@ RenderMenuList::RenderMenuList(HTMLSelectElement* element)
 RenderMenuList::~RenderMenuList()
 {
     if (m_popup)
-        m_popup->menuListIsDetaching();
+        m_popup->disconnectMenuList();
     m_popup = 0;
 }