Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

4 files changed, 81 insertions, 35 deletions

diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
index 1174f83..31b53c8 100644
--- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
@@ -49,7 +49,7 @@
 
 using namespace WebCore;
 
-static inline Evas_Object* kit(WebCore::Frame* frame)
+static inline Evas_Object* kit(Frame* frame)
 {
     if (!frame)
         return 0;
@@ -60,7 +60,7 @@ static inline Evas_Object* kit(WebCore::Frame* frame)
 
 namespace WebCore {
 
-ChromeClientEfl::ChromeClientEfl(Evas_Object *view)
+ChromeClientEfl::ChromeClientEfl(Evas_Object* view)
     : m_view(view)
 {
 }
@@ -213,7 +213,7 @@ bool ChromeClientEfl::canRunBeforeUnloadConfirmPanel()
     return true;
 }
 
-bool ChromeClientEfl::runBeforeUnloadConfirmPanel(const String& message, WebCore::Frame* frame)
+bool ChromeClientEfl::runBeforeUnloadConfirmPanel(const String& message, Frame* frame)
 {
     return runJavaScriptConfirm(frame, message);
 }
@@ -274,31 +274,11 @@ IntRect ChromeClientEfl::windowResizerRect() const
     return IntRect();
 }
 
-void ChromeClientEfl::repaint(const IntRect& windowRect, bool contentChanged, bool immediate, bool repaintContentOnly)
-{
-    Evas_Coord x, y, w, h;
-
-    if (!contentChanged)
-        return;
-
-    x = windowRect.x();
-    y = windowRect.y();
-    w = windowRect.width();
-    h = windowRect.height();
-    ewk_view_repaint(m_view, x, y, w, h);
-}
-
 void ChromeClientEfl::contentsSizeChanged(Frame* frame, const IntSize& size) const
 {
     ewk_frame_contents_size_changed(kit(frame), size.width(), size.height());
 }
 
-bool ChromeClientEfl::scroll(const IntSize& delta, const IntRect& scrollViewRect, const IntRect& clipRect, bool canBlit, bool isMainFrame)
-{
-    ewk_view_scroll(m_view, delta.width(), delta.height(), scrollViewRect.x(), scrollViewRect.y(), scrollViewRect.width(), scrollViewRect.height(), clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height(), isMainFrame);
-    return canBlit;
-}
-
 IntRect ChromeClientEfl::windowToScreen(const IntRect& rect) const
 {
     notImplemented();
@@ -327,7 +307,7 @@ void ChromeClientEfl::mouseDidMoveOverElement(const HitTestResult& hit, unsigned
     if (isLink) {
         KURL url = hit.absoluteLinkURL();
         if (!url.isEmpty() && url != m_hoveredLinkURL) {
-            const char *link[2];
+            const char* link[2];
             TextDirection dir;
             CString urlStr = url.prettyURL().utf8();
             CString titleStr = hit.title(dir).utf8();
@@ -370,7 +350,7 @@ void ChromeClientEfl::exceededDatabaseQuota(Frame* frame, const String& database
     ewk_view_exceeded_database_quota(m_view, kit(frame), databaseName.utf8().data());
 }
 
-void ChromeClientEfl::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser)
+void ChromeClientEfl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFileChooser)
 {
     notImplemented();
 }
@@ -392,4 +372,60 @@ void ChromeClientEfl::requestGeolocationPermissionForFrame(Frame*, Geolocation*)
     notImplemented();
 }
 
+void ChromeClientEfl::cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*)
+{
+    notImplemented();
+}
+
+void ChromeClientEfl::cancelGeolocationPermissionForFrame(Frame*, Geolocation*)
+{
+    notImplemented();
+}
+
+void ChromeClientEfl::invalidateContents(const IntRect& updateRect, bool immediate)
+{
+    notImplemented();
+}
+
+void ChromeClientEfl::invalidateWindow(const IntRect& updateRect, bool immediate)
+{
+    notImplemented();
+}
+
+void ChromeClientEfl::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
+{
+    Evas_Coord x, y, w, h;
+
+    x = updateRect.x();
+    y = updateRect.y();
+    w = updateRect.width();
+    h = updateRect.height();
+    ewk_view_repaint(m_view, x, y, w, h);
+}
+
+void ChromeClientEfl::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
+{
+    invalidateContentsAndWindow(updateRect, immediate);
+}
+
+void ChromeClientEfl::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
+{
+    ewk_view_scroll(m_view, scrollDelta.width(), scrollDelta.height(), rectToScroll.x(), rectToScroll.y(), rectToScroll.width(), rectToScroll.height(), clipRect.x(), clipRect.y(), clipRect.width(), clipRect.height(), EINA_TRUE);
+}
+
+void ChromeClientEfl::cancelGeolocationPermissionRequestForFrame(Frame*)
+{
+    notImplemented();
+}
+
+void ChromeClientEfl::iconForFiles(const Vector<String, 0u>&, PassRefPtr<FileChooser>)
+{
+    notImplemented();
+}
+
+void ChromeClientEfl::chooseIconForFiles(const Vector<String>&, FileChooser*)
+{
+    notImplemented();
+}
+
 }
diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
index 0e17806..8df8483 100644
--- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
@@ -31,7 +31,7 @@ namespace WebCore {
 
 class ChromeClientEfl : public ChromeClient {
 public:
-    explicit ChromeClientEfl(Evas_Object *view);
+    explicit ChromeClientEfl(Evas_Object* view);
     virtual ~ChromeClientEfl();
 
     virtual void chromeDestroyed();
@@ -49,7 +49,7 @@ public:
     virtual bool canTakeFocus(FocusDirection);
     virtual void takeFocus(FocusDirection);
 
-    virtual void focusedNodeChanged(WebCore::Node*);
+    virtual void focusedNodeChanged(Node*);
 
     virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&);
     virtual void show();
@@ -88,9 +88,7 @@ public:
 
     virtual IntRect windowResizerRect() const;
 
-    virtual void repaint(const IntRect&, bool contentChanged, bool immediate = false, bool repaintContentOnly = false);
     virtual void contentsSizeChanged(Frame*, const IntSize&) const;
-    virtual bool scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect, bool canBlit, bool isMainFrame);
     virtual IntPoint screenToWindow(const IntPoint&) const;
     virtual IntRect windowToScreen(const IntRect&) const;
     virtual PlatformPageClient platformPageClient() const;
@@ -111,6 +109,7 @@ public:
 #endif
 
     virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
+    virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
     virtual void formStateDidChange(const Node*);
 
     virtual PassOwnPtr<HTMLParserQuirks> createHTMLParserQuirks() { return 0; }
@@ -120,8 +119,18 @@ public:
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
 
     virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
-
-    Evas_Object *m_view;
+    virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*);
+    virtual void cancelGeolocationPermissionForFrame(Frame*, Geolocation*);
+
+    virtual void invalidateContents(const IntRect&, bool);
+    virtual void invalidateWindow(const IntRect&, bool);
+    virtual void invalidateContentsAndWindow(const IntRect&, bool);
+    virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
+    virtual void scroll(const IntSize&, const IntRect&, const IntRect&);
+    virtual void cancelGeolocationPermissionRequestForFrame(Frame*);
+    virtual void iconForFiles(const Vector<String, 0u>&, PassRefPtr<FileChooser>);
+
+    Evas_Object* m_view;
     KURL m_hoveredLinkURL;
 };
 }
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
index 8a7fd2d..2358fab 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
@@ -188,7 +188,7 @@ void FrameLoaderClientEfl::committedLoad(DocumentLoader* loader, const char* dat
 
         FrameLoader* fl = loader->frameLoader();
         if (m_firstData) {
-            fl->setEncoding(m_response.textEncodingName(), false);
+            fl->writer()->setEncoding(m_response.textEncodingName(), false);
             m_firstData = false;
         }
         fl->addData(data, length);
@@ -666,7 +666,7 @@ void FrameLoaderClientEfl::finishedLoading(DocumentLoader* loader)
     if (!m_pluginView) {
         if (m_firstData) {
             FrameLoader* fl = loader->frameLoader();
-            fl->setEncoding(m_response.textEncodingName(), false);
+            fl->writer()->setEncoding(m_response.textEncodingName(), false);
             m_firstData = false;
         }
     } else {
@@ -711,7 +711,7 @@ void FrameLoaderClientEfl::dispatchDidFailLoading(DocumentLoader* loader, unsign
 {
     if (m_firstData) {
         FrameLoader* fl = loader->frameLoader();
-        fl->setEncoding(m_response.textEncodingName(), false);
+        fl->writer()->setEncoding(m_response.textEncodingName(), false);
         m_firstData = false;
     }
 
@@ -829,7 +829,7 @@ void FrameLoaderClientEfl::setMainDocumentError(DocumentLoader* loader, const Re
 {
     if (!m_pluginView) {
         if (m_firstData) {
-            loader->frameLoader()->setEncoding(m_response.textEncodingName(), false);
+            loader->frameLoader()->writer()->setEncoding(m_response.textEncodingName(), false);
             m_firstData = false;
         }
     } else {
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
index 47b5621..581ec85 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
@@ -121,6 +121,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient {
 
     virtual void dispatchUnableToImplementPolicy(const ResourceError&);
 
+    virtual void dispatchWillSendSubmitEvent(HTMLFormElement*) { }
     virtual void dispatchWillSubmitForm(FramePolicyFunction, WTF::PassRefPtr<FormState>);
 
     virtual void dispatchDidLoadMainResource(DocumentLoader*);