LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable plugin content copy when 0x0 pixels

Browse Source 
bug:5382635
Change-Id: I83f999d9e2dd0dc51a6c2f780f2f2b7add95a60a
This commit is contained in:
Chris Craik
2011-10-03 14:43:56 -07:00
parent f82ab455aa
commit 771310eb99
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/BrowserPlugin/jni/RenderingThread.cpp
View File

@@ -43,9 +43,14 @@ RenderingThread::RenderingThread(NPP npp) : android::Thread() {
} }
android::status_t RenderingThread::readyToRun() { android::status_t RenderingThread::readyToRun() {
gLogI.log(kError_ANPLogType, "thread %p acquiring native window...", this);
while (m_ANW == NULL) { while (m_ANW == NULL) {
m_ANW = gNativeWindowI.acquireNativeWindow(m_npp); m_ANW = gNativeWindowI.acquireNativeWindow(m_npp);
if (!m_ANW)
gLogI.log(kError_ANPLogType, "thread %p acquire native window FAILED!", this);
} }
gLogI.log(kError_ANPLogType, "thread %p acquired native window successfully!", this);
#if (!USE_SOFTWARE_RENDERING) #if (!USE_SOFTWARE_RENDERING)
m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY); m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
@@ -165,6 +170,8 @@ void RenderingThread::updateNativeWindow(ANativeWindow* ANW,
const SkBitmap& bitmap) const SkBitmap& bitmap)
{ {
#if USE_SOFTWARE_RENDERING #if USE_SOFTWARE_RENDERING
if (bitmap.height() == 0 || bitmap.width() == 0)
return;
//STEP 1: lock the ANW, getting a buffer //STEP 1: lock the ANW, getting a buffer
ANativeWindow_Buffer buffer; ANativeWindow_Buffer buffer;

7
samples/BrowserPlugin/jni/animation/AnimationThread.cpp
View File

@@ -45,7 +45,7 @@ AnimationThread::AnimationThread(NPP npp) : RenderingThread(npp) {
m_paint = new SkPaint; m_paint = new SkPaint;
m_paint->setAntiAlias(true); m_paint->setAntiAlias(true);
m_bitmap = constructBitmap(DEFAULT_WIDTH, DEFAULT_HEIGHT); m_bitmap = constructBitmap(0, 0);
m_canvas = new SkCanvas(*m_bitmap); m_canvas = new SkCanvas(*m_bitmap);
m_startExecutionTime = 0; m_startExecutionTime = 0;
@@ -95,11 +95,6 @@ bool AnimationThread::threadLoop() {
int width, height; int width, height;
getDimensions(width, height); getDimensions(width, height);
if (width <= 0)
width = DEFAULT_WIDTH;
if (height <= 0)
height = DEFAULT_HEIGHT;
if (m_bitmap->width() != width || m_bitmap->height() != height) { if (m_bitmap->width() != width || m_bitmap->height() != height) {
delete m_canvas; delete m_canvas;
delete m_bitmap; delete m_bitmap;

3
samples/BrowserPlugin/jni/animation/AnimationThread.h
View File

@@ -59,9 +59,6 @@ private:
SkPaint* m_paint; SkPaint* m_paint;
SkBitmap* m_bitmap; SkBitmap* m_bitmap;
SkCanvas* m_canvas; SkCanvas* m_canvas;
static const unsigned int DEFAULT_WIDTH = 400;
static const unsigned int DEFAULT_HEIGHT = 400;
}; };