Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (136920 => 136921)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-07 05:40:52 UTC (rev 136921)
@@ -1,3 +1,33 @@
+2012-12-06 Kent Tamura <tk...@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 <rby...@chromium.org>
CSS cursor property should support webkit-image-set
Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (136920 => 136921)
--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-12-07 05:40:52 UTC (rev 136921)
@@ -805,7 +805,7 @@
// 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)
Modified: trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp (136920 => 136921)
--- trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp 2012-12-07 05:40:52 UTC (rev 136921)
@@ -115,12 +115,12 @@
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 @@
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);
Modified: trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.h (136920 => 136921)
--- trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.h 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.h 2012-12-07 05:40:52 UTC (rev 136921)
@@ -54,7 +54,7 @@
public:
virtual ~WebHelperPluginImpl();
- bool init(WebViewImpl*, const String& pluginType);
+ bool initialize(WebViewImpl*, const String& pluginType);
void closeHelperPlugin();
// WebHelperPlugin methods:
@@ -63,7 +63,7 @@
private:
explicit WebHelperPluginImpl(WebWidgetClient*);
- bool initPage(WebKit::WebViewImpl*, const String& pluginType);
+ bool initializePage(WebKit::WebViewImpl*, const String& pluginType);
void destoryPage();
// WebWidget methods:
Modified: trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp (136920 => 136921)
--- trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp 2012-12-07 05:40:52 UTC (rev 136921)
@@ -172,7 +172,7 @@
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 @@
resize(m_popupClient->contentSize());
- if (!initPage())
+ if (!initializePage())
return false;
m_widgetClient->show(WebNavigationPolicy());
setFocus(true);
@@ -189,7 +189,7 @@
return true;
}
-bool WebPagePopupImpl::initPage()
+bool WebPagePopupImpl::initializePage()
{
Page::PageClients pageClients;
fillWithEmptyClients(pageClients);
Modified: trunk/Source/WebKit/chromium/src/WebPagePopupImpl.h (136920 => 136921)
--- trunk/Source/WebKit/chromium/src/WebPagePopupImpl.h 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/src/WebPagePopupImpl.h 2012-12-07 05:40:52 UTC (rev 136921)
@@ -59,7 +59,7 @@
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 @@
#endif
explicit WebPagePopupImpl(WebWidgetClient*);
- bool initPage();
+ bool initializePage();
void destoryPage();
WebWidgetClient* m_widgetClient;
Modified: trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp (136920 => 136921)
--- trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp 2012-12-07 05:40:52 UTC (rev 136921)
@@ -83,7 +83,7 @@
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);
Modified: trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h (136920 => 136921)
--- trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h 2012-12-07 05:40:52 UTC (rev 136921)
@@ -93,7 +93,7 @@
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; }
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (136920 => 136921)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-07 05:08:25 UTC (rev 136920)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-12-07 05:40:52 UTC (rev 136921)
@@ -1466,7 +1466,7 @@
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 @@
ASSERT(popupWidget);
WebHelperPluginImpl* helperPlugin = static_cast<WebHelperPluginImpl*>(popupWidget);
- if (!helperPlugin->init(this, pluginType)) {
+ if (!helperPlugin->initialize(this, pluginType)) {
helperPlugin->closeHelperPlugin();
helperPlugin = 0;
}
