Diff
Modified: trunk/Source/WebKit2/ChangeLog (159175 => 159176)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 02:47:43 UTC (rev 159176)
@@ -1,3 +1,40 @@
+2013-11-12 Nick Diego Yamane <[email protected]>
+
+ [GTK][EFL] More on renaming WebKit::APIObject to API::Object
+ https://bugs.webkit.org/show_bug.cgi?id=124255
+
+ Reviewed by Anders Carlsson.
+
+ In r159163 WebKit::APIObject has been renamed to API::Object.
+ This patch refactors the remaining files which were still
+ using WebKit::APIObject and WebKit::TypedAPIObject.
+
+ * Shared/WebBatteryStatus.h:
+ * Shared/WebNetworkInfo.h:
+ * UIProcess/API/C/WKGrammarDetail.cpp:
+ * UIProcess/API/gtk/WebKitContextMenuItem.cpp:
+ * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+ * UIProcess/API/gtk/WebKitWebViewGroup.cpp:
+ * UIProcess/CoordinatedGraphics/WebView.h:
+ * UIProcess/WebBatteryManagerProxy.cpp:
+ * UIProcess/WebBatteryManagerProxy.h:
+ * UIProcess/WebGrammarDetail.cpp:
+ * UIProcess/WebNetworkInfoManagerProxy.cpp:
+ * UIProcess/WebNetworkInfoManagerProxy.h:
+ * UIProcess/WebTextChecker.h:
+ * UIProcess/WebVibrationProxy.h:
+ * UIProcess/WebViewportAttributes.h:
+ * UIProcess/efl/EwkTouchEvent.h:
+ * UIProcess/efl/EwkTouchPoint.h:
+ * UIProcess/efl/WebPopupItemEfl.h:
+ * UIProcess/efl/WebUIPopupMenuClient.cpp:
+ * UIProcess/gtk/WebFullScreenClientGtk.h:
+ * UIProcess/gtk/WebInspectorClientGtk.h:
+ * UIProcess/soup/WebSoupRequestManagerProxy.cpp:
+ * UIProcess/soup/WebSoupRequestManagerProxy.h:
+ * WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp:
+ * WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp:
+
2013-11-12 Anders Carlsson <[email protected]>
fast/canvas/webgl/draw-arrays-out-of-bounds.html is flaky on Mavericks WK2 testers, fails about 20% of the time
Modified: trunk/Source/WebKit2/Shared/WebBatteryStatus.h (159175 => 159176)
--- trunk/Source/WebKit2/Shared/WebBatteryStatus.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/Shared/WebBatteryStatus.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -35,7 +35,7 @@
namespace WebKit {
-class WebBatteryStatus : public TypedAPIObject<APIObject::TypeBatteryStatus> {
+class WebBatteryStatus : public API::TypedObject<API::Object::TypeBatteryStatus> {
public:
struct Data {
void encode(CoreIPC::ArgumentEncoder&) const;
Modified: trunk/Source/WebKit2/Shared/WebNetworkInfo.h (159175 => 159176)
--- trunk/Source/WebKit2/Shared/WebNetworkInfo.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/Shared/WebNetworkInfo.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -35,7 +35,7 @@
namespace WebKit {
-class WebNetworkInfo : public TypedAPIObject<APIObject::TypeNetworkInfo> {
+class WebNetworkInfo : public API::TypedObject<API::Object::TypeNetworkInfo> {
public:
struct Data {
void encode(CoreIPC::ArgumentEncoder&) const;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -35,7 +35,7 @@
WKTypeID WKGrammarDetailGetTypeID()
{
- return toAPI(APIObject::TypeGrammarDetail);
+ return toAPI(API::Object::TypeGrammarDetail);
}
WKGrammarDetailRef WKGrammarDetailCreate(int location, int length, WKArrayRef guesses, WKStringRef userDescription)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -100,7 +100,7 @@
if (!subMenu.size())
return item;
- Vector<RefPtr<APIObject>> subMenuItems;
+ Vector<RefPtr<API::Object>> subMenuItems;
subMenuItems.reserveInitialCapacity(subMenu.size());
for (size_t i = 0; i < subMenu.size(); ++i)
subMenuItems.uncheckedAppend(WebContextMenuItem::create(subMenu[i]).get());
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -298,7 +298,7 @@
g_return_if_fail(files);
GRefPtr<GPtrArray> selectedFiles = adoptGRef(g_ptr_array_new_with_free_func(g_free));
- Vector<RefPtr<APIObject> > choosenFiles;
+ Vector<RefPtr<API::Object> > choosenFiles;
for (int i = 0; files[i]; i++) {
GRefPtr<GFile> filename = adoptGRef(g_file_new_for_path(files[i]));
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -231,7 +231,7 @@
if (!list)
return 0;
- Vector<RefPtr<APIObject> > entries;
+ Vector<RefPtr<API::Object> > entries;
while (*list) {
entries.append(WebString::createFromUTF8String(*list));
list++;
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -46,7 +46,7 @@
namespace WebKit {
-class WebView : public TypedAPIObject<APIObject::TypeView>, public PageClient {
+class WebView : public API::TypedObject<API::Object::TypeView>, public PageClient {
public:
virtual ~WebView();
Modified: trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -91,12 +91,12 @@
void WebBatteryManagerProxy::refWebContextSupplement()
{
- APIObject::ref();
+ API::Object::ref();
}
void WebBatteryManagerProxy::derefWebContextSupplement()
{
- APIObject::deref();
+ API::Object::deref();
}
void WebBatteryManagerProxy::startUpdating()
Modified: trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -39,7 +39,7 @@
class WebContext;
class WebBatteryStatus;
-class WebBatteryManagerProxy : public TypedAPIObject<APIObject::TypeBatteryManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebBatteryManagerProxy : public API::TypedObject<API::Object::TypeBatteryManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
public:
static const char* supplementName();
@@ -51,8 +51,8 @@
void providerDidChangeBatteryStatus(const WTF::AtomicString&, WebBatteryStatus*);
void providerUpdateBatteryStatus(WebBatteryStatus*);
- using APIObject::ref;
- using APIObject::deref;
+ using API::Object::ref;
+ using API::Object::deref;
private:
explicit WebBatteryManagerProxy(WebContext*);
Modified: trunk/Source/WebKit2/UIProcess/WebGrammarDetail.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/WebGrammarDetail.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/WebGrammarDetail.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -58,7 +58,7 @@
PassRefPtr<ImmutableArray> WebGrammarDetail::guesses() const
{
size_t numGuesses = m_grammarDetail.guesses.size();
- Vector<RefPtr<APIObject> > wkGuesses(numGuesses);
+ Vector<RefPtr<API::Object> > wkGuesses(numGuesses);
for (unsigned i = 0; i < numGuesses; ++i)
wkGuesses[i] = WebString::create(m_grammarDetail.guesses[i]);
return ImmutableArray::create(std::move(wkGuesses));
Modified: trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -83,12 +83,12 @@
void WebNetworkInfoManagerProxy::refWebContextSupplement()
{
- APIObject::ref();
+ API::Object::ref();
}
void WebNetworkInfoManagerProxy::derefWebContextSupplement()
{
- APIObject::deref();
+ API::Object::deref();
}
void WebNetworkInfoManagerProxy::startUpdating()
Modified: trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -39,7 +39,7 @@
class WebContext;
class WebNetworkInfo;
-class WebNetworkInfoManagerProxy : public TypedAPIObject<APIObject::TypeNetworkInfoManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebNetworkInfoManagerProxy : public API::TypedObject<API::Object::TypeNetworkInfoManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
public:
static const char* supplementName();
@@ -50,8 +50,8 @@
void providerDidChangeNetworkInformation(const WTF::AtomicString& eventType, WebNetworkInfo*);
- using APIObject::ref;
- using APIObject::deref;
+ using API::Object::ref;
+ using API::Object::deref;
private:
explicit WebNetworkInfoManagerProxy(WebContext*);
Modified: trunk/Source/WebKit2/UIProcess/WebTextChecker.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/WebTextChecker.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/WebTextChecker.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -35,7 +35,7 @@
class WebPageProxy;
-class WebTextChecker : public TypedAPIObject<APIObject::TypeTextChecker> {
+class WebTextChecker : public API::TypedObject<API::Object::TypeTextChecker> {
public:
static WebTextChecker* shared();
Modified: trunk/Source/WebKit2/UIProcess/WebVibrationProxy.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/WebVibrationProxy.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/WebVibrationProxy.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -37,7 +37,7 @@
class WebPageProxy;
-class WebVibrationProxy : public TypedAPIObject<APIObject::TypeVibration>, private CoreIPC::MessageReceiver {
+class WebVibrationProxy : public API::TypedObject<API::Object::TypeVibration>, private CoreIPC::MessageReceiver {
public:
static PassRefPtr<WebVibrationProxy> create(WebPageProxy*);
virtual ~WebVibrationProxy();
Modified: trunk/Source/WebKit2/UIProcess/WebViewportAttributes.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/WebViewportAttributes.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/WebViewportAttributes.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -32,7 +32,7 @@
namespace WebKit {
-class WebViewportAttributes : public TypedAPIObject<APIObject::TypeViewportAttributes> {
+class WebViewportAttributes : public API::TypedObject<API::Object::TypeViewportAttributes> {
public:
static PassRefPtr<WebViewportAttributes> create(const WebCore::ViewportAttributes& attributes)
{
Modified: trunk/Source/WebKit2/UIProcess/efl/EwkTouchEvent.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/efl/EwkTouchEvent.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/efl/EwkTouchEvent.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -36,9 +36,9 @@
namespace WebKit {
-class EwkTouchEvent : public APIObject {
+class EwkTouchEvent : public API::Object {
public:
- static const APIObject::Type APIType = TypeTouchEvent;
+ static const API::Object::Type APIType = TypeTouchEvent;
static PassRefPtr<EwkTouchEvent> create(WKEventType type, WKArrayRef touchPoints, WKEventModifiers modifiers, double timestamp)
{
@@ -53,7 +53,7 @@
private:
EwkTouchEvent(WKEventType, WKArrayRef, WKEventModifiers, double timestamp);
- virtual APIObject::Type type() const { return APIType; }
+ virtual API::Object::Type type() const { return APIType; }
WKEventType m_eventType;
WKRetainPtr<WKArrayRef> m_touchPoints;
Modified: trunk/Source/WebKit2/UIProcess/efl/EwkTouchPoint.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/efl/EwkTouchPoint.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/efl/EwkTouchPoint.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -36,9 +36,9 @@
namespace WebKit {
-class EwkTouchPoint : public APIObject {
+class EwkTouchPoint : public API::Object {
public:
- static const APIObject::Type APIType = TypeTouchPoint;
+ static const API::Object::Type APIType = TypeTouchPoint;
static PassRefPtr<EwkTouchPoint> create(uint32_t id, WKTouchPointState state, const WKPoint& screenPosition, const WKPoint& position, const WKSize& radius, float rotationAngle = 0, float forceFactor = 1)
{
@@ -56,7 +56,7 @@
private:
EwkTouchPoint(uint32_t id, WKTouchPointState, const WKPoint&, const WKPoint&, const WKSize&, float rotationAngle, float forceFactor);
- virtual APIObject::Type type() const { return APIType; }
+ virtual API::Object::Type type() const { return APIType; }
uint32_t m_id;
WKTouchPointState m_state;
Modified: trunk/Source/WebKit2/UIProcess/efl/WebPopupItemEfl.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/efl/WebPopupItemEfl.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPopupItemEfl.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -32,7 +32,7 @@
namespace WebKit {
-class WebPopupItemEfl : public TypedAPIObject<APIObject::TypePopupMenuItem> {
+class WebPopupItemEfl : public API::TypedObject<API::Object::TypePopupMenuItem> {
public:
static PassRefPtr<WebPopupItemEfl> create(const WebPopupItem& data)
{
Modified: trunk/Source/WebKit2/UIProcess/efl/WebUIPopupMenuClient.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/efl/WebUIPopupMenuClient.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/efl/WebUIPopupMenuClient.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -39,7 +39,7 @@
if (!m_client.showPopupMenu)
return;
- Vector<RefPtr<APIObject> > webPopupItems;
+ Vector<RefPtr<API::Object> > webPopupItems;
size_t size = items.size();
for (size_t i = 0; i < size; ++i)
webPopupItems.append(WebPopupItemEfl::create(items[i]));
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenClientGtk.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -29,10 +29,12 @@
#include "APIClient.h"
#include "WKFullScreenClientGtk.h"
+namespace API {
+class Object;
+}
+
namespace WebKit {
-class APIObject;
-
class WebFullScreenClientGtk : public APIClient<WKFullScreenClientGtk, kWKFullScreenClientGtkCurrentVersion> {
public:
bool willEnterFullScreen();
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorClientGtk.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -31,9 +31,12 @@
#include <wtf/text/WTFString.h>
+namespace API {
+class Object;
+}
+
namespace WebKit {
-class APIObject;
class WebInspectorProxy;
class WebInspectorClientGtk : public APIClient<WKInspectorClientGtk, kWKInspectorClientGtkCurrentVersion> {
Modified: trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.cpp (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -66,12 +66,12 @@
void WebSoupRequestManagerProxy::refWebContextSupplement()
{
- APIObject::ref();
+ API::Object::ref();
}
void WebSoupRequestManagerProxy::derefWebContextSupplement()
{
- APIObject::deref();
+ API::Object::deref();
}
void WebSoupRequestManagerProxy::registerURIScheme(const String& scheme)
Modified: trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h (159175 => 159176)
--- trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h 2013-11-13 02:47:43 UTC (rev 159176)
@@ -51,8 +51,8 @@
const Vector<String>& registeredURISchemes() const { return m_registeredURISchemes; }
- using APIObject::ref;
- using APIObject::deref;
+ using API::Object::ref;
+ using API::Object::deref;
private:
WebSoupRequestManagerProxy(WebContext*);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp (159175 => 159176)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -34,7 +34,7 @@
namespace WebKit {
-bool InjectedBundle::load(APIObject* initializationUserData)
+bool InjectedBundle::load(API::Object* initializationUserData)
{
m_platformBundle = eina_module_new(m_path.utf8().data());
if (!m_platformBundle) {
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp (159175 => 159176)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp 2013-11-13 02:44:24 UTC (rev 159175)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp 2013-11-13 02:47:43 UTC (rev 159176)
@@ -36,7 +36,7 @@
namespace WebKit {
-bool InjectedBundle::load(APIObject* initializationUserData)
+bool InjectedBundle::load(API::Object* initializationUserData)
{
m_platformBundle = g_module_open(fileSystemRepresentation(m_path).data(), G_MODULE_BIND_LOCAL);
if (!m_platformBundle) {
