Merge WebKit at r75993: Move WebKit/android files to Source

Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9

1 files changed, 104 insertions, 0 deletions

diff --git a/Source/WebKit/android/jni/WebFrameView.cpp b/Source/WebKit/android/jni/WebFrameView.cpp
new file mode 100644
index 0000000..8e5eac4
--- /dev/null
+++ b/Source/WebKit/android/jni/WebFrameView.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define LOG_TAG "webcoreglue"
+
+#include <config.h>
+#include "WebFrameView.h"
+
+#include "android_graphics.h"
+#include "GraphicsContext.h"
+#include "Frame.h"
+#include "FrameTree.h"
+#include "FrameView.h"
+#include "HostWindow.h"
+#include "PlatformGraphicsContext.h"
+#include "WebViewCore.h"
+
+#include <SkCanvas.h>
+
+namespace android {
+
+WebFrameView::WebFrameView(WebCore::FrameView* frameView, WebViewCore* webViewCore)
+    : WebCoreViewBridge()
+    , mFrameView(frameView)
+    , mWebViewCore(webViewCore) {
+    // attach itself to mFrameView
+    mFrameView->setPlatformWidget(this);
+    Retain(mWebViewCore);
+}
+
+WebFrameView::~WebFrameView() {
+    Release(mWebViewCore);
+}
+
+void WebFrameView::draw(WebCore::GraphicsContext* ctx, const WebCore::IntRect& rect) {
+    WebCore::Frame* frame = mFrameView->frame();
+
+    if (NULL == frame->contentRenderer()) {
+        // We only do this if there is nothing else to draw.
+        // If there is a renderer, it will fill the bg itself, so we don't want to
+        // double-draw (slow)
+        SkCanvas* canvas = ctx->platformContext()->mCanvas;
+        canvas->drawColor(SK_ColorWHITE);
+    } else if (frame->tree()->parent()) {
+        // Note: this code was moved from FrameLoaderClientAndroid
+        //
+        // For subframe, create a new translated rect from the given rectangle.
+        WebCore::IntRect transRect(rect);
+        // In Frame::markAllMatchesForText(), it does a fake paint.  So we need
+        // to handle the case where platformContext() is null.  However, we still
+        // want to call paint, since WebKit must have called the paint for a reason.
+        SkCanvas* canvas = ctx->platformContext() ? ctx->platformContext()->mCanvas : NULL;
+        if (canvas) {
+            const WebCore::IntRect& bounds = getBounds();
+
+            // Grab the intersection of transRect and the frame's bounds.
+            transRect.intersect(bounds);
+            if (transRect.isEmpty())
+                return;
+
+            // Move the transRect into the frame's local coordinates.
+            transRect.move(-bounds.x(), -bounds.y());
+
+            // Translate the canvas, add a clip.
+            canvas->save();
+            canvas->translate(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()));
+            canvas->clipRect(transRect);
+        }
+        mFrameView->paintContents(ctx, transRect);
+        if (canvas)
+            canvas->restore();
+    } else {
+        mFrameView->paintContents(ctx, rect);
+    }
+}
+
+void WebFrameView::setView(WebCore::FrameView* frameView) {
+    mFrameView = frameView;
+    mFrameView->setPlatformWidget(this);
+}
+
+}   // namespace android