summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/WebCore/rendering/RenderLayer.cpp10
-rw-r--r--Source/WebCore/rendering/RenderLayer.h22
-rw-r--r--Source/WebKit/android/jni/WebCoreFrameBridge.cpp10
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp2
-rw-r--r--Source/WebKit/android/nav/WebView.cpp2
5 files changed, 7 insertions, 39 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index 1ffa0de..bad0668 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -3152,14 +3152,6 @@ RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, RenderLayer* cont
candidateLayer = hitLayer;
}
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- if (hasOverflowParent()) {
- ClipRects clipRects;
- calculateClipRects(rootLayer, clipRects, useTemporaryClipRects);
- fgRect.intersect(clipRects.hitTestClip());
- bgRect.intersect(clipRects.hitTestClip());
- }
-#endif
// Next we want to see if the mouse pos is inside the child RenderObjects of the layer.
if (fgRect.intersects(hitTestArea) && isSelfPaintingLayer()) {
// Hit test with a temporary HitTestResult, because we only want to commit to 'result' if we know we're frontmost.
@@ -3451,8 +3443,6 @@ void RenderLayer::calculateClipRects(const RenderLayer* rootLayer, ClipRects& cl
if (renderer()->hasOverflowClip()) {
IntRect newOverflowClip = toRenderBox(renderer())->overflowClipRect(x, y, relevancy);
#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- clipRects.setHitTestClip(intersection(clipRects.fixed() ? clipRects.fixedClipRect()
- : newOverflowClip, clipRects.hitTestClip()));
if (hasOverflowScroll()) {
RenderBox* box = toRenderBox(renderer());
newOverflowClip =
diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h
index 5e421f0..ceb9026 100644
--- a/Source/WebCore/rendering/RenderLayer.h
+++ b/Source/WebCore/rendering/RenderLayer.h
@@ -80,9 +80,6 @@ public:
: m_overflowClipRect(r)
, m_fixedClipRect(r)
, m_posClipRect(r)
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- , m_hitTestClip(r)
-#endif
, m_refCnt(0)
, m_fixed(false)
{
@@ -92,9 +89,6 @@ public:
: m_overflowClipRect(other.overflowClipRect())
, m_fixedClipRect(other.fixedClipRect())
, m_posClipRect(other.posClipRect())
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- , m_hitTestClip(other.hitTestClip())
-#endif
, m_refCnt(0)
, m_fixed(other.fixed())
{
@@ -105,9 +99,6 @@ public:
m_overflowClipRect = r;
m_fixedClipRect = r;
m_posClipRect = r;
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- m_hitTestClip = r;
-#endif
m_fixed = false;
}
@@ -119,10 +110,6 @@ public:
const IntRect& posClipRect() const { return m_posClipRect; }
void setPosClipRect(const IntRect& r) { m_posClipRect = r; }
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- const IntRect& hitTestClip() const { return m_hitTestClip; }
- void setHitTestClip(const IntRect& r) { m_hitTestClip = r; }
-#endif
bool fixed() const { return m_fixed; }
void setFixed(bool fixed) { m_fixed = fixed; }
@@ -143,9 +130,6 @@ public:
return m_overflowClipRect == other.overflowClipRect() &&
m_fixedClipRect == other.fixedClipRect() &&
m_posClipRect == other.posClipRect() &&
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- m_hitTestClip == other.hitTestClip() &&
-#endif
m_fixed == other.fixed();
}
@@ -154,9 +138,6 @@ public:
m_overflowClipRect = other.overflowClipRect();
m_fixedClipRect = other.fixedClipRect();
m_posClipRect = other.posClipRect();
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- m_hitTestClip = other.hitTestClip();
-#endif
m_fixed = other.fixed();
return *this;
}
@@ -169,9 +150,6 @@ private:
IntRect m_overflowClipRect;
IntRect m_fixedClipRect;
IntRect m_posClipRect;
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
- IntRect m_hitTestClip;
-#endif
unsigned m_refCnt : 31;
bool m_fixed : 1;
};
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index c03c288..4cd39f6 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1822,7 +1822,7 @@ static void SslCertErrorCancel(JNIEnv *env, jobject obj, int handle, int cert_er
client->cancelSslCertError(cert_error);
}
-static net::X509Certificate* getX509Cert(JNIEnv *env, jobjectArray chain)
+static scoped_refptr<net::X509Certificate> getX509Cert(JNIEnv *env, jobjectArray chain)
{
// Based on Android's NativeCrypto_SSL_use_certificate
int length = env->GetArrayLength(chain);
@@ -1860,8 +1860,8 @@ static net::X509Certificate* getX509Cert(JNIEnv *env, jobjectArray chain)
certChain[i] = rest[i]->get();
}
return net::X509Certificate::CreateFromHandle(first.get(),
- net::X509Certificate::SOURCE_FROM_NETWORK,
- certChain);
+ net::X509Certificate::SOURCE_FROM_NETWORK,
+ certChain);
}
static void SslClientCertPKCS8(JNIEnv *env, jobject obj, int handle, jbyteArray pkey, jobjectArray chain)
@@ -1891,7 +1891,7 @@ static void SslClientCertPKCS8(JNIEnv *env, jobject obj, int handle, jbyteArray
client->sslClientCert(NULL, NULL);
return;
}
- net::X509Certificate* certificate = getX509Cert(env, chain);
+ scoped_refptr<net::X509Certificate> certificate = getX509Cert(env, chain);
if (certificate == NULL) {
client->sslClientCert(NULL, NULL);
return;
@@ -1907,7 +1907,7 @@ static void SslClientCertCtx(JNIEnv *env, jobject obj, int handle, jint ctx, job
client->sslClientCert(NULL, NULL);
return;
}
- net::X509Certificate* certificate = getX509Cert(env, chain);
+ scoped_refptr<net::X509Certificate> certificate = getX509Cert(env, chain);
if (certificate == NULL) {
client->sslClientCert(NULL, NULL);
return;
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index c0766e4..9ef20f1 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -1635,7 +1635,7 @@ SelectText* WebViewCore::createSelectText(const VisibleSelection& selection)
selection.affinity());
} else {
bool isBaseLtr = isLtr(base);
- bool isBaseStart = selection.base() == selection.start();
+ bool isBaseStart = comparePositions(base, extent) <= 0;
int baseOffset = isBaseLtr ? 0 : -1;
SelectText::HandleType baseHandleType = (isBaseLtr == isBaseStart)
? SelectText::LeftHandle : SelectText::RightHandle;
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index fae566c..5e2354b 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -716,7 +716,7 @@ void findMaxVisibleRect(int movingLayerId, SkIRect& visibleContentRect)
if (findMaskedRectsForLayer(m_baseLayer, rects, movingLayerId)) {
float maxSize = 0.0;
const FloatRect* largest = 0;
- for (int i = 0; i < rects.size(); i++) {
+ for (unsigned int i = 0; i < rects.size(); i++) {
const FloatRect& rect = rects[i];
float size = rect.width() * rect.height();
if (size > maxSize) {
generated by cgit v1.1 at 2024-07-06 22:50:25 +0000