Fix debug build

- FrameLoaderClientAndroid::dispatchDidClearWindowObjectInWorld()
  FrameLoader::url() was removed in
  http://trac.webkit.org/changeset/76872. We should use Document::url()
  instead.

- ImageBufferAndroid
  See http://trac.webkit.org/changeset/77286 and
  http://trac.webkit.org/changeset/77398

- Add PluginDebug.cpp to build

- ChromiumIncludes.h
  Don't build Chromium code without NDEBUG set

- Frame.cpp
  We should not include WebKit files from WebCore. WebViewCore.h introduces
  problems due to the change to ChromiumIncludes.h and is not required here.

Bug: 5448972
Change-Id: I82c5c95591bf01fb65179282d03f865df4255c89

1 files changed, 2 insertions, 2 deletions

diff --git a/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
index 691fbca..439733b 100644
--- a/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
@@ -195,7 +195,7 @@ void ImageBuffer::putUnmultipliedImageData(ByteArray* source, const IntSize& sou
     ASSERT(destx >= 0);
     ASSERT(destx < m_size.width());
     ASSERT(originx >= 0);
-    ASSERT(originx <= sourceRect.right());
+    ASSERT(originx <= sourceRect.maxX());
 
     int endx = destPoint.x() + sourceRect.maxX();
     ASSERT(endx <= m_size.width());
@@ -207,7 +207,7 @@ void ImageBuffer::putUnmultipliedImageData(ByteArray* source, const IntSize& sou
     ASSERT(desty >= 0);
     ASSERT(desty < m_size.height());
     ASSERT(originy >= 0);
-    ASSERT(originy <= sourceRect.bottom());
+    ASSERT(originy <= sourceRect.maxY());
 
     int endy = destPoint.y() + sourceRect.maxY();
     ASSERT(endy <= m_size.height());