[Chromium] Rename some init* functions to initialize*
authortkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Dec 2012 05:40:52 +0000 (05:40 +0000)
committertkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Dec 2012 05:40:52 +0000 (05:40 +0000)
https://bugs.webkit.org/show_bug.cgi?id=104335

Reviewed by Kentaro Hara.

We should use full words.
http://www.webkit.org/coding/coding-style.html#names-full-words

* src/WebHelperPluginImpl.cpp:
(WebKit::WebHelperPluginImpl::initialize): Renamed from init.
(WebKit::WebHelperPluginImpl::initializePage): Renamed from initPage.
* src/WebHelperPluginImpl.h:
(WebHelperPluginImpl):
* src/WebPagePopupImpl.cpp:
(WebKit::WebPagePopupImpl::initialize): Renamed from init.
(WebKit::WebPagePopupImpl::initializePage): Renamed from initPage.
* src/WebPagePopupImpl.h:
(WebPagePopupImpl):
* src/WebPopupMenuImpl.cpp:
(WebKit::WebPopupMenuImpl::initialize): Renamed from init.
* src/WebPopupMenuImpl.h:

* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::openPagePopup): Follow the renamings.
(WebKit::WebViewImpl::createHelperPlugin): Ditto.
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::popupOpened): Ditto.

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

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/ChromeClientImpl.cpp
Source/WebKit/chromium/src/WebHelperPluginImpl.cpp
Source/WebKit/chromium/src/WebHelperPluginImpl.h
Source/WebKit/chromium/src/WebPagePopupImpl.cpp
Source/WebKit/chromium/src/WebPagePopupImpl.h
Source/WebKit/chromium/src/WebPopupMenuImpl.cpp
Source/WebKit/chromium/src/WebPopupMenuImpl.h
Source/WebKit/chromium/src/WebViewImpl.cpp

index c9ecaf5..327e3a8 100644 (file)
@@ -1,3 +1,33 @@
+2012-12-06  Kent Tamura  <tkent@chromium.org>
+
+        [Chromium] Rename some init* functions to initialize*
+        https://bugs.webkit.org/show_bug.cgi?id=104335
+
+        Reviewed by Kentaro Hara.
+
+        We should use full words.
+        http://www.webkit.org/coding/coding-style.html#names-full-words
+
+        * src/WebHelperPluginImpl.cpp:
+        (WebKit::WebHelperPluginImpl::initialize): Renamed from init.
+        (WebKit::WebHelperPluginImpl::initializePage): Renamed from initPage.
+        * src/WebHelperPluginImpl.h:
+        (WebHelperPluginImpl):
+        * src/WebPagePopupImpl.cpp:
+        (WebKit::WebPagePopupImpl::initialize): Renamed from init.
+        (WebKit::WebPagePopupImpl::initializePage): Renamed from initPage.
+        * src/WebPagePopupImpl.h:
+        (WebPagePopupImpl):
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::initialize): Renamed from init.
+        * src/WebPopupMenuImpl.h:
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::openPagePopup): Follow the renamings.
+        (WebKit::WebViewImpl::createHelperPlugin): Ditto.
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::popupOpened): Ditto.
+
 2012-12-06  Rick Byers  <rbyers@chromium.org>
 
         CSS cursor property should support webkit-image-set
index 4215ad7..56e17f7 100644 (file)
@@ -805,7 +805,7 @@ void ChromeClientImpl::popupOpened(PopupContainer* popupContainer,
         // transparent to the WebView.
         m_webView->popupOpened(popupContainer);
     }
-    static_cast<WebPopupMenuImpl*>(webwidget)->init(popupContainer, bounds);
+    static_cast<WebPopupMenuImpl*>(webwidget)->initialize(popupContainer, bounds);
 }
 
 void ChromeClientImpl::popupClosed(WebCore::PopupContainer* popupContainer)
index c4aef3f..ae12f77 100644 (file)
@@ -115,12 +115,12 @@ WebHelperPluginImpl::~WebHelperPluginImpl()
     ASSERT(!m_page);
 }
 
-bool WebHelperPluginImpl::init(WebViewImpl* webView, const String& pluginType)
+bool WebHelperPluginImpl::initialize(WebViewImpl* webView, const String& pluginType)
 {
     ASSERT(webView);
     m_webView = webView;
 
-    if (!initPage(webView, pluginType))
+    if (!initializePage(webView, pluginType))
         return false;
     m_widgetClient->show(WebNavigationPolicy());
     setFocus(true);
@@ -180,7 +180,7 @@ WebPlugin* WebHelperPluginImpl::getPlugin()
     return plugin;
 }
 
-bool WebHelperPluginImpl::initPage(WebKit::WebViewImpl* webView, const String& pluginType)
+bool WebHelperPluginImpl::initializePage(WebKit::WebViewImpl* webView, const String& pluginType)
 {
     Page::PageClients pageClients;
     fillWithEmptyClients(pageClients);
index f9b5aae..c6a721c 100644 (file)
@@ -54,7 +54,7 @@ class WebHelperPluginImpl : public WebHelperPlugin,
 
 public:
     virtual ~WebHelperPluginImpl();
-    bool init(WebViewImpl*, const String& pluginType);
+    bool initialize(WebViewImpl*, const String& pluginType);
     void closeHelperPlugin();
 
     // WebHelperPlugin methods:
@@ -63,7 +63,7 @@ public:
 
 private:
     explicit WebHelperPluginImpl(WebWidgetClient*);
-    bool initPage(WebKit::WebViewImpl*, const String& pluginType);
+    bool initializePage(WebKit::WebViewImpl*, const String& pluginType);
     void destoryPage();
 
     // WebWidget methods:
index 61aee41..0002b5d 100644 (file)
@@ -172,7 +172,7 @@ WebPagePopupImpl::~WebPagePopupImpl()
     ASSERT(!m_page);
 }
 
-bool WebPagePopupImpl::init(WebViewImpl* webView, PagePopupClient* popupClient, const IntRect&)
+bool WebPagePopupImpl::initialize(WebViewImpl* webView, PagePopupClient* popupClient, const IntRect&)
 {
     ASSERT(webView);
     ASSERT(popupClient);
@@ -181,7 +181,7 @@ bool WebPagePopupImpl::init(WebViewImpl* webView, PagePopupClient* popupClient,
 
     resize(m_popupClient->contentSize());
 
-    if (!initPage())
+    if (!initializePage())
         return false;
     m_widgetClient->show(WebNavigationPolicy());
     setFocus(true);
@@ -189,7 +189,7 @@ bool WebPagePopupImpl::init(WebViewImpl* webView, PagePopupClient* popupClient,
     return true;
 }
 
-bool WebPagePopupImpl::initPage()
+bool WebPagePopupImpl::initializePage()
 {
     Page::PageClients pageClients;
     fillWithEmptyClients(pageClients);
index 2576707..fb97c7d 100644 (file)
@@ -59,7 +59,7 @@ class WebPagePopupImpl : public WebPagePopup,
 
 public:
     virtual ~WebPagePopupImpl();
-    bool init(WebViewImpl*, WebCore::PagePopupClient*, const WebCore::IntRect& originBoundsInRootView);
+    bool initialize(WebViewImpl*, WebCore::PagePopupClient*, const WebCore::IntRect& originBoundsInRootView);
     bool handleKeyEvent(const WebCore::PlatformKeyboardEvent&);
     void closePopup();
     WebWidgetClient* widgetClient() const { return m_widgetClient; }
@@ -86,7 +86,7 @@ private:
 #endif
 
     explicit WebPagePopupImpl(WebWidgetClient*);
-    bool initPage();
+    bool initializePage();
     void destoryPage();
 
     WebWidgetClient* m_widgetClient;
index 656a2d6..108204f 100644 (file)
@@ -83,7 +83,7 @@ WebPopupMenuImpl::~WebPopupMenuImpl()
         m_widget->setClient(0);
 }
 
-void WebPopupMenuImpl::init(FramelessScrollView* widget, const WebRect& bounds)
+void WebPopupMenuImpl::initialize(FramelessScrollView* widget, const WebRect& bounds)
 {
     m_widget = widget;
     m_widget->setClient(this);
index 3c038ac..c9f08c4 100644 (file)
@@ -93,7 +93,7 @@ public:
     virtual bool isAcceleratedCompositingActive() const OVERRIDE { return false; }
 
     // WebPopupMenuImpl
-    void init(WebCore::FramelessScrollView* widget, const WebRect& bounds);
+    void initialize(WebCore::FramelessScrollView* widget, const WebRect& bounds);
 
     WebWidgetClient* client() { return m_client; }
 
index fff60d1..93d9a25 100644 (file)
@@ -1466,7 +1466,7 @@ PagePopup* WebViewImpl::openPagePopup(PagePopupClient* client, const IntRect& or
     WebWidget* popupWidget = m_client->createPopupMenu(WebPopupTypePage);
     ASSERT(popupWidget);
     m_pagePopup = static_cast<WebPagePopupImpl*>(popupWidget);
-    if (!m_pagePopup->init(this, client, originBoundsInRootView)) {
+    if (!m_pagePopup->initialize(this, client, originBoundsInRootView)) {
         m_pagePopup->closePopup();
         m_pagePopup = 0;
     }
@@ -1499,7 +1499,7 @@ WebHelperPluginImpl* WebViewImpl::createHelperPlugin(const String& pluginType)
     ASSERT(popupWidget);
     WebHelperPluginImpl* helperPlugin = static_cast<WebHelperPluginImpl*>(popupWidget);
 
-    if (!helperPlugin->init(this, pluginType)) {
+    if (!helperPlugin->initialize(this, pluginType)) {
         helperPlugin->closeHelperPlugin();
         helperPlugin = 0;
     }