tizen beta release

[framework/web/webkit-efl.git] / Source / WebCore / page / Chrome.cpp

diff --git a/Source/WebCore/page/Chrome.cpp b/Source/WebCore/page/Chrome.cpp
index 9c430fe..51e79f7 100755 (executable)
--- a/Source/WebCore/page/Chrome.cpp
+++ b/Source/WebCore/page/Chrome.cpp
@@ -71,14 +71,14 @@ Chrome::~Chrome()
     m_client->chromeDestroyed();
 }
 
-void Chrome::invalidateWindow(const IntRect& updateRect, bool immediate)
+void Chrome::invalidateRootView(const IntRect& updateRect, bool immediate)
 {
-    m_client->invalidateWindow(updateRect, immediate);
+    m_client->invalidateRootView(updateRect, immediate);
 }
 
-void Chrome::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
+void Chrome::invalidateContentsAndRootView(const IntRect& updateRect, bool immediate)
 {
-    m_client->invalidateContentsAndWindow(updateRect, immediate);
+    m_client->invalidateContentsAndRootView(updateRect, immediate);
 }
 
 void Chrome::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
@@ -98,14 +98,14 @@ void Chrome::delegatedScrollRequested(const IntPoint& scrollPoint)
 }
 #endif
 
-IntPoint Chrome::screenToWindow(const IntPoint& point) const
+IntPoint Chrome::screenToRootView(const IntPoint& point) const
 {
-    return m_client->screenToWindow(point);
+    return m_client->screenToRootView(point);
 }
 
-IntRect Chrome::windowToScreen(const IntRect& rect) const
+IntRect Chrome::rootViewToScreen(const IntRect& rect) const
 {
-    return m_client->windowToScreen(rect);
+    return m_client->rootViewToScreen(rect);
 }
 
 PlatformPageClient Chrome::platformPageClient() const
@@ -118,6 +118,13 @@ void Chrome::contentsSizeChanged(Frame* frame, const IntSize& size) const
     m_client->contentsSizeChanged(frame, size);
 }
 
+#if ENABLE(TIZEN_SUPPORT_VIEWPORT)
+bool Chrome::canContentsSizeChange(Frame* frame, const IntSize& size) const
+{
+    m_client->canContentsSizeChange(frame, size);
+}
+#endif
+
 void Chrome::layoutUpdated(Frame* frame) const
 {
     m_client->layoutUpdated(frame);
@@ -419,21 +426,14 @@ void Chrome::setToolTip(const HitTestResult& result)
         if (Node* node = result.innerNonSharedNode()) {
             if (node->hasTagName(inputTag)) {
                 HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
-                if (input->isFileUpload()) {
-                    FileList* files = input->files();
-                    unsigned listSize = files->length();
-                    if (listSize > 1) {
-                        StringBuilder names;
-                        for (size_t i = 0; i < listSize; ++i) {
-                            names.append(files->item(i)->fileName());
-                            if (i != listSize - 1)
-                                names.append('\n');
-                        }
-                        toolTip = names.toString();
-                        // filename always display as LTR.
-                        toolTipDirection = LTR;
-                    }
-                }
+                toolTip = input->defaultToolTip();
+
+                // FIXME: We should obtain text direction of tooltip from
+                // ChromeClient or platform. As of October 2011, all client
+                // implementations don't use text direction information for
+                // ChromeClient::setToolTip. We'll work on tooltip text
+                // direction during bidi cleanup in form inputs.
+                toolTipDirection = LTR;
             }
         }
     }
@@ -470,14 +470,14 @@ void Chrome::openColorChooser(ColorChooser* colorChooser, const Color& initialCo
     m_client->openColorChooser(colorChooser, initialColor);
 }
 
-void Chrome::cleanupColorChooser()
+void Chrome::cleanupColorChooser(ColorChooser* colorChooser)
 {
-    m_client->cleanupColorChooser();
+    m_client->cleanupColorChooser(colorChooser);
 }
 
-void Chrome::setSelectedColorInColorChooser(const Color& color)
+void Chrome::setSelectedColorInColorChooser(ColorChooser* colorChooser, const Color& color)
 {
-    m_client->setSelectedColorInColorChooser(color);
+    m_client->setSelectedColorInColorChooser(colorChooser, color);
 }
 #endif
 
@@ -491,9 +491,9 @@ void Chrome::loadIconForFiles(const Vector<String>& filenames, FileIconLoader* l
     m_client->loadIconForFiles(filenames, loader);
 }
 
-void Chrome::dispatchViewportDataDidChange(const ViewportArguments& arguments) const
+void Chrome::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const
 {
-    m_client->dispatchViewportDataDidChange(arguments);
+    m_client->dispatchViewportPropertiesDidChange(arguments);
 }
 
 void Chrome::setCursor(const Cursor& cursor)
@@ -515,13 +515,6 @@ void Chrome::scheduleAnimation()
 }
 #endif
 
-#if ENABLE(NOTIFICATIONS)
-NotificationPresenter* Chrome::notificationPresenter() const
-{
-    return m_client->notificationPresenter();
-}
-#endif
-
 // --------
 
 #if ENABLE(DASHBOARD_SUPPORT)