diff options
Diffstat (limited to 'Source/WebCore/platform/efl/WidgetEfl.cpp')
| -rw-r--r-- | Source/WebCore/platform/efl/WidgetEfl.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/WebCore/platform/efl/WidgetEfl.cpp b/Source/WebCore/platform/efl/WidgetEfl.cpp index 640e6e3..45d4792 100644 --- a/Source/WebCore/platform/efl/WidgetEfl.cpp +++ b/Source/WebCore/platform/efl/WidgetEfl.cpp @@ -183,10 +183,10 @@ void Widget::setFrameRect(const IntRect& rect) void Widget::frameRectsChanged() { - Evas_Object* o = evasObject(); + Evas_Object* object = evasObject(); Evas_Coord x, y; - if (!parent() || !o) + if (!parent() || !object) return; IntRect rect = frameRect(); @@ -196,8 +196,8 @@ void Widget::frameRectsChanged() rect.setLocation(parent()->contentsToWindow(rect.location())); evas_object_geometry_get(root()->evasObject(), &x, &y, 0, 0); - evas_object_move(o, x + rect.x(), y + rect.y()); - evas_object_resize(o, rect.width(), rect.height()); + evas_object_move(object, x + rect.x(), y + rect.y()); + evas_object_resize(object, rect.width(), rect.height()); } void Widget::setFocus(bool focused) @@ -332,14 +332,14 @@ Ecore_Evas* Widget::ecoreEvas() const return static_cast<Ecore_Evas*>(evas_data_attach_get(evas())); } -void Widget::setEvasObject(Evas_Object *o) +void Widget::setEvasObject(Evas_Object *object) { // FIXME: study platformWidget() and use it // FIXME: right now platformWidget() requires implementing too much - if (m_data->m_evasObject == o) + if (m_data->m_evasObject == object) return; - m_data->m_evasObject = o; - if (!o) { + m_data->m_evasObject = object; + if (!object) { m_data->m_evas = 0; #ifdef HAVE_ECORE_X m_data->m_isUsingEcoreX = false; @@ -347,7 +347,7 @@ void Widget::setEvasObject(Evas_Object *o) return; } - m_data->m_evas = evas_object_evas_get(o); + m_data->m_evas = evas_object_evas_get(object); #ifdef HAVE_ECORE_X const char *engine = ecore_evas_engine_name_get(ecoreEvas()); |