| Differences between
and this patch
- Source/WebCore/ChangeLog +16 lines
Lines 1-3 Source/WebCore/ChangeLog_sec1
1
2012-09-12  Mark Pilgrim  <pilgrim@chromium.org>
2
3
        [Chromium] Remove unused popupsAllowed function from PlatformSupport
4
        https://bugs.webkit.org/show_bug.cgi?id=96521
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Part of a refactoring series. See tracking bug 82948.
9
10
        * bindings/v8/NPV8Object.cpp:
11
        (WebCore::v8ObjectToNPObject):
12
        (_NPN_Evaluate):
13
        (_NPN_GetProperty):
14
        * platform/chromium/PlatformSupport.h:
15
        (PlatformSupport):
16
1
2012-09-12  Kenneth Rohde Christiansen  <kenneth@webkit.org>
17
2012-09-12  Kenneth Rohde Christiansen  <kenneth@webkit.org>
2
18
3
        [EFL] Avoid manual memory management in RenderThemeEfl
19
        [EFL] Avoid manual memory management in RenderThemeEfl
- Source/WebCore/bindings/v8/NPV8Object.cpp -4 / +3 lines
Lines 28-34 Source/WebCore/bindings/v8/NPV8Object.cpp_sec1
28
28
29
#include "NPV8Object.h"
29
#include "NPV8Object.h"
30
30
31
#include "PlatformSupport.h"
32
#include "DOMWindow.h"
31
#include "DOMWindow.h"
33
#include "Frame.h"
32
#include "Frame.h"
34
#include "NPObjectWrapper.h"
33
#include "NPObjectWrapper.h"
Lines 130-136 static v8::Local<v8::String> npIdentifie Source/WebCore/bindings/v8/NPV8Object.cpp_sec2
130
129
131
NPObject* v8ObjectToNPObject(v8::Handle<v8::Object> object)
130
NPObject* v8ObjectToNPObject(v8::Handle<v8::Object> object)
132
{
131
{
133
    return reinterpret_cast<NPObject*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex)); 
132
    return reinterpret_cast<NPObject*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex));
134
}
133
}
135
134
136
static NPClass V8NPObjectClass = { NP_CLASS_STRUCT_VERSION,
135
static NPClass V8NPObjectClass = { NP_CLASS_STRUCT_VERSION,
Lines 296-302 bool _NPN_InvokeDefault(NPP npp, NPObjec Source/WebCore/bindings/v8/NPV8Object.cpp_sec3
296
295
297
bool _NPN_Evaluate(NPP npp, NPObject* npObject, NPString* npScript, NPVariant* result)
296
bool _NPN_Evaluate(NPP npp, NPObject* npObject, NPString* npScript, NPVariant* result)
298
{
297
{
299
    bool popupsAllowed = PlatformSupport::popupsAllowed(npp);
298
    bool popupsAllowed = false;
300
    return _NPN_EvaluateHelper(npp, popupsAllowed, npObject, npScript, result);
299
    return _NPN_EvaluateHelper(npp, popupsAllowed, npObject, npScript, result);
301
}
300
}
302
301
Lines 362-368 bool _NPN_GetProperty(NPP npp, NPObject* Source/WebCore/bindings/v8/NPV8Object.cpp_sec4
362
361
363
        v8::Handle<v8::Object> obj(object->v8Object);
362
        v8::Handle<v8::Object> obj(object->v8Object);
364
        v8::Local<v8::Value> v8result = obj->Get(npIdentifierToV8Identifier(propertyName));
363
        v8::Local<v8::Value> v8result = obj->Get(npIdentifierToV8Identifier(propertyName));
365
        
364
366
        if (v8result.IsEmpty())
365
        if (v8result.IsEmpty())
367
            return false;
366
            return false;
368
367
- Source/WebCore/platform/chromium/PlatformSupport.h -1 lines
Lines 123-129 public: Source/WebCore/platform/chromium/PlatformSupport.h_sec1
123
    // Plugin -------------------------------------------------------------
123
    // Plugin -------------------------------------------------------------
124
    static bool plugins(bool refresh, Vector<PluginInfo>*);
124
    static bool plugins(bool refresh, Vector<PluginInfo>*);
125
    static NPObject* pluginScriptableObject(Widget*);
125
    static NPObject* pluginScriptableObject(Widget*);
126
    static bool popupsAllowed(NPP);
127
126
128
    // Screen -------------------------------------------------------------
127
    // Screen -------------------------------------------------------------
129
    static int screenHorizontalDPI(Widget*);
128
    static int screenHorizontalDPI(Widget*);
- Source/WebKit/chromium/ChangeLog +12 lines
Lines 1-3 Source/WebKit/chromium/ChangeLog_sec1
1
2012-09-12  Mark Pilgrim  <pilgrim@chromium.org>
2
3
        [Chromium] Remove unused popupsAllowed function from PlatformSupport
4
        https://bugs.webkit.org/show_bug.cgi?id=96521
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        Part of a refactoring series. See tracking bug 82948.
9
10
        * src/PlatformSupport.cpp:
11
        (WebCore):
12
1
2012-09-12  Ilya Tikhonovsky  <loislo@chromium.org>
13
2012-09-12  Ilya Tikhonovsky  <loislo@chromium.org>
2
14
3
        Web Inspector: NMI move String* instrumentation to wtf.
15
        Web Inspector: NMI move String* instrumentation to wtf.
- Source/WebKit/chromium/src/PlatformSupport.cpp -6 lines
Lines 566-577 IntRect PlatformSupport::screenAvailable Source/WebKit/chromium/src/PlatformSupport.cpp_sec1
566
    return client->screenInfo().availableRect;
566
    return client->screenInfo().availableRect;
567
}
567
}
568
568
569
bool PlatformSupport::popupsAllowed(NPP npp)
570
{
571
    // FIXME: Give the embedder a way to control this.
572
    return false;
573
}
574
575
#if ENABLE(WORKERS)
569
#if ENABLE(WORKERS)
576
WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
570
WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
577
{
571
{

Return to Bug 96521