- a/Source/WebCore/ChangeLog +12 lines
Lines 1-3 a/Source/WebCore/ChangeLog_sec1
1
2011-05-02  Adam Barth  <abarth@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        PLATFORM(MAC) should (almost!) build with strict PassOwnPtr
6
        https://bugs.webkit.org/show_bug.cgi?id=59924
7
8
        * css/CSSGrammar.y:
9
        * platform/graphics/mac/SimpleFontDataMac.mm:
10
            - Memory management for the font cache is somewhat... complext.
11
              This will require some careful thought to sort out.
12
1
2011-05-01  Abhishek Arya  <inferno@chromium.org>
13
2011-05-01  Abhishek Arya  <inferno@chromium.org>
2
14
3
        Reviewed by Eric Carlson.
15
        Reviewed by Eric Carlson.
- a/Source/WebCore/css/CSSGrammar.y -4 / +4 lines
Lines 1450-1456 function: a/Source/WebCore/css/CSSGrammar.y_sec1
1450
        CSSParser* p = static_cast<CSSParser*>(parser);
1450
        CSSParser* p = static_cast<CSSParser*>(parser);
1451
        CSSParserFunction* f = p->createFloatingFunction();
1451
        CSSParserFunction* f = p->createFloatingFunction();
1452
        f->name = $1;
1452
        f->name = $1;
1453
        f->args = p->sinkFloatingValueList($3);
1453
        f->args = adoptPtr(p->sinkFloatingValueList($3));
1454
        $$.id = 0;
1454
        $$.id = 0;
1455
        $$.unit = CSSParserValue::Function;
1455
        $$.unit = CSSParserValue::Function;
1456
        $$.function = f;
1456
        $$.function = f;
Lines 1459-1465 function: a/Source/WebCore/css/CSSGrammar.y_sec2
1459
        CSSParser* p = static_cast<CSSParser*>(parser);
1459
        CSSParser* p = static_cast<CSSParser*>(parser);
1460
        CSSParserFunction* f = p->createFloatingFunction();
1460
        CSSParserFunction* f = p->createFloatingFunction();
1461
        f->name = $1;
1461
        f->name = $1;
1462
        f->args = 0;
1462
        f->args = nullptr;
1463
        $$.id = 0;
1463
        $$.id = 0;
1464
        $$.unit = CSSParserValue::Function;
1464
        $$.unit = CSSParserValue::Function;
1465
        $$.function = f;
1465
        $$.function = f;
Lines 1568-1574 calc_function: a/Source/WebCore/css/CSSGrammar.y_sec3
1568
        CSSParser* p = static_cast<CSSParser*>(parser);
1568
        CSSParser* p = static_cast<CSSParser*>(parser);
1569
        CSSParserFunction* f = p->createFloatingFunction();
1569
        CSSParserFunction* f = p->createFloatingFunction();
1570
        f->name = $1;
1570
        f->name = $1;
1571
        f->args = p->sinkFloatingValueList($3);
1571
        f->args = adoptPtr(p->sinkFloatingValueList($3));
1572
        $$.id = 0;
1572
        $$.id = 0;
1573
        $$.unit = CSSParserValue::Function;
1573
        $$.unit = CSSParserValue::Function;
1574
        $$.function = f;
1574
        $$.function = f;
Lines 1593-1599 min_or_max_function: a/Source/WebCore/css/CSSGrammar.y_sec4
1593
        CSSParser* p = static_cast<CSSParser*>(parser);
1593
        CSSParser* p = static_cast<CSSParser*>(parser);
1594
        CSSParserFunction* f = p->createFloatingFunction();
1594
        CSSParserFunction* f = p->createFloatingFunction();
1595
        f->name = $1;
1595
        f->name = $1;
1596
        f->args = p->sinkFloatingValueList($3);
1596
        f->args = adoptPtr(p->sinkFloatingValueList($3));
1597
        $$.id = 0;
1597
        $$.id = 0;
1598
        $$.unit = CSSParserValue::Function;
1598
        $$.unit = CSSParserValue::Function;
1599
        $$.function = f;
1599
        $$.function = f;
- a/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm +4 lines
Lines 28-33 a/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm_sec1
28
 */
28
 */
29
29
30
#import "config.h"
30
#import "config.h"
31
32
// FIXME: Remove this define!
33
#define LOOSE_PASS_OWN_PTR
34
31
#import "SimpleFontData.h"
35
#import "SimpleFontData.h"
32
36
33
#import "BlockExceptions.h"
37
#import "BlockExceptions.h"
- a/Source/WebKit/mac/ChangeLog +18 lines
Lines 1-3 a/Source/WebKit/mac/ChangeLog_sec1
1
2011-05-02  Adam Barth  <abarth@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        PLATFORM(MAC) should (almost!) build with strict PassOwnPtr
6
        https://bugs.webkit.org/show_bug.cgi?id=59924
7
8
        * History/WebHistory.mm:
9
        (-[WebHistory _visitedURL:withTitle:method:wasFailure:increaseVisitCount:]):
10
        * Plugins/WebBaseNetscapePluginView.mm:
11
        (-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:element:WebCore::]):
12
        * WebCoreSupport/WebFrameLoaderClient.mm:
13
        (WebFrameLoaderClient::savePlatformDataToCachedFrame):
14
        * WebView/WebView.mm:
15
        (-[WebView _injectMailQuirksScript]):
16
        (-[WebView _injectOutlookQuirksScript]):
17
        (toStringVector):
18
1
2011-05-01  Ryosuke Niwa  <rniwa@webkit.org>
19
2011-05-01  Ryosuke Niwa  <rniwa@webkit.org>
2
20
3
        Reviewed by Eric Seidel.
21
        Reviewed by Eric Seidel.
- a/Source/WebKit/mac/History/WebHistory.mm -1 / +1 lines
Lines 826-832 static inline WebHistoryDateKey dateKey(NSTimeInterval date) a/Source/WebKit/mac/History/WebHistory.mm_sec1
826
    if ([method length])
826
    if ([method length])
827
        item->setLastVisitWasHTTPNonGet([method caseInsensitiveCompare:@"GET"] && (![[url scheme] caseInsensitiveCompare:@"http"] || ![[url scheme] caseInsensitiveCompare:@"https"]));
827
        item->setLastVisitWasHTTPNonGet([method caseInsensitiveCompare:@"GET"] && (![[url scheme] caseInsensitiveCompare:@"http"] || ![[url scheme] caseInsensitiveCompare:@"https"]));
828
828
829
    item->setRedirectURLs(0);
829
    item->setRedirectURLs(PassOwnPtr<Vector<String> >());
830
830
831
    NSArray *entries = [[NSArray alloc] initWithObjects:entry, nil];
831
    NSArray *entries = [[NSArray alloc] initWithObjects:entry, nil];
832
    [self _sendNotification:WebHistoryItemsAddedNotification entries:entries];
832
    [self _sendNotification:WebHistoryItemsAddedNotification entries:entries];
- a/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm -1 / +1 lines
Lines 161-167 String WebHaltablePlugin::pluginName() const a/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm_sec1
161
        _mode = NP_EMBED;
161
        _mode = NP_EMBED;
162
    
162
    
163
    _loadManually = loadManually;
163
    _loadManually = loadManually;
164
    _haltable = new WebHaltablePlugin(self);
164
    _haltable = adoptPtr(new WebHaltablePlugin(self));
165
    return self;
165
    return self;
166
}
166
}
167
167
- a/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm -2 / +2 lines
Lines 1205-1212 void WebFrameLoaderClient::setTitle(const StringWithDirection& title, const KURL a/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm_sec1
1205
1205
1206
void WebFrameLoaderClient::savePlatformDataToCachedFrame(CachedFrame* cachedFrame)
1206
void WebFrameLoaderClient::savePlatformDataToCachedFrame(CachedFrame* cachedFrame)
1207
{
1207
{
1208
    WebCachedFramePlatformData* webPlatformData = new WebCachedFramePlatformData([m_webFrame->_private->webFrameView documentView]);
1208
    OwnPtr<WebCachedFramePlatformData> webPlatformData = adoptPtr(new WebCachedFramePlatformData([m_webFrame->_private->webFrameView documentView]));
1209
    cachedFrame->setCachedFramePlatformData(webPlatformData);
1209
    cachedFrame->setCachedFramePlatformData(webPlatformData.release());
1210
}
1210
}
1211
1211
1212
void WebFrameLoaderClient::transitionToCommittedFromCachedFrame(CachedFrame* cachedFrame)
1212
void WebFrameLoaderClient::transitionToCommittedFromCachedFrame(CachedFrame* cachedFrame)
- a/Source/WebKit/mac/WebView/WebView.mm -5 / +5 lines
Lines 642-648 static NSString *leakMailQuirksUserScriptContents() a/Source/WebKit/mac/WebView/WebView.mm_sec1
642
{
642
{
643
    static NSString *mailQuirksScriptContents = leakMailQuirksUserScriptContents();
643
    static NSString *mailQuirksScriptContents = leakMailQuirksUserScriptContents();
644
    core(self)->group().addUserScriptToWorld(core([WebScriptWorld world]),
644
    core(self)->group().addUserScriptToWorld(core([WebScriptWorld world]),
645
        mailQuirksScriptContents, KURL(), 0, 0, InjectAtDocumentEnd, InjectInAllFrames);
645
        mailQuirksScriptContents, KURL(), PassOwnPtr<Vector<String> >(), PassOwnPtr<Vector<String> >(), InjectAtDocumentEnd, InjectInAllFrames);
646
}
646
}
647
647
648
static bool needsOutlookQuirksScript()
648
static bool needsOutlookQuirksScript()
Lines 663-669 static NSString *leakOutlookQuirksUserScriptContents() a/Source/WebKit/mac/WebView/WebView.mm_sec2
663
{
663
{
664
    static NSString *outlookQuirksScriptContents = leakOutlookQuirksUserScriptContents();
664
    static NSString *outlookQuirksScriptContents = leakOutlookQuirksUserScriptContents();
665
    core(self)->group().addUserScriptToWorld(core([WebScriptWorld world]),
665
    core(self)->group().addUserScriptToWorld(core([WebScriptWorld world]),
666
        outlookQuirksScriptContents, KURL(), 0, 0, InjectAtDocumentEnd, InjectInAllFrames);
666
        outlookQuirksScriptContents, KURL(), PassOwnPtr<Vector<String> >(), PassOwnPtr<Vector<String> >(), InjectAtDocumentEnd, InjectInAllFrames);
667
}
667
}
668
668
669
- (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName usesDocumentViews:(BOOL)usesDocumentViews
669
- (void)_commonInitializationWithFrameName:(NSString *)frameName groupName:(NSString *)groupName usesDocumentViews:(BOOL)usesDocumentViews
Lines 2563-2576 static PassOwnPtr<Vector<String> > toStringVector(NSArray* patterns) a/Source/WebKit/mac/WebView/WebView.mm_sec3
2563
    // Convert the patterns into Vectors.
2563
    // Convert the patterns into Vectors.
2564
    NSUInteger count = [patterns count];
2564
    NSUInteger count = [patterns count];
2565
    if (count == 0)
2565
    if (count == 0)
2566
        return 0;
2566
        return PassOwnPtr<Vector<String> >();
2567
    Vector<String>* patternsVector = new Vector<String>;
2567
    OwnPtr<Vector<String> > patternsVector = adoptPtr(new Vector<String>);
2568
    for (NSUInteger i = 0; i < count; ++i) {
2568
    for (NSUInteger i = 0; i < count; ++i) {
2569
        id entry = [patterns objectAtIndex:i];
2569
        id entry = [patterns objectAtIndex:i];
2570
        if ([entry isKindOfClass:[NSString class]])
2570
        if ([entry isKindOfClass:[NSString class]])
2571
            patternsVector->append(String((NSString*)entry));
2571
            patternsVector->append(String((NSString*)entry));
2572
    }
2572
    }
2573
    return patternsVector;
2573
    return patternsVector.release();
2574
}
2574
}
2575
2575
2576
+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url
2576
+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url
- a/Source/WebKit2/ChangeLog +30 lines
Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
1
2011-05-02  Adam Barth  <abarth@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        PLATFORM(MAC) should (almost!) build with strict PassOwnPtr
6
        https://bugs.webkit.org/show_bug.cgi?id=59924
7
8
        * Platform/CoreIPC/Connection.cpp:
9
        (CoreIPC::Connection::sendSyncMessage):
10
        (CoreIPC::Connection::waitForSyncReply):
11
        (CoreIPC::Connection::dispatchSyncMessage):
12
        * Platform/CoreIPC/Connection.h:
13
        (CoreIPC::Connection::Message::releaseArguments):
14
            - The memory management for this class is very strange.  I wrote a
15
              large comment.  Hopefully a kind soul will come by and fix it.
16
        * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
17
        (WebKit::NetscapePluginModule::unload):
18
        * UIProcess/API/mac/WKView.mm:
19
        (-[WKView _setFindIndicator:fadeOut:]):
20
        * WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:
21
        (WebKit::WebFullScreenManagerMac::setRootFullScreenLayer):
22
        * WebProcess/InjectedBundle/InjectedBundle.cpp:
23
        (WebKit::toStringVector):
24
        * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
25
        (WebKit::NetscapePluginStream::stop):
26
        * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
27
        (WebKit::WebInspectorFrontendClient::WebInspectorFrontendClient):
28
        * WebProcess/WebPage/DrawingArea.cpp:
29
        (WebKit::DrawingArea::create):
30
1
2011-04-29  Brian Weinstein  <bweinstein@apple.com>
31
2011-04-29  Brian Weinstein  <bweinstein@apple.com>
2
32
3
        Reviewed by Dan Bernstein.
33
        Reviewed by Dan Bernstein.
- a/Source/WebKit2/Platform/CoreIPC/Connection.cpp -8 / +8 lines
Lines 370-376 PassOwnPtr<ArgumentDecoder> Connection::sendSyncMessage(MessageID messageID, uin a/Source/WebKit2/Platform/CoreIPC/Connection.cpp_sec1
370
370
371
    if (!isValid()) {
371
    if (!isValid()) {
372
        didFailToSendSyncMessage();
372
        didFailToSendSyncMessage();
373
        return 0;
373
        return PassOwnPtr<ArgumentDecoder>();
374
    }
374
    }
375
375
376
    // Push the pending sync reply information on our stack.
376
    // Push the pending sync reply information on our stack.
Lines 378-384 PassOwnPtr<ArgumentDecoder> Connection::sendSyncMessage(MessageID messageID, uin a/Source/WebKit2/Platform/CoreIPC/Connection.cpp_sec2
378
        MutexLocker locker(m_syncReplyStateMutex);
378
        MutexLocker locker(m_syncReplyStateMutex);
379
        if (!m_shouldWaitForSyncReplies) {
379
        if (!m_shouldWaitForSyncReplies) {
380
            didFailToSendSyncMessage();
380
            didFailToSendSyncMessage();
381
            return 0;
381
            return PassOwnPtr<ArgumentDecoder>();
382
        }
382
        }
383
383
384
        m_pendingSyncReplies.append(PendingSyncReply(syncRequestID));
384
        m_pendingSyncReplies.append(PendingSyncReply(syncRequestID));
Lines 440-446 PassOwnPtr<ArgumentDecoder> Connection::waitForSyncReply(uint64_t syncRequestID, a/Source/WebKit2/Platform/CoreIPC/Connection.cpp_sec3
440
        // If that happens, we need to stop waiting, or we'll hang since we won't get
440
        // If that happens, we need to stop waiting, or we'll hang since we won't get
441
        // any more incoming messages.
441
        // any more incoming messages.
442
        if (!isValid())
442
        if (!isValid())
443
            return 0;
443
            return PassOwnPtr<ArgumentDecoder>();
444
444
445
        // We didn't find a sync reply yet, keep waiting.
445
        // We didn't find a sync reply yet, keep waiting.
446
#if PLATFORM(WIN)
446
#if PLATFORM(WIN)
Lines 454-460 PassOwnPtr<ArgumentDecoder> Connection::waitForSyncReply(uint64_t syncRequestID, a/Source/WebKit2/Platform/CoreIPC/Connection.cpp_sec4
454
    if (m_client)
454
    if (m_client)
455
        m_client->syncMessageSendTimedOut(this);
455
        m_client->syncMessageSendTimedOut(this);
456
456
457
    return 0;
457
    return PassOwnPtr<ArgumentDecoder>();
458
}
458
}
459
459
460
void Connection::processIncomingSyncReply(PassOwnPtr<ArgumentDecoder> arguments)
460
void Connection::processIncomingSyncReply(PassOwnPtr<ArgumentDecoder> arguments)
Lines 596-605 void Connection::dispatchSyncMessage(MessageID messageID, ArgumentDecoder* argum a/Source/WebKit2/Platform/CoreIPC/Connection.cpp_sec5
596
    }
596
    }
597
597
598
    // Create our reply encoder.
598
    // Create our reply encoder.
599
    ArgumentEncoder* replyEncoder = ArgumentEncoder::create(syncRequestID).leakPtr();
599
    OwnPtr<ArgumentEncoder> replyEncoder = ArgumentEncoder::create(syncRequestID);
600
    
600
    
601
    // Hand off both the decoder and encoder to the client..
601
    // Hand off both the decoder and encoder to the client.
602
    SyncReplyMode syncReplyMode = m_client->didReceiveSyncMessage(this, messageID, arguments, replyEncoder);
602
    SyncReplyMode syncReplyMode = m_client->didReceiveSyncMessage(this, messageID, arguments, replyEncoder.get());
603
603
604
    // FIXME: If the message was invalid, we should send back a SyncMessageError.
604
    // FIXME: If the message was invalid, we should send back a SyncMessageError.
605
    ASSERT(!arguments->isInvalid());
605
    ASSERT(!arguments->isInvalid());
Lines 611-617 void Connection::dispatchSyncMessage(MessageID messageID, ArgumentDecoder* argum a/Source/WebKit2/Platform/CoreIPC/Connection.cpp_sec6
611
    }
611
    }
612
612
613
    // Send the reply.
613
    // Send the reply.
614
    sendSyncReply(replyEncoder);
614
    sendSyncReply(replyEncoder.release());
615
}
615
}
616
616
617
void Connection::didFailToSendSyncMessage()
617
void Connection::didFailToSendSyncMessage()
- a/Source/WebKit2/Platform/CoreIPC/Connection.h -2 / +7 lines
Lines 174-187 private: a/Source/WebKit2/Platform/CoreIPC/Connection.h_sec1
174
        
174
        
175
        PassOwnPtr<T> releaseArguments()
175
        PassOwnPtr<T> releaseArguments()
176
        {
176
        {
177
            T* arguments = m_arguments;
177
            OwnPtr<T> arguments = adoptPtr(m_arguments);
178
            m_arguments = 0;
178
            m_arguments = 0;
179
179
180
            return arguments;
180
            return arguments.release();
181
        }
181
        }
182
        
182
        
183
    private:
183
    private:
184
        MessageID m_messageID;
184
        MessageID m_messageID;
185
        // The memory management of this class is very unusual. The class acts
186
        // as if it has an owning reference to m_arguments (e.g., accepting a
187
        // PassOwnPtr in its constructor) in all ways except that it does not
188
        // deallocate m_arguments on destruction.
189
        // FIXME: Does this leak m_arguments on destruction?
185
        T* m_arguments;
190
        T* m_arguments;
186
    };
191
    };
187
192
- a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp -1 / +1 lines
Lines 256-262 void NetscapePluginModule::unload() a/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp_sec1
256
{
256
{
257
    ASSERT(!m_isInitialized);
257
    ASSERT(!m_isInitialized);
258
258
259
    m_module = 0;
259
    m_module = nullptr;
260
}
260
}
261
261
262
} // namespace WebKit
262
} // namespace WebKit
- a/Source/WebKit2/UIProcess/API/mac/WKView.mm -1 / +1 lines
Lines 2202-2208 static void drawPageBackground(CGContextRef context, WebPageProxy* page, const I a/Source/WebKit2/UIProcess/API/mac/WKView.mm_sec1
2202
- (void)_setFindIndicator:(PassRefPtr<FindIndicator>)findIndicator fadeOut:(BOOL)fadeOut
2202
- (void)_setFindIndicator:(PassRefPtr<FindIndicator>)findIndicator fadeOut:(BOOL)fadeOut
2203
{
2203
{
2204
    if (!findIndicator) {
2204
    if (!findIndicator) {
2205
        _data->_findIndicatorWindow = 0;
2205
        _data->_findIndicatorWindow = nullptr;
2206
        return;
2206
        return;
2207
    }
2207
    }
2208
2208
- a/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm -1 / +1 lines
Lines 140-146 void WebFullScreenManagerMac::setRootFullScreenLayer(WebCore::GraphicsLayer* lay a/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm_sec1
140
        m_page->send(Messages::WebFullScreenManagerProxy::ExitAcceleratedCompositingMode());
140
        m_page->send(Messages::WebFullScreenManagerProxy::ExitAcceleratedCompositingMode());
141
        if (m_rootLayer) {
141
        if (m_rootLayer) {
142
            m_rootLayer->removeAllChildren();
142
            m_rootLayer->removeAllChildren();
143
            m_rootLayer = 0;
143
            m_rootLayer = nullptr;
144
        }
144
        }
145
        return;
145
        return;
146
    }
146
    }
- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp -4 / +4 lines
Lines 212-231 bool InjectedBundle::isPageBoxVisible(WebFrame* frame, int pageIndex) a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp_sec1
212
static PassOwnPtr<Vector<String> > toStringVector(ImmutableArray* patterns)
212
static PassOwnPtr<Vector<String> > toStringVector(ImmutableArray* patterns)
213
{
213
{
214
    if (!patterns)
214
    if (!patterns)
215
        return 0;
215
        return PassOwnPtr<Vector<String> >();
216
216
217
    size_t size =  patterns->size();
217
    size_t size =  patterns->size();
218
    if (!size)
218
    if (!size)
219
        return 0;
219
        return PassOwnPtr<Vector<String> >();
220
220
221
    Vector<String>* patternsVector = new Vector<String>;
221
    OwnPtr<Vector<String> > patternsVector = adoptPtr(new Vector<String>);
222
    patternsVector->reserveInitialCapacity(size);
222
    patternsVector->reserveInitialCapacity(size);
223
    for (size_t i = 0; i < size; ++i) {
223
    for (size_t i = 0; i < size; ++i) {
224
        WebString* entry = patterns->at<WebString>(i);
224
        WebString* entry = patterns->at<WebString>(i);
225
        if (entry)
225
        if (entry)
226
            patternsVector->uncheckedAppend(entry->string());
226
            patternsVector->uncheckedAppend(entry->string());
227
    }
227
    }
228
    return patternsVector;
228
    return patternsVector.release();
229
}
229
}
230
230
231
void InjectedBundle::addUserScript(WebPageGroupProxy* pageGroup, InjectedBundleScriptWorld* scriptWorld, const String& source, const String& url, ImmutableArray* whitelist, ImmutableArray* blacklist, WebCore::UserScriptInjectionTime injectionTime, WebCore::UserContentInjectedFrames injectedFrames)
231
void InjectedBundle::addUserScript(WebPageGroupProxy* pageGroup, InjectedBundleScriptWorld* scriptWorld, const String& source, const String& url, ImmutableArray* whitelist, ImmutableArray* blacklist, WebCore::UserScriptInjectionTime injectionTime, WebCore::UserContentInjectedFrames injectedFrames)
- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp -1 / +1 lines
Lines 293-299 void NetscapePluginStream::stop(NPReason reason) a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp_sec1
293
        return;
293
        return;
294
    }
294
    }
295
295
296
    m_deliveryData = 0;
296
    m_deliveryData = nullptr;
297
    m_deliveryDataTimer.stop();
297
    m_deliveryDataTimer.stop();
298
298
299
    if (m_transferMode == NP_ASFILE || m_transferMode == NP_ASFILEONLY) {
299
    if (m_transferMode == NP_ASFILE || m_transferMode == NP_ASFILEONLY) {
- a/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp -1 / +1 lines
Lines 40-46 using namespace WebCore; a/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp_sec1
40
namespace WebKit {
40
namespace WebKit {
41
41
42
WebInspectorFrontendClient::WebInspectorFrontendClient(WebPage* page, WebPage* inspectorPage)
42
WebInspectorFrontendClient::WebInspectorFrontendClient(WebPage* page, WebPage* inspectorPage)
43
    : InspectorFrontendClientLocal(page->corePage()->inspectorController(), inspectorPage->corePage(), new Settings())
43
    : InspectorFrontendClientLocal(page->corePage()->inspectorController(), inspectorPage->corePage(), adoptPtr(new Settings()))
44
    , m_page(page)
44
    , m_page(page)
45
{
45
{
46
}
46
}
- a/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp -2 / +2 lines
Lines 48-54 PassOwnPtr<DrawingArea> DrawingArea::create(WebPage* webPage, const WebPageCreat a/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp_sec1
48
#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(QT)
48
#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(QT)
49
        return DrawingAreaImpl::create(webPage, parameters);
49
        return DrawingAreaImpl::create(webPage, parameters);
50
#else
50
#else
51
        return 0;
51
        return PassOwnPtr<DrawingArea>();
52
#endif
52
#endif
53
    case DrawingAreaTypeChunkedUpdate:
53
    case DrawingAreaTypeChunkedUpdate:
54
        return adoptPtr(new ChunkedUpdateDrawingArea(webPage));
54
        return adoptPtr(new ChunkedUpdateDrawingArea(webPage));
Lines 58-64 PassOwnPtr<DrawingArea> DrawingArea::create(WebPage* webPage, const WebPageCreat a/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp_sec2
58
#endif
58
#endif
59
    }
59
    }
60
60
61
    return 0;
61
    return PassOwnPtr<DrawingArea>();
62
}
62
}
63
63
64
DrawingArea::DrawingArea(DrawingAreaType type, WebPage* webPage)
64
DrawingArea::DrawingArea(DrawingAreaType type, WebPage* webPage)

Return to Bug 59924