Changeset 125690 in webkit
- Timestamp:
- Aug 15, 2012 11:54:33 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r125688 r125690 1 2012-08-15 Joshua Netterfield <jnetterfield@rim.com> 2 3 [BlackBerry] Upstream BlackBerry build fixes 4 https://bugs.webkit.org/show_bug.cgi?id=94121 5 6 Reviewed by Rob Buis. 7 8 This includes several build fixes due to incorrect upstream patches. 9 These mistakes were never present downstream. 10 11 No new tests, because no new functionality is added. 12 13 * platform/graphics/GraphicsContext3D.cpp: 14 (WebCore::GraphicsContext3D::computeFormatAndTypeParameters): 15 * platform/graphics/GraphicsContext3D.h: 16 (GraphicsContext3D): 17 (WebCore::GraphicsContext3D::ShaderSourceEntry::ShaderSourceEntry): 18 * platform/graphics/blackberry/LayerFilterRenderer.cpp: 19 (WebCore::LayerFilterRendererAction::LayerFilterRendererAction): 20 * platform/graphics/blackberry/LayerFilterRenderer.h: 21 (LayerFilterRendererAction): 22 1 23 2012-08-15 Adam Barth <abarth@webkit.org> 2 24 -
trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp
r122175 r125690 117 117 *bytesPerComponent = sizeof(GC3Dushort); 118 118 break; 119 #if !PLATFORM(BLACKBERRY) 119 120 case GraphicsContext3D::UNSIGNED_INT_24_8: 121 #endif 120 122 case GraphicsContext3D::UNSIGNED_INT: 121 123 *bytesPerComponent = sizeof(GC3Duint); -
trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h
r124879 r125690 75 75 #endif 76 76 77 #if PLATFORM(CHROMIUM) && USE(SKIA)77 #if (PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)) && USE(SKIA) 78 78 class GrContext; 79 79 #endif … … 484 484 Platform3DObject platformTexture() const { return m_compositorTexture; } 485 485 CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); } 486 #elif PLATFORM(CHROMIUM) 486 #elif PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY) 487 487 PlatformGraphicsContext3D platformGraphicsContext3D() const; 488 488 Platform3DObject platformTexture() const; … … 520 520 bool makeContextCurrent(); 521 521 522 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) 522 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) 523 523 // With multisampling on, blit from multisampleFBO to regular FBO. 524 524 void prepareTexture(); … … 814 814 bool paintCompositedResultsToCanvas(ImageBuffer*); 815 815 816 #if PLATFORM(BLACKBERRY) 817 bool paintsIntoCanvasBuffer() const; 818 #endif 819 816 820 // Support for buffer creation and deletion 817 821 Platform3DObject createBuffer(); … … 916 920 void* destinationData); 917 921 918 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) 922 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) 919 923 // Take into account the user's requested context creation attributes, 920 924 // in particular stencil and antialias, and determine which could or … … 955 959 956 960 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) 957 typedef struct{961 struct ShaderSourceEntry { 958 962 String source; 959 963 String log; 960 964 bool isValid; 961 } ShaderSourceEntry; 965 ShaderSourceEntry() 966 : isValid(0) 967 { 968 } 969 }; 962 970 HashMap<Platform3DObject, ShaderSourceEntry> m_shaderSourceMap; 963 971 -
trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp
r124242 r125690 134 134 135 135 LayerFilterRendererAction::LayerFilterRendererAction(int c_programId) 136 ,m_programId(c_programId)136 : m_programId(c_programId) 137 137 , m_pushSnapshot(false) 138 138 , m_popSnapshot(false) -
trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.h
r124242 r125690 96 96 // A vector of actions must have an even count, so if you have an odd count, add a passthrough event at the end. 97 97 // See the ping-pong note in LayerFilterRenderer::applyActions. 98 ~LayerFilterRendererAction();99 98 100 99 bool shouldPushSnapshot() const { return m_pushSnapshot; } -
trunk/Source/WebKit/blackberry/ChangeLog
r125680 r125690 1 2012-08-15 Joshua Netterfield <jnetterfield@rim.com> 2 3 [BlackBerry] Upstream BlackBerry build fixes 4 https://bugs.webkit.org/show_bug.cgi?id=94121 5 6 Reviewed by Rob Buis. 7 8 This includes several build fixes due to incorrect upstream patches. 9 These mistakes were never present downstream. 10 11 No new tests, because no new functionality is added. 12 13 * WebCoreSupport/AboutDataEnableFeatures.in: 14 * WebCoreSupport/AboutTemplate.html.cpp: 15 (writeHeader): 16 1 17 2012-08-15 Leo Yang <leoyang@rim.com> 2 18 -
trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in
r124838 r125690 118 118 MEMORY_SAMPLER 119 119 META_ALLOCATOR_PROFILE 120 METER_ ELEMENT120 METER_TAG 121 121 MHTML 122 122 MICRODATA … … 147 147 PLUGIN_PROCESS 148 148 POINTER_LOCK 149 PROGRESS_ ELEMENT149 PROGRESS_TAG 150 150 PURGEABLE_MEMORY 151 151 QUOTA … … 185 185 TEXT_NOTIFICATIONS_ONLY 186 186 THREADED_SCROLLING 187 THREADED_SCROLLING 187 188 THREADING_GENERIC 188 189 THREADING_LIBDISPATCH … … 199 200 VIDEO 200 201 VIDEO_TRACK 201 VIDEO|XSLT202 202 VIEWPORT 203 203 VIEWPORT_REFLOW -
trunk/Source/WebKit/blackberry/WebCoreSupport/AboutTemplate.html.cpp
r122573 r125690 17 17 */ 18 18 19 static String writeHeader(const String& header)19 static String writeHeader(const String& title) 20 20 { 21 21 return "<!DOCTYPE html><html>"
Note: See TracChangeset
for help on using the changeset viewer.