Changeset 17820 in webkit


Ignore:
Timestamp:
Nov 16, 2006 3:24:33 PM (17 years ago)
Author:
spadma
Message:

2006-11-16 yadavall <​sriram.yadavalli@nokia.com>

Reviewed by Sachin Padma (​sachin.padma@nokia.com).
DESC: Fix copyright issues
​http://bugs.webkit.org/show_bug.cgi?id=11620

  • BrowserView/inc/WidgetExtension.h:
  • BrowserView/inc/WidgetPreferences.h:
  • BrowserView/inc/WidgetRenderer.h:
  • BrowserView/src/WidgetExtension.cpp:
  • BrowserView/src/WidgetPreferences.cpp:
  • BrowserView/src/WidgetRenderer.cpp: (TWidgetRenderer::TWidgetRenderer): (TWidgetRenderer::PrepareForTransitionL): (TWidgetRenderer::PerformTransitionL): (TWidgetRenderer::TransitionCb): (TWidgetRenderer::DrawFadeMaskL): (TWidgetRenderer::DrawTransition):
Location:
S60/trunk/WebKit
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • S60/trunk/WebKit/BrowserView/inc/WidgetExtension.h

    r17301 r17820  
    11/*
    22* ==============================================================================
    3 *  Name        : WebKitWidgetInterface.h
    4 *  Part of     : WebEngine/WebKitWidgetInterface
    5 *  Description :
    6 *  Version     : 2.1.1
    7 *
    8 *  Copyright (c) 2004 Nokia Corporation.
    9 *  This material, including documentation and any related
    10 *  computer programs, is protected by copyright controlled by
    11 *  Nokia Corporation. All rights are reserved. Copying,
    12 *  including reproducing, storing, adapting or translating, any
    13 *  or all of this material requires the prior written consent of
    14 *  Nokia Corporation. This material also contains confidential
    15 *  information which may not be disclosed to others without the
    16 *  prior written consent of Nokia Corporation.
     3*  Name        : WidgetExtension.h
     4*  Part of     : WebKit / BrowserView
     5*  Description : This class represents the Widget Extension object
     6*  Version     : 3.2
     7*
     8*    Copyright (c) 2006, Nokia Corporation
     9*    All rights reserved.
     10*
     11*   Redistribution and use in source and binary forms, with or without
     12*   modification, are permitted provided that the following conditions
     13*   are met:
     14*
     15*      * Redistributions of source code must retain the above copyright
     16*        notice, this list of conditions and the following disclaimer.
     17*      * Redistributions in binary form must reproduce the above copyright
     18*        notice, this list of conditions and the following disclaimer in
     19*        the documentation and/or other materials provided with the
     20*        distribution.
     21*      * Neither the name of the Nokia Corporation nor the names of its
     22*        contributors may be used to endorse or promote products derived
     23*        from this software without specific prior written permission.
     24*
     25*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     26*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     27*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
     28*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
     29*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     30*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
     31*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     32*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     33*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     34*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
     35*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
     36*   DAMAGE.
     37*
     38*    Please see file patentlicense.txt for further grants.
    1739* ==============================================================================
    1840*/

  • S60/trunk/WebKit/BrowserView/inc/WidgetPreferences.h

    r17301 r17820  
    11/*
    22* ==============================================================================
    3 *  Name        : WebKitWidgetInterface.h
    4 *  Part of     : WebEngine/WebKitWidgetInterface
    5 *  Description :
    6 *  Version     : 2.1.1
     3*  Name        : WidgetPreferences.h
     4*  Part of     : WebKit / BrowserView
     5*  Description : This class represents the Widget Preferences object
     6*  Version     : 3.2
    77*
    8 *  Copyright (c) 2004 Nokia Corporation.
    9 *  This material, including documentation and any related
    10 *  computer programs, is protected by copyright controlled by
    11 *  Nokia Corporation. All rights are reserved. Copying,
    12 *  including reproducing, storing, adapting or translating, any
    13 *  or all of this material requires the prior written consent of
    14 *  Nokia Corporation. This material also contains confidential
    15 *  information which may not be disclosed to others without the
    16 *  prior written consent of Nokia Corporation.
     8*    Copyright (c) 2006, Nokia Corporation
     9*    All rights reserved.
     10*
     11*   Redistribution and use in source and binary forms, with or without
     12*   modification, are permitted provided that the following conditions
     13*   are met:
     14*
     15*      * Redistributions of source code must retain the above copyright
     16*        notice, this list of conditions and the following disclaimer.
     17*      * Redistributions in binary form must reproduce the above copyright
     18*        notice, this list of conditions and the following disclaimer in
     19*        the documentation and/or other materials provided with the
     20*        distribution.
     21*      * Neither the name of the Nokia Corporation nor the names of its
     22*        contributors may be used to endorse or promote products derived
     23*        from this software without specific prior written permission.
     24*
     25*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     26*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     27*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
     28*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
     29*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     30*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
     31*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     32*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     33*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     34*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
     35*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
     36*   DAMAGE.
     37*
     38*    Please see file patentlicense.txt for further grants.
    1739* ==============================================================================
    1840*/

  • S60/trunk/WebKit/BrowserView/inc/WidgetRenderer.h

    r17301 r17820  
    11/*
    22* ==============================================================================
    3 *  Name        : WidgetEngineRenderer.h
    4 *  Part of     : WebEngine/WebKitWidgetInterface
    5 *  Description :
    6 *  Version     : 2.1.1
     3*  Name        : WidgetRenderer.h
     4*  Part of     : WebKit / BrowserView
     5*  Description : This class represents the Widget Renderer object
     6*  Version     : 3.2
    77*
    8 *  Copyright (c) 2004 Nokia Corporation.
    9 *  This material, including documentation and any related
    10 *  computer programs, is protected by copyright controlled by
    11 *  Nokia Corporation. All rights are reserved. Copying,
    12 *  including reproducing, storing, adapting or translating, any
    13 *  or all of this material requires the prior written consent of
    14 *  Nokia Corporation. This material also contains confidential
    15 *  information which may not be disclosed to others without the
    16 *  prior written consent of Nokia Corporation.
     8*    Copyright (c) 2006, Nokia Corporation
     9*    All rights reserved.
     10*
     11*   Redistribution and use in source and binary forms, with or without
     12*   modification, are permitted provided that the following conditions
     13*   are met:
     14*
     15*      * Redistributions of source code must retain the above copyright
     16*        notice, this list of conditions and the following disclaimer.
     17*      * Redistributions in binary form must reproduce the above copyright
     18*        notice, this list of conditions and the following disclaimer in
     19*        the documentation and/or other materials provided with the
     20*        distribution.
     21*      * Neither the name of the Nokia Corporation nor the names of its
     22*        contributors may be used to endorse or promote products derived
     23*        from this software without specific prior written permission.
     24*
     25*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     26*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     27*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
     28*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
     29*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     30*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
     31*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     32*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     33*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     34*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
     35*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
     36*   DAMAGE.
     37*
     38*    Please see file patentlicense.txt for further grants.
    1739* ==============================================================================
    1840*/
    … …  
    4365*  @lib widgetengine.dll
    4466*  @since 3.1
    45 */   
     67*/
    4668class TWidgetRenderer
    4769    {
    … …  
    5173        ~TWidgetRenderer();
    5274
    53     public:   
     75    public:
    5476        void PrepareForTransitionL(const TDesC& aTransition);
    5577        void PerformTransitionL();
    56        
     78
    5779    public:
    5880        void TransitionCb();
    … …  
    7294        CFbsBitmap* iFadeMask;
    7395        CPeriodic* iTransitionTimer;
    74         TInt iTransitionCount;       
    75                
     96        TInt iTransitionCount;
     97
    7698    };
    77        
     99
    78100#endif

  • S60/trunk/WebKit/BrowserView/src/WidgetExtension.cpp

    r17301 r17820  
    11/*
    22* ==============================================================================
    3 *  Name        : WebKitWidgetInterface.cpp
    4 *  Part of     : WebEngine/WebKitWidgetInterface
    5 *  Description :
    6 *  Version     : 2.1.1
     3*  Name        : WidgetExtension.cpp
     4*  Part of     : WebKit / BrowserView
     5*  Description : This class represents the Widget Extension object
     6*  Version     : 3.2
    77*
    8 *  Copyright (c) 2004 Nokia Corporation.
    9 *  This material, including documentation and any related
    10 *  computer programs, is protected by copyright controlled by
    11 *  Nokia Corporation. All rights are reserved. Copying,
    12 *  including reproducing, storing, adapting or translating, any
    13 *  or all of this material requires the prior written consent of
    14 *  Nokia Corporation. This material also contains confidential
    15 *  information which may not be disclosed to others without the
    16 *  prior written consent of Nokia Corporation.
     8*    Copyright (c) 2006, Nokia Corporation
     9*    All rights reserved.
     10*
     11*   Redistribution and use in source and binary forms, with or without
     12*   modification, are permitted provided that the following conditions
     13*   are met:
     14*
     15*      * Redistributions of source code must retain the above copyright
     16*        notice, this list of conditions and the following disclaimer.
     17*      * Redistributions in binary form must reproduce the above copyright
     18*        notice, this list of conditions and the following disclaimer in
     19*        the documentation and/or other materials provided with the
     20*        distribution.
     21*      * Neither the name of the Nokia Corporation nor the names of its
     22*        contributors may be used to endorse or promote products derived
     23*        from this software without specific prior written permission.
     24*
     25*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     26*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     27*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
     28*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
     29*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     30*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
     31*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     32*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     33*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     34*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
     35*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
     36*   DAMAGE.
     37*
     38*    Please see file patentlicense.txt for further grants.
    1739* ==============================================================================
    1840*/

  • S60/trunk/WebKit/BrowserView/src/WidgetPreferences.cpp

    r17301 r17820  
    11/*
    22* ==============================================================================
    3 *  Name        : WebKitWidgetInterface.cpp
    4 *  Part of     : WebEngine/WebKitWidgetInterface
    5 *  Description :
    6 *  Version     : 2.1.1
    7 *
    8 *  Copyright (c) 2004 Nokia Corporation.
    9 *  This material, including documentation and any related
    10 *  computer programs, is protected by copyright controlled by
    11 *  Nokia Corporation. All rights are reserved. Copying,
    12 *  including reproducing, storing, adapting or translating, any
    13 *  or all of this material requires the prior written consent of
    14 *  Nokia Corporation. This material also contains confidential
    15 *  information which may not be disclosed to others without the
    16 *  prior written consent of Nokia Corporation.
     3*  Name        : WidgetPreferences.cpp
     4*  Part of     : WebKit / BrowserView
     5*  Description : This class represents the Widget Preferences object
     6*  Version     : 3.2
     7*
     8*    Copyright (c) 2006, Nokia Corporation
     9*    All rights reserved.
     10*
     11*   Redistribution and use in source and binary forms, with or without
     12*   modification, are permitted provided that the following conditions
     13*   are met:
     14*
     15*      * Redistributions of source code must retain the above copyright
     16*        notice, this list of conditions and the following disclaimer.
     17*      * Redistributions in binary form must reproduce the above copyright
     18*        notice, this list of conditions and the following disclaimer in
     19*        the documentation and/or other materials provided with the
     20*        distribution.
     21*      * Neither the name of the Nokia Corporation nor the names of its
     22*        contributors may be used to endorse or promote products derived
     23*        from this software without specific prior written permission.
     24*
     25*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     26*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     27*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
     28*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
     29*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     30*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
     31*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     32*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     33*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     34*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
     35*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
     36*   DAMAGE.
     37*
     38*    Please see file patentlicense.txt for further grants.
    1739* ==============================================================================
    1840*/

  • S60/trunk/WebKit/BrowserView/src/WidgetRenderer.cpp

    r17301 r17820  
    11/*
    22* ==============================================================================
    3 *  Name        : WidgetEngineRenderer.cpp
    4 *  Part of     : WebEngine/WebKitWidgetInterface
    5 *  Description :
    6 *  Version     : 2.1.1
    7 *
    8 *  Copyright (c) 2004 Nokia Corporation.
    9 *  This material, including documentation and any related
    10 *  computer programs, is protected by copyright controlled by
    11 *  Nokia Corporation. All rights are reserved. Copying,
    12 *  including reproducing, storing, adapting or translating, any
    13 *  or all of this material requires the prior written consent of
    14 *  Nokia Corporation. This material also contains confidential
    15 *  information which may not be disclosed to others without the
    16 *  prior written consent of Nokia Corporation.
     3*  Name        : WidgetExtension.cpp
     4*  Part of     : WebKit / BrowserView
     5*  Description : This class represents the Widget Extension object
     6*  Version     : 3.2
     7*
     8*    Copyright (c) 2006, Nokia Corporation
     9*    All rights reserved.
     10*
     11*   Redistribution and use in source and binary forms, with or without
     12*   modification, are permitted provided that the following conditions
     13*   are met:
     14*
     15*      * Redistributions of source code must retain the above copyright
     16*        notice, this list of conditions and the following disclaimer.
     17*      * Redistributions in binary form must reproduce the above copyright
     18*        notice, this list of conditions and the following disclaimer in
     19*        the documentation and/or other materials provided with the
     20*        distribution.
     21*      * Neither the name of the Nokia Corporation nor the names of its
     22*        contributors may be used to endorse or promote products derived
     23*        from this software without specific prior written permission.
     24*
     25*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     26*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     27*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
     28*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
     29*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     30*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
     31*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     32*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     33*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     34*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
     35*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
     36*   DAMAGE.
     37*
     38*    Please see file patentlicense.txt for further grants.
    1739* ==============================================================================
    1840*/
    … …  
    5577//
    5678// ----------------------------------------------------------------------------
    57 TWidgetRenderer::TWidgetRenderer(CWebKitView& aWebKitView) : iWebKitView(&aWebKitView), iTransitionBitmap(0), iFadeMask(0), iTransitionTimer(0), iTransitionCount(0)   
     79TWidgetRenderer::TWidgetRenderer(CWebKitView& aWebKitView) : iWebKitView(&aWebKitView), iTransitionBitmap(0), iFadeMask(0), iTransitionTimer(0), iTransitionCount(0)
    5880    {
    5981    }
    … …  
    7698// ----------------------------------------------------------------------------
    7799void TWidgetRenderer::PrepareForTransitionL(const TDesC& /*aTransition*/)
    78     {   
    79     iTransitionCount = 0;       
     100    {
     101    iTransitionCount = 0;
    80102    DestroyTransitionBitmap();
    81     CreateTransitionBitmapL();                   
     103    CreateTransitionBitmapL();
    82104    DestroyFadeMask();
    83105    CreateFadeMaskL();
    84     DrawFadeMaskL();       
     106    DrawFadeMaskL();
    85107    }
    86108
    … …  
    93115void TWidgetRenderer::PerformTransitionL()
    94116    {
    95    
     117
    96118    delete iTransitionTimer;
    97119    iTransitionTimer = 0;
    … …  
    109131void TWidgetRenderer::TransitionCb()
    110132    {
    111    
     133
    112134    iTransitionCount++;
    113    
     135
    114136    if (iTransitionCount==MaxTransitionCount)
    115137        {
    … …  
    121143    TRAP_IGNORE(DrawFadeMaskL());
    122144    iWebKitView->DrawDeferred();
    123    
     145
    124146    }
    125147
    … …  
    189211    {
    190212    if (iFadeMask)
    191         {       
     213        {
    192214        CFbsBitmapDevice* dev = CFbsBitmapDevice::NewL(iFadeMask);
    193215        CleanupStack::PushL(dev);
    … …  
    220242    if (!iTransitionBitmap || !aCurrentBitmap || !iFadeMask)
    221243        return;
    222    
     244
    223245    TSize s = iTransitionBitmap->SizeInPixels();
    224246    gc.BitBlt(TPoint(0,0),iTransitionBitmap);

  • S60/trunk/WebKit/ChangeLog

    r17819 r17820  
     12006-11-16  yadavall  <sriram.yadavalli@nokia.com>
     2
     3        Reviewed by Sachin Padma (sachin.padma@nokia.com).
     4        DESC: Fix copyright issues
     5        http://bugs.webkit.org/show_bug.cgi?id=11620
     6
     7        * BrowserView/inc/WidgetExtension.h:
     8        * BrowserView/inc/WidgetPreferences.h:
     9        * BrowserView/inc/WidgetRenderer.h:
     10        * BrowserView/src/WidgetExtension.cpp:
     11        * BrowserView/src/WidgetPreferences.cpp:
     12        * BrowserView/src/WidgetRenderer.cpp:
     13        (TWidgetRenderer::TWidgetRenderer):
     14        (TWidgetRenderer::PrepareForTransitionL):
     15        (TWidgetRenderer::PerformTransitionL):
     16        (TWidgetRenderer::TransitionCb):
     17        (TWidgetRenderer::DrawFadeMaskL):
     18        (TWidgetRenderer::DrawTransition):
     19
    1202006-11-15  rathnasa  <sornalatha.rathnasamy@nokia.com>
    221
Note: See TracChangeset for help on using the changeset viewer.