[haiku-webkit-commits] r316 - webkit/trunk/WebCore/platform/graphics/haiku

From: webkit@xxxxxxxxxxxxxxx
To: haiku-webkit-commits@xxxxxxxxxxxxx
Date: Tue, 16 Mar 2010 14:24:49 +0000
Author: stippi
Date: Tue Mar 16 14:24:49 2010
New Revision: 316
URL: http://mmlr.dyndns.org/changeset/316

Log:
Implement storing of custom information in the graphics state stack. Currently,
it is image interpolation quality only (thus implementing
setImageInterpolationQuality() and imageInterpolationQuality()).

Modified:
   webkit/trunk/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp

Modified: webkit/trunk/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp
==============================================================================
--- webkit/trunk/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp       
Tue Mar 16 13:49:35 2010        (r315)
+++ webkit/trunk/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp       
Tue Mar 16 14:24:49 2010        (r316)
@@ -130,6 +130,45 @@
         Layer* previous;
     };
 
+    struct CustomGraphicsState {
+        CustomGraphicsState()
+            : previous(0)
+            , imageInterpolationQuality(InterpolationDefault)
+        {
+        }
+
+        CustomGraphicsState(CustomGraphicsState* previous)
+            : previous(previous)
+            , imageInterpolationQuality(previous->imageInterpolationQuality)
+        {
+        }
+
+        CustomGraphicsState* previous;
+        InterpolationQuality imageInterpolationQuality;
+    };
+
+    void pushState()
+    {
+       m_graphicsState = new CustomGraphicsState(m_graphicsState);
+        view()->PushState();
+        resetClipping();
+    }
+
+    void popState()
+    {
+       ASSERT(m_graphicsState->previous);
+       if (!m_graphicsState->previous)
+           return;
+
+       CustomGraphicsState* oldTop = m_graphicsState;
+       m_graphicsState = oldTop->previous;
+       delete oldTop;
+
+        m_currentLayer->accumulatedOrigin -= view()->Origin();
+        view()->PopState();
+        resetClipping();
+    }
+
     BView* view() const
     {
         return m_currentLayer->view;
@@ -237,10 +276,12 @@
     }
 
     Layer* m_currentLayer;
+    CustomGraphicsState* m_graphicsState;
 };
 
 GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate(BView* view)
     : m_currentLayer(new Layer(view))
+    , m_graphicsState(new CustomGraphicsState)
 {
 }
 
@@ -251,6 +292,12 @@
         m_currentLayer = previous;
     }
     delete m_currentLayer;
+
+    while (CustomGraphicsState* previous = m_graphicsState->previous) {
+        delete m_graphicsState;
+        m_graphicsState = previous;
+    }
+    delete m_graphicsState;
 }
 
 GraphicsContext::GraphicsContext(PlatformGraphicsContext* context)
@@ -273,15 +320,12 @@
 
 void GraphicsContext::savePlatformState()
 {
-    m_data->view()->PushState();
-    m_data->resetClipping();
+       m_data->pushState();
 }
 
 void GraphicsContext::restorePlatformState()
 {
-    m_data->m_currentLayer->accumulatedOrigin -= m_data->view()->Origin();
-    m_data->view()->PopState();
-    m_data->resetClipping();
+       m_data->popState();
 }
 
 // Draws a filled rectangle with a stroked border.
@@ -893,8 +937,14 @@
     notImplemented();
 }
 
-void GraphicsContext::setImageInterpolationQuality(InterpolationQuality)
+void GraphicsContext::setImageInterpolationQuality(InterpolationQuality 
quality)
+{
+    m_data->m_graphicsState->imageInterpolationQuality = quality;
+}
+
+InterpolationQuality GraphicsContext::imageInterpolationQuality() const
 {
+    return m_data->m_graphicsState->imageInterpolationQuality;
 }
 
 void GraphicsContext::setURLForRect(const KURL& link, const IntRect& destRect)
[haiku-webkit-commits] r316 - webkit/trunk/WebCore/platform/graphics/haiku

Other related posts:
