Changeset 71237 in webkit
- Timestamp:
- Nov 3, 2010 7:38:33 AM (13 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r71236 r71237 1 2010-11-03 Patrick Gansterer <paroga@webkit.org> 2 3 Reviewed by Adam Roben. 4 5 [WINCE] Add SharedBitmap 6 https://bugs.webkit.org/show_bug.cgi?id=28272 7 8 SharedBitmap is a helper class used as NativeImagePtr for WinCE. 9 It's wide used by WinCE graphics files as a replacement of HBITMAP. 10 11 Originally written by Yong Li <yong.li@torchmobile.com>. 12 13 * platform/graphics/wince/GraphicsContextWinCE.cpp: 14 (WebCore::TransparentLayerDC::TransparentLayerDC): 15 (WebCore::TransparentLayerDC::~TransparentLayerDC): 16 (WebCore::ScopeDCProvider::ScopeDCProvider): 17 (WebCore::ScopeDCProvider::~ScopeDCProvider): 18 (WebCore::GraphicsContext::drawText): 19 * platform/graphics/wince/SharedBitmap.cpp: Added. 20 (WebCore::SharedBitmap::create): 21 (WebCore::SharedBitmap::SharedBitmap): 22 (WebCore::SharedBitmap::~SharedBitmap): 23 (WebCore::SharedBitmap::resetPixels): 24 (WebCore::convert32To16): 25 (WebCore::SharedBitmap::to16bit): 26 (WebCore::SharedBitmap::freeMemory): 27 (WebCore::SharedBitmap::createHandle): 28 (WebCore::SharedBitmap::ensureHandle): 29 (WebCore::SharedBitmap::draw): 30 (WebCore::SharedBitmap::clipBitmap): 31 (WebCore::drawPatternSimple): 32 (WebCore::normalizePhase): 33 (WebCore::SharedBitmap::drawPattern): 34 (WebCore::SharedBitmap::DCProvider::getDC): 35 (WebCore::SharedBitmap::DCProvider::releaseDC): 36 (WebCore::SharedBitmap::clearPixels): 37 * platform/graphics/wince/SharedBitmap.h: Added. 38 (WebCore::DCProvider::getDC): 39 (WebCore::DCProvider::releaseDC): 40 (WebCore::DCProvider::DCHolder::DCHolder): 41 (WebCore::DCProvider::DCHolder::~DCHolder): 42 (WebCore::DCProvider::DCHolder::set): 43 (WebCore::DCProvider::DCHolder::get): 44 (WebCore::DCProvider::DCHolder::clearInternal): 45 (WebCore::DCProvider::DCHolder::setInternal): 46 1 47 2010-11-03 Nikolas Zimmermann <nzimmermann@rim.com> 2 48 -
trunk/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
r70996 r71237 459 459 RefPtr<SharedBitmap> m_rotatedBitmap; 460 460 RECT m_bmpRect; 461 unsigned m_key1; 462 unsigned m_key2; 461 unsigned m_key; 463 462 RotationTransform m_rotation; 464 463 float m_oldOpacity; … … 528 527 m_bitmap = m_data->getTransparentLayerBitmap(m_origRect, m_alphaPaintType, m_bmpRect, true, mustCreateLayer); 529 528 if (m_bitmap) 530 m_memDc = m_bitmap->getDC(&m_key 1, &m_key2);529 m_memDc = m_bitmap->getDC(&m_key); 531 530 else 532 531 m_memDc = m_data->m_dc; … … 536 535 { 537 536 if (m_rotatedBitmap) { 538 m_bitmap->releaseDC(m_memDc, m_key 1, m_key2);539 m_key 1 = m_key2= 0;537 m_bitmap->releaseDC(m_memDc, m_key); 538 m_key = 0; 540 539 rotateBitmap(m_rotatedBitmap.get(), m_bitmap.get(), m_rotation); 541 m_memDc = m_rotatedBitmap->getDC(&m_key 1, &m_key2);540 m_memDc = m_rotatedBitmap->getDC(&m_key); 542 541 m_data->paintBackTransparentLayerBitmap(m_memDc, m_rotatedBitmap.get(), m_rotatedOrigRect, m_alphaPaintType, m_bmpRect); 543 m_rotatedBitmap->releaseDC(m_memDc, m_key 1, m_key2);542 m_rotatedBitmap->releaseDC(m_memDc, m_key); 544 543 } else if (m_bitmap) { 545 544 m_data->paintBackTransparentLayerBitmap(m_memDc, m_bitmap.get(), m_origRect, m_alphaPaintType, m_bmpRect); 546 m_bitmap->releaseDC(m_memDc, m_key 1, m_key2);545 m_bitmap->releaseDC(m_memDc, m_key); 547 546 } 548 547 m_data->m_opacity = m_oldOpacity; … … 568 567 { 569 568 if (m_data->m_bitmap) 570 m_data->m_dc = m_data->m_bitmap->getDC(&m_key 1, &m_key2);569 m_data->m_dc = m_data->m_bitmap->getDC(&m_key); 571 570 } 572 571 ~ScopeDCProvider() 573 572 { 574 573 if (m_data->m_bitmap) { 575 m_data->m_bitmap->releaseDC(m_data->m_dc, m_key 1, m_key2);574 m_data->m_bitmap->releaseDC(m_data->m_dc, m_key); 576 575 m_data->m_dc = 0; 577 576 } … … 579 578 private: 580 579 GraphicsContextPlatformPrivate* m_data; 581 unsigned m_key1; 582 unsigned m_key2; 580 unsigned m_key; 583 581 }; 584 582 … … 1562 1560 font.drawText(&gc, run, IntPoint(0, font.ascent()), from, to); 1563 1561 } 1564 unsigned key1 , key2;1565 HDC memDC = bmp->getDC(&key1 , &key2);1562 unsigned key1; 1563 HDC memDC = bmp->getDC(&key1); 1566 1564 if (memDC) { 1567 1565 m_data->paintBackTransparentLayerBitmap(memDC, bmp.get(), trRect, alphaPaintType, bmpRect); 1568 bmp->releaseDC(memDC, key1 , key2);1566 bmp->releaseDC(memDC, key1); 1569 1567 } 1570 1568 }
Note: See TracChangeset
for help on using the changeset viewer.