diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 14:41:47 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:49 +0100 |
commit | 09b60ab8488b362c96df8f268613aafaeebfcfa1 (patch) | |
tree | 1623751ea9c32fc80fa309017b5d9ea3c7871415 /Source/WebCore/page | |
parent | d73b16bdebb9d20b17be0a30e626dc9e66b6d868 (diff) | |
download | external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.zip external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.tar.gz external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.tar.bz2 |
Merge WebKit at r78450: Fix remaining conflicts
- Document.cpp
Conflict due to AX object cache disabled on Android
See http://trac.webkit.org/changeset/78314
- CachedResourceLoader.cpp/h
Conflict due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/76701
- Source/WebCore/page/ChromeClient.h
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
See http://trac.webkit.org/changeset/77509
- FrameView.cpp
Conflict due to Android FrameView::updatePositionedObjects()
See http://trac.webkit.org/changeset/77274
- ScrollView.h
Conflict due to Android
ScrollView::actualWidth/Height/ScrollX/ScrollY()
See http://trac.webkit.org/changeset/76831
- TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp
conflict due to Android stubbed out
MIMETypeRegistry::getMIMETypeForExtension()
See http://trac.webkit.org/changeset/77368 and
https://android-git.corp.google.com/g/#change,37272
- ImageDecoder.cpp
Conflict due to Android excluding code
See http://trac.webkit.org/changeset/77427
- ImageDecoder.h
Conflict due to ANDROID guard upstreamed as SKIA guard
See http://trac.webkit.org/changeset/77946
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/76743 and
http://trac.webkit.org/changeset/77286
- RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT
See http://trac.webkit.org/changeset/77062
Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
Diffstat (limited to 'Source/WebCore/page')
-rw-r--r-- | Source/WebCore/page/ChromeClient.h | 6 | ||||
-rw-r--r-- | Source/WebCore/page/FrameView.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h index 83f039f..42ef727 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -304,13 +304,11 @@ namespace WebCore { virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { } -<<<<<<< HEAD + virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { } + #if ENABLE(ANDROID_INSTALLABLE_WEB_APPS) virtual void webAppCanBeInstalled() = 0; #endif -======= - virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { } ->>>>>>> webkit.org at r78450 protected: virtual ~ChromeClient() { } diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index f8aa068..0dc71f6 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -1134,7 +1134,6 @@ void FrameView::removeFixedObject() updateCanBlitOnScrollRecursively(); } -<<<<<<< HEAD #if PLATFORM(ANDROID) // When the screen size change, fixed positioned element should be updated. void FrameView::updatePositionedObjects() @@ -1157,12 +1156,11 @@ void FrameView::updatePositionedObjects() } } #endif -======= + IntPoint FrameView::currentMousePosition() const { return m_frame ? m_frame->eventHandler()->currentMousePosition() : IntPoint(); } ->>>>>>> webkit.org at r78450 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) { |